small refactor

2026-06-20 13:07:06 +02:00
parent e5a75cb3b7
commit 878b660bf2
3 changed files with 11 additions and 13 deletions
@@ -41,6 +41,12 @@
        home-manager.extraSpecialArgs = { inherit inputs; };
        home-manager.users = mkHomeUsers importsForUser;
      };
+      sharedModules = [
+        ./modules/shared/syscfg
+        ./modules/shared/sops
+        syscfg
+        ./systems/${host}
+      ];
      defaultUser =
        builtins.head (
          builtins.filter (user: user.username == syscfg.syscfg.defaultUser) users
@@ -52,12 +58,8 @@
        "nixos" = inputs.nixpkgs.lib.nixosSystem {
          inherit system;
          specialArgs = { inherit inputs; };
-          modules = [
-            ./modules/shared/syscfg
-            ./modules/shared/sops
+          modules = sharedModules ++ [
            ./modules/nixos
-            syscfg
-            ./systems/${host}
            inputs.sops-nix.nixosModules.sops
            inputs.home-manager.nixosModules.home-manager

@@ -70,11 +72,7 @@

        "macos" = inputs.darwin.lib.darwinSystem {
          inherit system;
-          modules = [
-            ./modules/shared/syscfg
-            ./modules/shared/sops
-            syscfg
-            ./systems/${host}
+          modules = sharedModules ++ [
            inputs.sops-nix.darwinModules.sops
            inputs.home-manager.darwinModules.home-manager
            (mkHomeManager (_: mkDarwinHomeImports))