diff --git a/features/server/backups.nix b/features/server/backups.nix index d5bb32b..c3fbb88 100644 --- a/features/server/backups.nix +++ b/features/server/backups.nix @@ -1,11 +1,11 @@ -{ config, ... }: +{ config, secrets, ... }: { imports = [ ./backups-repos.nix ]; sops.secrets.borgRepoPassword = { }; sops.secrets.borgRemoteServerPassword = { - sopsFile = "/home/homelab/secrets/backup.yaml"; + sopsFile = "${secrets}/secrets/backup.yaml"; }; services.borgbackup.jobs = { diff --git a/features/server/multimedia/slskd.nix b/features/server/multimedia/slskd.nix index 5dd3797..6a5a34c 100644 --- a/features/server/multimedia/slskd.nix +++ b/features/server/multimedia/slskd.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + secrets, + ... +}: with lib; let @@ -14,7 +19,7 @@ in config = { sops.secrets.slskd = { - sopsFile = ../../../secrets/slskd.env; + sopsFile = "${secrets}/secrets/slskd.env"; format = "dotenv"; }; diff --git a/features/server/multimedia/transmission.nix b/features/server/multimedia/transmission.nix index fdaf0cb..6362b54 100644 --- a/features/server/multimedia/transmission.nix +++ b/features/server/multimedia/transmission.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + secrets, + lib, + ... +}: with lib; let @@ -16,7 +21,7 @@ in config = { sops.secrets.transmission = { - sopsFile = ../../../secrets/transmission.json; + sopsFile = "${secrets}/secrets/transmission.json"; path = "/var/lib/secrets/transmission/settings.json"; }; diff --git a/features/server/services/homelab-dashboard.nix b/features/server/services/homelab-dashboard.nix index 247520d..ea89733 100644 --- a/features/server/services/homelab-dashboard.nix +++ b/features/server/services/homelab-dashboard.nix @@ -1,6 +1,7 @@ { config, lib, + secrets, pkgs, ... }: @@ -33,7 +34,7 @@ in #TODO: add Radarr/Sonarr/... api key support config = { sops.secrets."homepage" = { - sopsFile = ../../../secrets/homepage.env; + sopsFile = "${secrets}/secrets/homepage.env"; format = "dotenv"; }; diff --git a/flake.nix b/flake.nix index 65dc22e..817e05f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,18 +23,18 @@ }@inputs: let username = "harry123"; + secrets = builtins.toString inputs.nix-secrets; specialArgs = { inherit username; + inherit secrets; }; in { nixosConfigurations = { sisyphe = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { - inherit inputs; - }; + specialArgs = specialArgs; modules = [ ./hosts/sisyphe/configuration.nix sops-nix.nixosModules.sops diff --git a/hosts/sisyphe/server-configuration.nix b/hosts/sisyphe/server-configuration.nix index 4759b0f..8140f1f 100644 --- a/hosts/sisyphe/server-configuration.nix +++ b/hosts/sisyphe/server-configuration.nix @@ -3,14 +3,13 @@ config, lib, pkgs, - inputs, + secrets, ... }: let ip = "192.168.1.177"; gateway = "192.168.1.1"; username = "homelab"; - secrets = builtins.toString inputs.nix-secrets; in { # setting up networking!!