diff --git a/flake.nix b/flake.nix index 9e746d8..f5851b6 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ distrust-mini = lib.nixosSystem { system = "x86_64-linux"; modules = [./system/distrust-mini ./services/distrust-mini ./helpers/services.nix { networking.hostName = "distrust-mini"; }]; + }; }; }; } diff --git a/services/distrust/akkoma.nix b/services/distrust/akkoma.nix index 6036f04..a5a7c26 100644 --- a/services/distrust/akkoma.nix +++ b/services/distrust/akkoma.nix @@ -6,7 +6,7 @@ fediPort = 8083; inherit ((pkgs.formats.elixirConf {}).lib) mkAtom; in { - age.secrets."hidden_service/akkoma".file = ../secrets/hidden_service/akkoma; + age.secrets."hidden_service/akkoma".file = ../../secrets/hidden_service/akkoma; services = { akkoma = { diff --git a/services/distrust/forgejo.nix b/services/distrust/forgejo.nix index 4dbb721..aad5f29 100644 --- a/services/distrust/forgejo.nix +++ b/services/distrust/forgejo.nix @@ -2,7 +2,7 @@ forgejoPort = 8082; in { age.secrets."hidden_service/forgejo" = { - file = ../secrets/hidden_service/forgejo; + file = ../../secrets/hidden_service/forgejo; }; services.forgejo = { diff --git a/services/distrust/lldap.nix b/services/distrust/lldap.nix index 7ed6f2b..4b46e62 100644 --- a/services/distrust/lldap.nix +++ b/services/distrust/lldap.nix @@ -2,9 +2,9 @@ lldapPort = 8089; in { age.secrets = { - "hidden_service/lldap".file = ../secrets/hidden_service/lldap; + "hidden_service/lldap".file = ../../secrets/hidden_service/lldap; "lldap_root_pass" = { - file = ../secrets/lldap_root_pass; + file = ../../secrets/lldap_root_pass; mode = "0440"; group = "lldap-secrets"; }; diff --git a/services/distrust/mailserver.nix b/services/distrust/mailserver.nix index 431d8a2..6e6a406 100644 --- a/services/distrust/mailserver.nix +++ b/services/distrust/mailserver.nix @@ -1,5 +1,5 @@ {config, ...}: { - age.secrets."bind_pw".file = ../secrets/bind_pw; + age.secrets."bind_pw".file = ../../secrets/bind_pw; mailserver = { stateVersion = 3; diff --git a/services/distrust/nextcloud.nix b/services/distrust/nextcloud.nix index 49de985..dd0d5ef 100644 --- a/services/distrust/nextcloud.nix +++ b/services/distrust/nextcloud.nix @@ -7,8 +7,8 @@ onionHostName = "znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion"; in { age.secrets = { - "nextcloud-admin-pass".file = ../secrets/nextcloud-admin-pass; - "hidden_service/nextcloud".file = ../secrets/hidden_service/nextcloud; + "nextcloud-admin-pass".file = ../../secrets/nextcloud-admin-pass; + "hidden_service/nextcloud".file = ../../secrets/hidden_service/nextcloud; }; users.groups.nextcloud.members = ["nextcloud" "caddy"]; diff --git a/services/distrust/paste.nix b/services/distrust/paste.nix index 43f47e7..af1555d 100644 --- a/services/distrust/paste.nix +++ b/services/distrust/paste.nix @@ -1,7 +1,7 @@ {config, ...}: let pastePort = 8087; in { - age.secrets."hidden_service/microbin".file = ../secrets/hidden_service/microbin; + age.secrets."hidden_service/microbin".file = ../../secrets/hidden_service/microbin; services.microbin = { enable = true; diff --git a/services/distrust/prosody.nix b/services/distrust/prosody.nix index e8e7196..837db0b 100644 --- a/services/distrust/prosody.nix +++ b/services/distrust/prosody.nix @@ -3,7 +3,7 @@ config, ... }: { - age.secrets."prosody.env".file = ../secrets/prosody.env; + age.secrets."prosody.env".file = ../../secrets/prosody.env; services = { prosody = { diff --git a/services/distrust/site.nix b/services/distrust/site.nix index 3b3f122..8e4d9fc 100644 --- a/services/distrust/site.nix +++ b/services/distrust/site.nix @@ -3,10 +3,10 @@ pkgs, ... }: let - distrust-homepage = import ../homepage/default.nix {inherit pkgs;}; + distrust-homepage = import ../../homepage/default.nix {inherit pkgs;}; in { age.secrets."hidden_service/site" = { - file = ../secrets/hidden_service/site; + file = ../../secrets/hidden_service/site; }; distrust.services."site" = { diff --git a/services/distrust/vaultwarden.nix b/services/distrust/vaultwarden.nix index 5b1f879..f945869 100644 --- a/services/distrust/vaultwarden.nix +++ b/services/distrust/vaultwarden.nix @@ -2,8 +2,8 @@ vaultPort = 8222; in { age.secrets = { - "vaultwarden.env".file = ../secrets/vaultwarden.env; - "hidden_service/vaultwarden".file = ../secrets/hidden_service/vaultwarden; + "vaultwarden.env".file = ../../secrets/vaultwarden.env; + "hidden_service/vaultwarden".file = ../../secrets/hidden_service/vaultwarden; }; services.vaultwarden = { diff --git a/services/shared/borg.nix b/services/shared/borg.nix index 4939582..8c2d0f5 100644 --- a/services/shared/borg.nix +++ b/services/shared/borg.nix @@ -1,6 +1,6 @@ {config, ...}: { - age.secrets."borg_ed25519".file = ../secrets/borg_ed25519; - age.secrets."borg_pass".file = ../secrets/borg_pass; + age.secrets."borg_ed25519".file = ../../secrets/borg_ed25519; + age.secrets."borg_pass".file = ../../secrets/borg_pass; distrust.backups = { borgRepository = "ssh://u506783@u506783.your-storagebox.de:23";