Add freshrss
This commit is contained in:
parent
06f0d0f97c
commit
9b5e7ddf65
6 changed files with 34 additions and 8 deletions
|
@ -117,11 +117,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674511629,
|
"lastModified": 1674556204,
|
||||||
"narHash": "sha256-e2sc2Pv6z3aLuqXrunGvoKAfOABbWV31txgboIro+GE=",
|
"narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "12d43fd40a7658976c18eaa05bba62b6045e5b3e",
|
"rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -12,7 +12,10 @@
|
||||||
:ignore_exitcode false
|
:ignore_exitcode false
|
||||||
:parser (fn [output]
|
:parser (fn [output]
|
||||||
(if (= 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]
|
(vim.tbl_map (fn [result]
|
||||||
{:lnum (- result.line 1)
|
{:lnum (- result.line 1)
|
||||||
:end_lnum (- result.line 1)
|
:end_lnum (- result.line 1)
|
||||||
|
@ -21,7 +24,7 @@
|
||||||
:severity vim.diagnostic.severity.HINT
|
:severity vim.diagnostic.severity.HINT
|
||||||
:source :deadnix
|
:source :deadnix
|
||||||
:message result.message})
|
:message result.message})
|
||||||
findings.results))))})
|
filtered-findings))))})
|
||||||
;; Linter Options
|
;; Linter Options
|
||||||
(let [checkstyle (require :lint.linters.checkstyle)
|
(let [checkstyle (require :lint.linters.checkstyle)
|
||||||
fennel (require :lint.linters.fennel)]
|
fennel (require :lint.linters.fennel)]
|
||||||
|
|
|
@ -69,12 +69,12 @@ rec {
|
||||||
};
|
};
|
||||||
cutlass-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
cutlass-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "cutlass.nvim";
|
pname = "cutlass.nvim";
|
||||||
version = "2023-01-23";
|
version = "2023-01-24";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "gbprod";
|
owner = "gbprod";
|
||||||
repo = "cutlass.nvim";
|
repo = "cutlass.nvim";
|
||||||
rev = "0a249b72cdc758f74f68817061eb879929b21a11";
|
rev = "9d5c8a92a6ff1e4c3776b7c90b050efbc3fe2b7f";
|
||||||
sha256 = "1ms4sg4ihc5f34mjnsgabbfqx9i60bw44f3l7cm0dfpjwhg7as3a";
|
sha256 = "010mvkh8ybb2yl2bqqcnbkyj410xjgcgj93qnpc96fd9rsfia8il";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Binary file not shown.
|
@ -15,6 +15,8 @@ in
|
||||||
|
|
||||||
(import ../nixos/cloudflared.nix (args // { inherit secret; }))
|
(import ../nixos/cloudflared.nix (args // { inherit secret; }))
|
||||||
|
|
||||||
|
(import ../nixos/freshrss.nix (args // { inherit secret; }))
|
||||||
|
|
||||||
(import ../nixos/mastodon.nix (args // { inherit secret; }))
|
(import ../nixos/mastodon.nix (args // { inherit secret; }))
|
||||||
|
|
||||||
(import ../nixos/synapse.nix (args // { inherit secret; }))
|
(import ../nixos/synapse.nix (args // { inherit secret; }))
|
||||||
|
|
21
system/nixos/freshrss.nix
Normal file
21
system/nixos/freshrss.nix
Normal file
|
@ -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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue