Cfg updated

flake.nix

@@ -30,67 +30,23 @@
   };
 
   outputs = inputs:
-    let
-      gen = import ./generator.nix { inherit inputs; };
-      sys = builtins.attrNames
-        #  (builtins.filterSource (path: type: type == "directory")
-        (builtins.readDir ./systems); # );
-      gensys = builtins.listToAttrs
-        (builtins.map (x: gen.generate { syspath = x; }) sys);
+    let gen = import ./generator.nix { inherit inputs; };
     in {
       devShells = import ./shells { inherit inputs; };
-      inherit gensys;
-      # nixosConfigurations = {
-      #   valinor = gen.generate {
-      #     type = "nixos";
-      #     system = "";
-      #     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";
-      #   };
-      # };
-      # homeConfigurations = {
-      #   yomi = gen.generate {
-      #     type = "home";
-      #     system = "arm-64";
-      #     host = "example";
-      #   };
-      #   example = gen.generate {
-      #     type = "home";
-      #     system = "-"; # supports any
-      #     host = "example";
-      #   };
-      # };
+
+      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"; };
+      };
+      darwinConfigurations = { asgard = gen.generate { host = "asgard"; }; };
+      homeConfigurations = {
+        yomi = gen.generate { host = "example"; };
+        example = gen.generate { host = "example"; };
+      };
     };
 
   # ===== Unsupported/NotImplemented ======

generator.nix

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

systems/asguard/cfg.nix

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

systems/avalon/cfg.nix

@@ -1,6 +1,8 @@
 {
   syscfg = {
     hostname = "avalon";
+    system = "x86_64-linux";
+    type = "nixos";
     defaultUser = "sora";
     users = [
       {
@@ -36,7 +38,6 @@
       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,6 +1,8 @@
 {
   syscfg = {
     hostname = "ci";
+    type = "nixos";
+    system = "x86_64-linux";
     defaultUser = "ci";
     users = [{
       username = "ci";

systems/iriy/cfg.nix

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

systems/sandbox/cfg.nix

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

systems/valinor/cfg.nix

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