diff --git a/flake.lock b/flake.lock index fdb5344..adcee36 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674511629, - "narHash": "sha256-e2sc2Pv6z3aLuqXrunGvoKAfOABbWV31txgboIro+GE=", + "lastModified": 1674556204, + "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "12d43fd40a7658976c18eaa05bba62b6045e5b3e", + "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6", "type": "github" }, "original": { diff --git a/home/config/nvim/plugins/nvim-lint.fnl b/home/config/nvim/plugins/nvim-lint.fnl index 94100e7..679071f 100644 --- a/home/config/nvim/plugins/nvim-lint.fnl +++ b/home/config/nvim/plugins/nvim-lint.fnl @@ -12,7 +12,10 @@ :ignore_exitcode false :parser (fn [output] (if (= output "") {} - (let [findings (vim.json.decode output)] + (let [findings (vim.json.decode output) + filtered-findings (vim.tbl_filter #(not= $1.line + nil) + findings.results)] (vim.tbl_map (fn [result] {:lnum (- result.line 1) :end_lnum (- result.line 1) @@ -21,7 +24,7 @@ :severity vim.diagnostic.severity.HINT :source :deadnix :message result.message}) - findings.results))))}) + filtered-findings))))}) ;; Linter Options (let [checkstyle (require :lint.linters.checkstyle) fennel (require :lint.linters.fennel)] diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index d27e6a2..431bc37 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -69,12 +69,12 @@ rec { }; cutlass-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "cutlass.nvim"; - version = "2023-01-23"; + version = "2023-01-24"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "cutlass.nvim"; - rev = "0a249b72cdc758f74f68817061eb879929b21a11"; - sha256 = "1ms4sg4ihc5f34mjnsgabbfqx9i60bw44f3l7cm0dfpjwhg7as3a"; + rev = "9d5c8a92a6ff1e4c3776b7c90b050efbc3fe2b7f"; + sha256 = "010mvkh8ybb2yl2bqqcnbkyj410xjgcgj93qnpc96fd9rsfia8il"; fetchSubmodules = false; }; }; diff --git a/secret/hosts/sail.nix b/secret/hosts/sail.nix index a3924c9..c33e1e2 100644 Binary files a/secret/hosts/sail.nix and b/secret/hosts/sail.nix differ diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix index 614b4c5..bcccdbe 100644 --- a/system/hosts/sail.nix +++ b/system/hosts/sail.nix @@ -15,6 +15,8 @@ in (import ../nixos/cloudflared.nix (args // { inherit secret; })) + (import ../nixos/freshrss.nix (args // { inherit secret; })) + (import ../nixos/mastodon.nix (args // { inherit secret; })) (import ../nixos/synapse.nix (args // { inherit secret; })) diff --git a/system/nixos/freshrss.nix b/system/nixos/freshrss.nix new file mode 100644 index 0000000..2bdfca7 --- /dev/null +++ b/system/nixos/freshrss.nix @@ -0,0 +1,21 @@ +{ config, secret, ... }: + +{ + services.freshrss = { + enable = true; + + inherit (secret.freshrss) defaultUser; + inherit (secret.freshrss) passwordFile; + + inherit (secret.freshrss) baseUrl; + inherit (secret.freshrss) virtualHost; + + database = { + type = "pgsql"; + host = "10.99.99.3"; + port = 5432; + inherit (secret.freshrss.database) user; + inherit (secret.freshrss.database) passFile; + }; + }; +}