flake.nix

@@ -30,22 +30,61 @@
   };
 
   outputs = inputs:
+
     let gen = import ./generator.nix { inherit inputs; };
     in {
       devShells = import ./shells { inherit inputs; };
 
       nixosConfigurations = {
-        valinor = gen.generate { host = "valinor"; };
-        iriy = gen.generate { host = "iriy"; };
-        efir = gen.generate { host = "efir"; };
-        avalon = gen.generate { host = "avalon"; };
-        ci = gen.generate { host = "ci"; };
-        sandbox = gen.generate { host = "sandbox"; };
+        valinor = gen.generate {
+          type = "nixos";
+          system = "x86_64-linux";
+          host = "valinor";
+        };
+        iriy = gen.generate {
+          type = "nixos";
+          system = "x86_64-linux";
+          host = "iriy";
+        };
+        efir = gen.generate {
+          type = "nixos";
+          system = "x86_64-linux";
+          host = "efir";
+        };
+        avalon = gen.generate {
+          type = "nixos";
+          system = "x86_64-linux";
+          host = "avalon";
+        };
+        ci = gen.generate {
+          type = "nixos";
+          system = "x86_64-linux";
+          host = "ci";
+        };
+        sandbox = gen.generate {
+          type = "nixos";
+          system = "x86_64-linux";
+          host = "sandbox";
+        };
+      };
+      darwinConfigurations = {
+        asgard = gen.generate {
+          type = "macos";
+          system = "x86_64-darwin";
+          host = "asgard";
+        };
       };
-      darwinConfigurations = { asgard = gen.generate { host = "asgard"; }; };
       homeConfigurations = {
-        yomi = gen.generate { host = "example"; };
-        example = gen.generate { host = "example"; };
+        yomi = gen.generate {
+          type = "home";
+          system = "arm-64";
+          host = "example";
+        };
+        example = gen.generate {
+          type = "home";
+          system = "-"; # supports any
+          host = "example";
+        };
       };
     };
 

generator.nix

@@ -1,11 +1,11 @@
 { inputs, ... }: {
-  generate = { host }:
+  generate = { type, system, host }:
     let
-      syscfg = import ./systems/${host}/cfg.nix;
       nameValuePair = name: value: { inherit name value; };
+      syscfg = import ./systems/${host}/cfg.nix;
     in ({
       "nixos" = inputs.nixpkgs.lib.nixosSystem {
-        system = syscfg.syscfg.system;
+        system = system;
         modules = [
           ./modules/shared/syscfg
           ./modules/shared/sops
@@ -33,33 +33,29 @@
           }
         ];
       };
-
       "macos" = inputs.darwin.lib.darwinSystem {
-        system = syscfg.system;
+        system = system;
         modules = [
-          ./modules/shared/syscfg
-          ./modules/shared/sops
-          syscfg
-          ./systems/${host}
           inputs.sops-nix.nixosModules.sops
+          ./systems/${host}
           inputs.home-manager.darwinModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users = builtins.listToAttrs (map (userConfig:
-              nameValuePair userConfig.username {
+            home-manager.users.sora = {
               imports = [
                 inputs.nix-colors.homeManagerModule
                 inputs.hyprland.homeManagerModules
+                ./systems/${host}/home.nix
               ];
-              }) syscfg.syscfg.users);
+            };
           }
         ];
       };
       "home" = inputs.home-manager.lib.homeManagerConfiguration {
-        modules = [ ./modules/home ];
+        modules = [ ./modules/home ./systems/${host}/home.nix ];
       };
       _ = throw "Unsupported system";
-    }.${syscfg.syscfg.type});
+    }.${type});
 }

modules/nixos/system/xdg/default.nix

@@ -63,6 +63,5 @@
     XDG_TEMPLATES_DIR="$HOME/media/templates"
     XDG_VIDEOS_DIR="$HOME/media/video"
   '';
-    })
-  ];
+  })];
 }

modules/server/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  # virtualisation.arion.projects.
+virtualisation.arion.projects.
 }

modules/shared/syscfg/default.nix

@@ -98,14 +98,6 @@ in with lib; {
   options.usercfg = userOpt;
   options.syscfg = {
     hostname = mkOption { type = types.str; };
-    type = mkOption {
-      type = types.enum [ "nixos" "macos" "home" ];
-      default = "nixos";
-    };
-    system = mkOption {
-      type = types.enum [ "x86_64-linux" "x86_64-darwin" "-" ];
-      default = "x86_64-linux";
-    };
     defaultUser = mkOption { type = types.str; };
     make = makeOpt;
     net = netOpt;

systems/asguard/cfg.nix

@@ -1,8 +0,0 @@
-{
-  syscfg = {
-    hostname = "asguard";
-    defaultUser = "sora";
-    type = "macos";
-    system = "x86_64-darwin";
-  };
-}

systems/avalon/cfg.nix

@@ -1,8 +1,6 @@
 {
   syscfg = {
     hostname = "avalon";
-    system = "x86_64-linux";
-    type = "nixos";
     defaultUser = "sora";
     users = [
       {
@@ -38,6 +36,7 @@
       enable = true;
       ip4 = "10.10.1.2/32";
       ip6 = "fd10:10:10::2/128";
+      pk = config.sops.secrets.avalon_wg_priv.path;
     };
   };
 }

systems/ci/cfg.nix

@@ -1,8 +1,6 @@
 {
   syscfg = {
     hostname = "ci";
-    type = "nixos";
-    system = "x86_64-linux";
     defaultUser = "ci";
     users = [{
       username = "ci";

systems/iriy/cfg.nix

@@ -1,8 +1,6 @@
 {
   syscfg = {
     hostname = "iriy";
-    type = "nixos";
-    system = "x86_64-linux";
     defaultUser = "sora";
     users = [{
       username = "sora";

systems/sandbox/cfg.nix

@@ -1,8 +1,6 @@
 {
   syscfg = {
     hostname = "sandbox";
-    type = "nixos";
-    system = "x86_64-linux";
     defaultUser = "sora";
     users = [{
       username = "sora";

systems/valinor/cfg.nix

@@ -1,8 +1,6 @@
 {
   syscfg = {
     hostname = "valinor";
-    type = "nixos";
-    system = "x86_64-linux";
     defaultUser = "sora";
     users = [{
       username = "sora";