diff --git a/SwarselSystems.org b/SwarselSystems.org index c8be038..149a404 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -5166,6 +5166,8 @@ This ensures that all user-configuration happens here in the config file. #+begin_src nix :tangle profiles/common/nixos/users.nix { pkgs, config, lib, ... }: { + sops.secrets.swarseluser = { neededForUsers = true; }; + users = { mutableUsers = lib.mkIf (!config.swarselsystems.initialSetup) false; users.swarsel = { @@ -5641,7 +5643,6 @@ I use sops-nix to handle secrets that I want to have available on my machines at validateSopsFiles = false; secrets = { - swarseluser = { neededForUsers = true; }; ernest = { }; frauns = { }; hotspot = { }; diff --git a/profiles/common/nixos/sops.nix b/profiles/common/nixos/sops.nix index d210491..74a8f33 100644 --- a/profiles/common/nixos/sops.nix +++ b/profiles/common/nixos/sops.nix @@ -14,7 +14,6 @@ in validateSopsFiles = false; secrets = { - swarseluser = { neededForUsers = true; }; ernest = { }; frauns = { }; hotspot = { }; diff --git a/profiles/common/nixos/users.nix b/profiles/common/nixos/users.nix index 205d1d2..87676d7 100644 --- a/profiles/common/nixos/users.nix +++ b/profiles/common/nixos/users.nix @@ -1,5 +1,7 @@ { pkgs, config, lib, ... }: { + sops.secrets.swarseluser = { neededForUsers = true; }; + users = { mutableUsers = lib.mkIf (!config.swarselsystems.initialSetup) false; users.swarsel = { diff --git a/secrets/server/winters/secrets.yaml b/secrets/server/winters/secrets.yaml index da2bad0..25400d4 100644 --- a/secrets/server/winters/secrets.yaml +++ b/secrets/server/winters/secrets.yaml @@ -29,6 +29,8 @@ vpnpass: ENC[AES256_GCM,data:fnnvxcRXM5AsnA==,iv:OP4A1qyyUc73zUB4+5wJ4yk+xff4WEF rpcpass: ENC[AES256_GCM,data:2kHNLnsSsndOZ6xaKFY0QQFD3i43NOt2,iv:8IQEIgPdRT6gqkPZsrs5c5D0iamUaZGrWNag4fDoUkU=,tag:R5d1uMGwvxFt0i2Y1DPmbA==,type:str] vpnprot: ENC[AES256_GCM,data:/NV2,iv:wVvlcdisq2PdLeNpaxE7cwBsKEJgoi/MAmWoTgHFMbQ=,tag:9wZXcI1AsSH/mHUFwiwRGw==,type:str] vpnloc: ENC[AES256_GCM,data:U8ModKho4vSHnMo9BOE978V6ZlMeQEoLaFW/,iv:Sw06YsWSZ4tGt/TRhRGkU4KdLBcmZTCY4mGqQbpEh7Q=,tag:kDoTkpzXZKEUIa1CSh3Pwg==,type:str] +#ENC[AES256_GCM,data:yp7ApA4YLSk=,iv:O/SQxKe9EWqExHbeKsTXvbst0pjCxy3yiOjmeCVjmdY=,tag:RMkAOLOLCodnPSDEuImwRw==,type:comment] +swarseluser: ENC[AES256_GCM,data:XvmOHYFNhb/bAYAZ/kmUWbbmRy/WrxSYri/Y5k+SH4N7ZIjuZDHOkWk93ERFuTb77HvhbPX/NRQraUoJoFsxGGg5co/gJnyfRg==,iv:J50PeDcC4PM3+yQ/YQNb8TW4kubwi2kjjSFU0RVFM30=,tag:ydLYkz1YKyguGZZZD/JcLA==,type:str] sops: kms: [] gcp_kms: [] @@ -44,8 +46,8 @@ sops: SHJMUFJSeGRQcTIyU1U5RXkvQi9NMzQKm8SP9jQ4fuIuddzqP+m6EJg7+zkX53jz bHaMPuLTaIHaaSDlVYe5stpyPDlZQ0NSGWV+HaIXkLZNfNM71hWYBQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-23T20:07:49Z" - mac: ENC[AES256_GCM,data:8scpO11i5qitF6V5f6lNf0PDiCBJUZnkZfdFAZXZTMYm+RUOwKC8Eo9Z853NV8edZtdHZKOBiLrOnFkitixqJvj/wRMsiuZAwIoZ3AnkTbtjBbqb4nT1TeuUMZaqCmehNi1GemN6wpH2Ow5QmVhkR0zvPF/sefOKuqrglDKyVL4=,iv:itAikiGBts1WJP3a8Jh4wzXScAHuzmc79QLGHbdnxS8=,tag:v4COFzBoKSIZs9utZxICzA==,type:str] + lastmodified: "2024-09-23T21:13:49Z" + mac: ENC[AES256_GCM,data:hGFaU+Z0rZHg6XeyVhaqinBmjjvBeaFaUG4McJgHrL2BarfJnYfvFd4DYzsGrrulVR1C3Zh/xGtrFwMi0Mtg4vxsnGIam/boy8erlYUJwwuh739LPKlxVGy8DjTlJAeSCZKWzeXskUZN9Uqt033Gx1Ve+aeyZ2qTWSg2Y52HAFY=,iv:hLmsb+yRf6Ab9D/tMzZCmtaxh9STHtew5ZQQZM/PQ58=,tag:MpKLamoJ/LHD0zUfkpLBMg==,type:str] pgp: - created_at: "2024-09-23T20:03:08Z" enc: |-