diff options
Diffstat (limited to 'modules/services')
-rw-r--r-- | modules/services/atticd.nix | 6 | ||||
-rw-r--r-- | modules/services/blocky/grafana_blocky_rev3.json | 2 | ||||
-rw-r--r-- | modules/services/hydra.nix | 4 | ||||
-rw-r--r-- | modules/services/invidious.nix | 1 | ||||
-rw-r--r-- | modules/services/jellyfin.nix | 26 | ||||
-rw-r--r-- | modules/services/nextcloud.nix | 2 |
6 files changed, 34 insertions, 7 deletions
diff --git a/modules/services/atticd.nix b/modules/services/atticd.nix index ef79871..fe11074 100644 --- a/modules/services/atticd.nix +++ b/modules/services/atticd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: with lib; let @@ -24,7 +24,7 @@ in (mkIf cfg.enable { services.atticd = { enable = true; - credentialsFile = cfg.secrets.attic-credentials; + environmentFile = cfg.secrets.attic-credentials; settings = { listen = "[::]:4005"; @@ -104,7 +104,7 @@ in # NOTE: currently this expects `attic/config.toml` to be manually # generated and placed on `/var/lib/atticd-watch-store` Environment = "XDG_CONFIG_HOME=/var/lib/atticd-watch-store"; - ExecStart = "${pkgs.attic}/bin/attic watch-store hydra"; + ExecStart = "${pkgs.attic-client}/bin/attic watch-store hydra"; Restart = "on-failure"; RestartSec = "5s"; ProtectKernelLogs = true; diff --git a/modules/services/blocky/grafana_blocky_rev3.json b/modules/services/blocky/grafana_blocky_rev3.json index e4e837c..01e6ea5 100644 --- a/modules/services/blocky/grafana_blocky_rev3.json +++ b/modules/services/blocky/grafana_blocky_rev3.json @@ -861,7 +861,7 @@ "datasource": { "uid": "5Z0Y8D3GXAMDODSF" }, - "description": "Number of occured errors", + "description": "Number of errors occurred", "fieldConfig": { "defaults": { "decimals": 0, diff --git a/modules/services/hydra.nix b/modules/services/hydra.nix index d0e5968..be30db3 100644 --- a/modules/services/hydra.nix +++ b/modules/services/hydra.nix @@ -9,7 +9,7 @@ in enable = mkEnableOption "Whether to enable Hydra, a Nix-based continuous build system"; baseURL = mkOption { type = types.str; - example = "https://hydra.kusanari.network"; + example = "https://hydra.kanata.network"; description = "The base URL for the Hydra webserver instance"; }; }; @@ -23,7 +23,7 @@ in hydraURL = cfg.baseURL; dbi = "dbi:Pg:dbname=hydra;user=hydra;"; useSubstitutes = true; - notificationSender = "hydra@kusanari.network"; + notificationSender = "hydra@kanata.network"; listenHost = "localhost"; port = 4004; diff --git a/modules/services/invidious.nix b/modules/services/invidious.nix index 949f2c7..8952cda 100644 --- a/modules/services/invidious.nix +++ b/modules/services/invidious.nix @@ -27,6 +27,7 @@ in database.createLocally = true; http3-ytproxy.enable = true; + sig-helper.enable = true; settings = { db.user = "indivious"; diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix new file mode 100644 index 0000000..1936a54 --- /dev/null +++ b/modules/services/jellyfin.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.modules.services.jellyfin; +in +{ + options.modules.services.jellyfin = { + enable = mkEnableOption ""; + + dataDir = mkOption { type = types.str; }; + }; + + config = mkIf cfg.enable { + services.jellyfin = { + enable = true; + + dataDir = cfg.dataDir; + }; + + environment.systemPackages = with pkgs; [ + jellyfin-web + jellyfin-ffmpeg + ]; + }; +} diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 70b08e6..9a472a8 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -36,7 +36,7 @@ in services.nextcloud = { enable = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; database.createLocally = true; hostName = cfg.realHost; |