From d55fd5fc0e8fc1d056c43d2a3b762ea67d1ef8a6 Mon Sep 17 00:00:00 2001 From: soraefir Date: Fri, 1 May 2026 18:42:47 +0200 Subject: [PATCH] Fix sops --- modules/shared/sops/default.nix | 37 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/modules/shared/sops/default.nix b/modules/shared/sops/default.nix index 3d9f052..50f5236 100755 --- a/modules/shared/sops/default.nix +++ b/modules/shared/sops/default.nix @@ -14,21 +14,26 @@ in { sops.age.keyFile = keyFilePath; sops.age.generateKey = true; - sops.secrets.wifi = { }; + sops.secrets = mkMerge [ + { + wifi = { }; - sops.secrets."${config.syscfg.hostname}_ssh_priv" = { - mode = "0400"; - owner = config.users.users.${config.syscfg.defaultUser}.name; - group = config.users.users.${config.syscfg.defaultUser}.group; - }; - sops.secrets."${config.syscfg.hostname}_ssh_pub" = { - mode = "0444"; - owner = config.users.users.${config.syscfg.defaultUser}.name; - group = config.users.users.${config.syscfg.defaultUser}.group; - }; - sops.secrets."${config.syscfg.hostname}_wg_priv" = { }; - sops.secrets."${config.syscfg.hostname}_wg_pub" = { }; - sops.secrets = lib.genAttrs - (map (peerName: "${peerName}_wg_pub") config.syscfg.net.wg.server.peers) - (_: { }); + "${config.syscfg.hostname}_ssh_priv" = { + mode = "0400"; + owner = config.users.users.${config.syscfg.defaultUser}.name; + group = config.users.users.${config.syscfg.defaultUser}.group; + }; + "${config.syscfg.hostname}_ssh_pub" = { + mode = "0444"; + owner = config.users.users.${config.syscfg.defaultUser}.name; + group = config.users.users.${config.syscfg.defaultUser}.group; + }; + "${config.syscfg.hostname}_wg_priv" = { }; + "${config.syscfg.hostname}_wg_pub" = { }; + } + (lib.genAttrs + (map (peer: "${peer}_wg_pub") config.syscfg.net.wg.server.peers) + (_: { mode = "0400"; }) + ) +]; }