outputs.nix

@@ -34,95 +34,20 @@ in {
         overlays = [];
       };
     };
-    airgead = {
-      imports = [
-        hosts/airgead
-        ragenix.nixosModules.default
-      ];
-    };
-    brighde = {
-      imports = [
-        hosts/brighde
-        ragenix.nixosModules.default
-      ];
-    };
-    ceilidh = {
-      imports = [
-        hosts/ceilidh
-        ragenix.nixosModules.default
-      ];
-    };
-    ceitidh = {
-      imports = [
-        hosts/ceitidh
-        ragenix.nixosModules.default
-      ];
-    };
-    cuallaidh = {
-      imports = [
-        hosts/cuallaidh
-        ragenix.nixosModules.default
-      ];
-    };
-    dhu = {
-      imports = [
-        hosts/dhu
-        ragenix.nixosModules.default
-      ];
-    };
-    dionach = {
-      imports = [
-        hosts/dionach
-        ragenix.nixosModules.default
-      ];
-    };
-    doilidh = {
-      imports = [
-        hosts/doilidh
-        ragenix.nixosModules.default
-      ];
-    };
-    eamhair = {
-      imports = [
-        hosts/eamhair
-        ragenix.nixosModules.default
-      ];
-    };
-    iolear-beag = {
-      imports = [
-        hosts/iolear-beag
-        ragenix.nixosModules.default
-      ];
-    };
-    paidh-uachdar = {
-      imports = [
-        hosts/paidh-uachdar
-        ragenix.nixosModules.default
-      ];
-    };
-    sanganto = {
-      imports = [
-        hosts/sanganto
-        ragenix.nixosModules.default
-      ];
-    };
-    sercanto = {
-      imports = [
-        hosts/sercanto
-        ragenix.nixosModules.default
-      ];
-    };
-    sithlainnir = {
-      imports = [
-        hosts/sithlainnir
-        ragenix.nixosModules.default
-      ];
-    };
-    teintidh = {
-      imports = [
-        hosts/teintidh
-        ragenix.nixosModules.default
-      ];
-    };
+    airgead = {imports = [hosts/airgead];};
+    brighde = {imports = [hosts/brighde];};
+    ceilidh = {imports = [hosts/ceilidh];};
+    ceitidh = {imports = [hosts/ceitidh];};
+    cuallaidh = {imports = [hosts/cuallaidh];};
+    dhu = {imports = [hosts/dhu];};
+    dionach = {imports = [hosts/dionach];};
+    doilidh = {imports = [hosts/doilidh];};
+    eamhair = {imports = [hosts/eamhair];};
+    iolear-beag = {imports = [hosts/iolear-beag];};
+    paidh-uachdar = {imports = [hosts/paidh-uachdar];};
+    sanganto = {imports = [hosts/sanganto];};
+    sercanto = {imports = [hosts/sercanto];};
+    sithlainnir = {imports = [hosts/sithlainnir];};
+    teintidh = {imports = [hosts/teintidh];};
   };
 }

profiles/desktop_common.nix

@@ -11,8 +11,8 @@
     ../profiles/daedalus.nix
     ../profiles/openssh.nix
     ../profiles/powerManagement.nix
-    ../profiles/users-core.nix
-    ../profiles/users.nix
+    ../secrets/users-core.nix
+    ../secrets/users.nix
   ];
 
   # Common Desktop Packages