diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index a9c99b1..db2b923 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -41,7 +41,7 @@ in keepassxc xfce.thunar remmina - nextcloud-client + #nextcloud-client thunderbird rofi localsend diff --git a/modules/services/adguard.nix b/modules/services/adguard.nix index 9600cab..82c89c6 100644 --- a/modules/services/adguard.nix +++ b/modules/services/adguard.nix @@ -34,6 +34,10 @@ in "domain" = "kopatz.ddns.net"; "answer" = ip; } + { + "domain" = "kavita-kopatz.duckdns.org"; + "answer" = ip; + } { "domain" = "server.home"; "answer" = ip; diff --git a/modules/services/github-runner.nix b/modules/services/github-runner.nix index c1e72a6..1ddc2ab 100644 --- a/modules/services/github-runner.nix +++ b/modules/services/github-runner.nix @@ -35,7 +35,7 @@ workDir = "/github-actions-runner"; extraPackages = with pkgs; [ rsync nodePackages.pnpm nodejs_18 ]; serviceOverrides = { - BindPaths= [ "/github-actions-runner" "/data/website" ]; + BindPaths= [ "/github-actions-runner" "/data/website" ] ++ lib.optional config.services.kavita.enable "/mnt/1tbssd/kavita"; UMask = "022"; }; }; diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix index 5181854..eebef29 100644 --- a/modules/services/kavita.nix +++ b/modules/services/kavita.nix @@ -9,9 +9,10 @@ in { networking.firewall.allowedTCPPorts = [ 5000 ]; systemd.tmpfiles.rules = [ - "d ${baseDir} 0770 kavita kavita -" + (if config.services.github-runners.oberprofis.enable then "d ${baseDir} 0750 kavita github-actions-runner -" else "d ${baseDir} 0770 kavita kavita -") "d ${baseDir}/manga 0770 kavita kavita -" - ]; + ] ++ lib.optional config.services.github-runners.oberprofis.enable "d ${baseDir}/github 0770 github-actions-runner kavita -"; + age.secrets.kavita = { file = ../../secrets/kavita.age; owner = "kavita";