diff --git a/hosts/marvin/services/golink.nix b/hosts/marvin/services/golink.nix index 6510539a..6e9031ab 100644 --- a/hosts/marvin/services/golink.nix +++ b/hosts/marvin/services/golink.nix @@ -1,12 +1,5 @@ { services.golink = { enable = true; - tailscaleAuthKeyFile = /run/agenix/golink-authkey; - }; - age.secrets.golink-authkey = { - file = ./secrets/golink-authkey.age; - path = "/run/agenix/golink-authkey"; - owner = "golink"; - group = "golink"; }; } diff --git a/hosts/marvin/services/vaultwarden.nix b/hosts/marvin/services/vaultwarden.nix index bdfdafa6..ff336eb1 100644 --- a/hosts/marvin/services/vaultwarden.nix +++ b/hosts/marvin/services/vaultwarden.nix @@ -18,11 +18,9 @@ in services.vaultwarden = { enable = true; dbBackend = "postgresql"; - webVaultPackage = pkgs.vaultwarden-vault; config = { # Web Server Settings domain = "https://${d.extUrl}"; - webVaultFolder = "${pkgs.vaultwarden-vault}/share/vaultwarden/vault"; rocketAddress = "0.0.0.0"; rocketCliColors = false; rocketPort = d.port; @@ -109,7 +107,6 @@ in environmentFile = config.age.secrets.vaultwarden-vars.path; }; systemd.services.vaultwarden.environment.PGPASSFILE = config.age.secrets.vaultwarden-pgpass.path; - environment.systemPackages = with pkgs; [ vaultwarden-vault ]; age.secrets.vaultwarden-vars = vaultwardenSecret // { file = ./secrets/vaultwarden-vars.age; };