Multi system and pkgs cleanup

2026-06-20 12:50:42 +02:00
parent 8e21f3dae8
commit e5a75cb3b7
7 changed files with 131 additions and 98 deletions
@@ -1,70 +1,92 @@
-{ inputs, ... }: {
+{ inputs, mkPkgs, supportedSystems, ... }:
+{
  generate = { host }:
    let
      syscfg = import ./systems/${host}/cfg.nix;
      nameValuePair = name: value: { inherit name value; };
-    in ({
-      "nixos" = inputs.nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
+      systemType = syscfg.syscfg.type or "nixos";
+      defaultSystem =
+        {
+          nixos = "x86_64-linux";
+          macos = "x86_64-darwin";
+          home = "x86_64-linux";
+        }
+        .${systemType} or (throw "Unsupported system type: ${systemType}");
+      requestedSystem = syscfg.syscfg.system or defaultSystem;
+      system =
+        if builtins.elem requestedSystem supportedSystems then
+          requestedSystem
+        else
+          throw "Unsupported system '${requestedSystem}' for host '${host}'";
+      users = syscfg.syscfg.users or [ ];
+      mkLinuxHomeImports =
+        userConfig:
+        [
          ./modules/shared/syscfg
-          ./modules/shared/sops
-          ./modules/nixos
+          ./modules/shared/colors
+          ./modules/home
          syscfg
-          ./systems/${host}
-          inputs.sops-nix.nixosModules.sops
-          inputs.home-manager.nixosModules.home-manager
-
-          inputs.nixos-wsl.nixosModules.wsl
-          inputs.vscode-server.nixosModules.default
-
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users = builtins.listToAttrs (map (userConfig:
-              nameValuePair userConfig.username {
-                imports = [
-                  ./modules/shared/syscfg
-                  ./modules/shared/colors
-                  ./modules/home
-                  syscfg
-                  { usercfg = userConfig; }
-                  inputs.nix-colors.homeManagerModule
-                  inputs.sops-nix.homeManagerModules.sops
-                ];
-              }) syscfg.syscfg.users);
-          }
+          { usercfg = userConfig; }
+          inputs.nix-colors.homeManagerModule
+          inputs.sops-nix.homeManagerModules.sops
        ];
+      mkDarwinHomeImports = [ inputs.nix-colors.homeManagerModule inputs.sops-nix.homeManagerModules.sops ];
+      mkHomeUsers = importsForUser:
+        builtins.listToAttrs (
+          map (userConfig: nameValuePair userConfig.username { imports = importsForUser userConfig; }) users
+        );
+      mkHomeManager = importsForUser: {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit inputs; };
+        home-manager.users = mkHomeUsers importsForUser;
      };
+      defaultUser =
+        builtins.head (
+          builtins.filter (user: user.username == syscfg.syscfg.defaultUser) users
+          ++ [ { username = syscfg.syscfg.defaultUser; } ]
+        );
+    in
+    (
+      {
+        "nixos" = inputs.nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = { inherit inputs; };
+          modules = [
+            ./modules/shared/syscfg
+            ./modules/shared/sops
+            ./modules/nixos
+            syscfg
+            ./systems/${host}
+            inputs.sops-nix.nixosModules.sops
+            inputs.home-manager.nixosModules.home-manager

-      "macos" = inputs.darwin.lib.darwinSystem {
-        system = "x86_64-darwin";
-        modules = [
-          ./modules/shared/syscfg
-          ./modules/shared/sops
-          syscfg
-          ./systems/${host}
-          inputs.sops-nix.nixosModules.sops
-          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 {
-                imports = [
-                  inputs.nix-colors.homeManagerModule
-                  inputs.sops-nix.homeManagerModules.sops
-                ];
-              }) syscfg.syscfg.users);
-          }
-        ];
-      };
-      "home" = inputs.home-manager.lib.homeManagerConfiguration {
-        modules = [ ./modules/home ];
-      };
-      _ = throw "Unsupported system";
-    }.${syscfg.syscfg.type});
+            inputs.nixos-wsl.nixosModules.wsl
+            inputs.vscode-server.nixosModules.default
+
+            (mkHomeManager mkLinuxHomeImports)
+          ];
+        };
+
+        "macos" = inputs.darwin.lib.darwinSystem {
+          inherit system;
+          modules = [
+            ./modules/shared/syscfg
+            ./modules/shared/sops
+            syscfg
+            ./systems/${host}
+            inputs.sops-nix.darwinModules.sops
+            inputs.home-manager.darwinModules.home-manager
+            (mkHomeManager (_: mkDarwinHomeImports))
+          ];
+        };
+        "home" = inputs.home-manager.lib.homeManagerConfiguration {
+          pkgs = mkPkgs system;
+          extraSpecialArgs = { inherit inputs; };
+          modules = mkLinuxHomeImports defaultUser;
+        };
+        _ = throw "Unsupported system";
+      }
+      .${systemType}
+    );
 }