Restructure Darwin configuration

So far, this is just based on mightymac. The other devices will be
updated soon.

.sops.yaml

@@ -46,7 +46,7 @@ creation_rules:
     key_groups:
       - age:
           - *user_mini_watcher
-  - path_regex: modules/system/common/secrets.yaml$
+  - path_regex: modules/hosts/common/secrets.yaml$
     key_groups:
       - age:
           - *system_hetznix01

lib/default.nix

@@ -2,10 +2,6 @@
   mkDarwinHost = import ./mkDarwinHost.nix { inherit inputs; };
   mkNixosHost = import ./mkNixosHost.nix { inherit inputs; };
 in {
-  inherit (mkDarwinHost)
+  inherit (mkDarwinHost) mkDarwinHost;
-    mkDarwinHost
+  inherit (mkNixosHost) mkNixosHost;
-    ;
+}
-  inherit (mkNixosHost)
-    mkNixosHost
-    ;
-}

lib/mkDarwinHost.nix

@@ -26,13 +26,13 @@
           useUserPackages = true;
           users.${username}.imports = [
             inputs.sops-nix.homeManagerModule # user-level secrets management
-            ../modules/home-manager/hosts/${hostname}/${username}.nix 
+            ../modules/hosts/darwin/${hostname}/${username}.nix 
           ];
         };
       }
 
-      ../modules/system/common/all-darwin.nix # system-wide stuff
+      ../modules/hosts/darwin # system-wide stuff
       ../modules/hosts/darwin/${hostname} # host specific stuff
     ] ++ additionalModules; # end modules
   }; # end darwinSystem
-}
+}

lib/mkNixosHost.nix

@@ -31,4 +31,4 @@
       ../modules/hosts/nixos/${hostname} # host specific stuff
     ] ++ additionalModules;
   };
-}
+}

modules/hosts/common/default.nix

@@ -335,14 +335,14 @@ in {
 
   home.file = {
     ".config/nvim/lua/config" = {
-      source = ../files/nvim/lua/config;
+      source = ./files/nvim/lua/config;
       recursive = true;
     };
     ".config/nvim/lua/plugins" = {
-      source = ../files/nvim/lua/plugins;
+      source = ./files/nvim/lua/plugins;
       recursive = true;
     };
-    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
-    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
   };
 }

modules/hosts/darwin/mightymac/gene.liverman.nix

@@ -1,9 +1,9 @@
 { username, ... }: {
   home.stateVersion = "23.11";
   imports = [
-    ../../common/all-cli.nix
+    ../home.nix
+    ../../common
     ../../common/all-gui.nix
-    ../../common/all-darwin.nix
   ];
 
   programs = {