Merge remote-tracking branch 'origin/nixos' into nixos

flake.nix

@@ -67,8 +67,23 @@
         agenix.nixosModules.age
       ];
 
-      hosts.nixos-laptop.modules = [ ./hosts/nixos-laptop ];
+      hosts.nixos-laptop.modules = [
+        ./hosts/nixos-laptop
+        {
+          age.secrets.email = {
+            file = ./secrets/email-laptop.age;
+            owner = "1000";
+          };
+        }
+      ];
+
       hosts.nixos-desktop.modules = [
+        {
+          age.secrets.email = {
+            file = ./secrets/email-desktop.age;
+            owner = "1000";
+          };
+        }
         ./hosts/nixos-desktop
         self.nixosModules.containers
         self.nixosModules.gaming

modules/services/agenix.nix

@@ -18,9 +18,5 @@
       file = ../../secrets/spotifyd.age;
       owner = "1000";
     };
-    email = {
-      file = ../../secrets/email.age;
-      owner = "1000";
-    };
   };
 }

secrets/email-laptop.age

@@ -0,0 +1,12 @@
+age-encryption.org/v1
+-> ssh-ed25519 ZYd7Zg N4QvwuPBchksz2oSnK2kiAbSQvfjFhk1Um6APEfjyiI
+4/NvYN9lXyMSVh+PWmkpULJzaqrUg/fQgihP5kbLwqg
+-> ssh-ed25519 wG6LYg Il7W+WqYVNcf0hvj+ROIo2WV/8AXZzgPrhhX74wT+0Q
+zaCQoU1H5ViK02fFc/yWqqVl/M4WLB8Ct+Ro8ZW4v5s
+-> ssh-ed25519 CjuqfA M930Ze6RqjmpJ20pgUOaFGKNje2gLxiC/VVGslRJrTY
+JcWQ3DW3M6jUtyCg1AKaSTdXRo4I966oohMZnlruo0I
+-> 1[-grease TNs
+Dn2AxvyxLFE9Y9eGysrMiWT27ypcNNwvPsTWfk4usKPFZ7UMcagI36CIjQGtSJvL
+cJnCZ1l+/kE2vkGpsz3VPeQ9oDVZjhSKWsYtBMLTZKhB9aHhov5ZaWUzQKaE+pog
+--- MZBF7zyAKBcrvTooxf8LTJXXEpCLdqaUZ2H9E6a7z+I
+#a{¨nßLŞ;Ůë7v˙śQJ€ŃťjrjQ)út

secrets/secrets.nix

@@ -14,5 +14,6 @@ in {
   "smbMoritz.age".publicKeys = users ++ hosts;
   "smbMedia.age".publicKeys = users ++ hosts;
   "spotifyd.age".publicKeys = users ++ hosts;
-  "email.age".publicKeys = users ++ hosts;
+  "email-desktop.age".publicKeys = users ++ hosts;
+  "email-laptop.age".publicKeys = users ++ hosts;
 }