flake-parts/setups: move default specialArgs and modules to own

flake-parts module

configs/flake-parts/default.nix

@@ -4,8 +4,13 @@
     ./packages.nix
     ./templates.nix
 
+    # Here's where the shared setup configurations for this entire cluster came
+    # from.
+    ./setups.nix
+
     # Environment configurations.
     ./disko.nix
+    ./flake-parts.nix
     ./home-manager.nix
     ./nixos.nix
     ./nixvim.nix

configs/flake-parts/flake-parts.nix

@@ -0,0 +1,13 @@
+# This is simply to make using my flake modules a bit easier for my private
+# configurations.
+{ config, lib, ... }:
+
+{
+  flake.flakeModules = {
+    default = ../../modules/flake-parts;
+
+    # A little module to make it convenient for setting up the baseline of all
+    # of the configurations.
+    baseSetupsConfig = ./setups.nix;
+  };
+}

configs/flake-parts/setups.nix

@@ -0,0 +1,53 @@
+# The baseline configuration for all of the setup type in this cluster. Take
+# note this is also exported as a flake-parts module to be easily used in
+# private configurations.
+{ lib, ... }:
+
+let
+  homeManagerModules = ../../modules/home-manager;
+  nixosModules = ../../modules/nixos;
+  nixvimModules = ../../modules/nixvim;
+  wrapperManagerModules = ../../modules/wrapper-manager;
+in {
+  setups.home-manager = {
+    sharedSpecialArgs = {
+      foodogsquaredModulesPath = builtins.toString homeManagerModules;
+    };
+    sharedModules = [
+      homeManagerModules
+      ../../modules/home-manager/_private
+    ];
+  };
+
+  setups.nixos = {
+    sharedSpecialArgs = {
+      foodogsquaredUtils =
+        import ../../lib/utils/nixos.nix { inherit lib; };
+        foodogsquaredModulesPath = builtins.toString nixosModules;
+    };
+    sharedModules = [
+      nixosModules
+      ../../modules/nixos/_private
+    ];
+  };
+
+  setups.nixvim = {
+    sharedSpecialArgs = {
+      foodogsquaredModulesPath = builtins.toString nixvimModules;
+    };
+    sharedModules = [
+      nixvimModules
+      ../../modules/nixvim/_private
+    ];
+  };
+
+  setups.wrapper-manager = {
+    sharedSpecialArgs = {
+      foodogsquaredModulesPath = builtins.toString wrapperManagerModules;
+    };
+    sharedModules = [
+      wrapperManagerModules
+      ../../modules/wrapper-manager/_private
+    ];
+  };
+}

modules/flake-parts/setups/home-manager.nix

@@ -6,17 +6,13 @@
 let
   cfg = config.setups.home-manager;
   partsConfig = config;
-  homeManagerModules = ../../home-manager;
 
   # A thin wrapper around the home-manager configuration function.
   mkHome = { pkgs, lib ? pkgs.lib, system, homeManagerBranch ? "home-manager"
     , extraModules ? [ ], specialArgs ? { } }:
     inputs.${homeManagerBranch}.lib.homeManagerConfiguration {
-      extraSpecialArgs = specialArgs // {
-        foodogsquaredModulesPath = builtins.toString homeManagerModules;
-      };
-
       inherit pkgs lib;
+      extraSpecialArgs = specialArgs;
       modules = extraModules;
     };
 
@@ -219,6 +215,8 @@ in {
               config = let
                 hmUserConfig = partsConfig.setups.home-manager.configs.${name};
               in {
+                # The rationale for this is we're making sure that it is
+                # synced with the NixOS user settings.
                 userConfig = {
                   isNormalUser = lib.mkDefault true;
                   createHome = lib.mkDefault true;
@@ -348,17 +346,12 @@ in {
       ]);
   };
 
-  config = lib.mkIf (cfg.configs != { }) {
+  config = lib.mkMerge [
+    {
       setups.home-manager.sharedNixpkgsConfig = config.setups.sharedNixpkgsConfig;
+    }
 
-    # Import our own home-manager modules.
+    (lib.mkIf (cfg.configs != { }) {
-    setups.home-manager.sharedModules = [
-      homeManagerModules
-
-      # Import our private modules...
-      ../../home-manager/_private
-    ];
-
       flake = let
         # A quick data structure we can pass through multiple build pipelines.
         pureHomeManagerConfigs = let
@@ -407,5 +400,6 @@ in {
         (name: configs: lib.mapAttrs' (generateDeployNode name) configs)
         validConfigs;
       };
-  };
+    })
+  ];
 }

modules/flake-parts/setups/nixos.nix

@@ -7,7 +7,6 @@
 let
   cfg = config.setups.nixos;
   partsConfig = config;
-  nixosModules = ../../nixos;
 
   # A thin wrapper around the NixOS configuration function.
   mkHost =
@@ -17,12 +16,7 @@ let
       # on nixpkgs.lib.nixosSystem flake output.
       nixosSystem = args: import "${pkgs.path}/nixos/lib/eval-config.nix" args;
     in (lib.makeOverridable nixosSystem) {
-      inherit pkgs;
+      inherit pkgs specialArgs;
-      specialArgs = specialArgs // {
-        foodogsquaredUtils =
-          import ../../../lib/utils/nixos.nix { inherit lib; };
-        foodogsquaredModulesPath = builtins.toString nixosModules;
-      };
       modules = extraModules
         ++ [{ nixpkgs.hostPlatform = lib.mkForce system; }];
 
@@ -272,16 +266,12 @@ in {
     };
   };
 
-  config = lib.mkIf (cfg.configs != { }) {
+  config = lib.mkMerge [
+    {
       setups.nixos.sharedNixpkgsConfig = config.setups.sharedNixpkgsConfig;
+    }
 
-    setups.nixos.sharedModules = [
+    (lib.mkIf (cfg.configs != { }) {
-      # Import our own public NixOS modules.
-      nixosModules
-
-      # Import our private modules.
-      ../../nixos/_private
-    ];
 
       flake = let
         # A quick data structure we can pass through multiple build pipelines.
@@ -355,5 +345,6 @@ in {
             in lib.listToAttrs images;
         in lib.concatMapAttrs generateImages validImages;
       };
-  };
+    })
+];
 }

modules/flake-parts/setups/nixvim.nix

@@ -8,16 +8,13 @@
 let
   partsConfig = config;
   cfg = config.setups.nixvim;
-  nixvimModules = ../../nixvim;
 
   mkNixvimConfig = { system, pkgs, nixvimBranch ? "nixvim", modules ? [ ]
     , specialArgs ? { }, }:
     inputs.${nixvimBranch}.legacyPackages.${system}.makeNixvimWithModule {
       inherit pkgs;
       module = { imports = modules; };
-      extraSpecialArgs = specialArgs // {
+      extraSpecialArgs = specialArgs;
-        foodogsquaredModulesPath = builtins.toString nixvimModules;
-      };
     };
 
   modulesOption = lib.mkOption {
@@ -208,7 +205,7 @@ in {
       attrsOf (submodule [
         nixvimIntegrationModule
         ({ config, lib, ... }: {
-          config.modules =
+          config.modules = lib.optionals (config.nixvim.instance != null)
             [ inputs.${config.nixvim.branch}.nixosModules.nixvim ];
         })
       ]);
@@ -219,22 +216,18 @@ in {
       attrsOf (submodule [
         nixvimIntegrationModule
         ({ config, lib, ... }: {
-          config.modules =
+          config.modules = lib.optionals (config.nixvim.instance != null)
             [ inputs.${config.nixvim.branch}.homeManagerModules.nixvim ];
         })
       ]);
   };
 
-  config = lib.mkIf (cfg.configs != { }) {
+  config = lib.mkMerge [
+    {
       setups.nixvim.sharedNixpkgsConfig = config.setups.sharedNixpkgsConfig;
+    }
 
-    setups.nixvim.sharedModules = [
+    (lib.mkIf (cfg.configs != { }) {
-      nixvimModules
-
-      # Import our private modules.
-      ../../nixvim/_private
-    ];
-
       perSystem = { system, config, lib, ... }:
         (let
           validConfigs =
@@ -273,5 +266,6 @@ in {
               name = "${name} configuration";
             })) nixvimConfigurations;
         });
-  };
+    })
+  ];
 }

modules/flake-parts/setups/shared/config-options.nix

@@ -1,6 +1,6 @@
 { systems }:
 
-{ lib, name, ... }: {
+{ lib, name, config, ... }: {
   options = {
     systems = lib.mkOption {
       type = with lib.types; listOf str;
@@ -54,6 +54,6 @@
   };
 
   config.modules = lib.singleton {
-    _module.args = { inherit (config) firstSetupArgs; }
+    _module.args = { inherit (config) firstSetupArgs; };
   };
 }

modules/flake-parts/setups/wrapper-manager.nix

@@ -156,13 +156,13 @@ in {
       ]);
   };
 
-  config = lib.mkIf (cfg.configs != { }) {
+  config = lib.mkMerge [
+    {
       setups.wrapper-manager.sharedNixpkgsConfig =
         config.setups.sharedNixpkgsConfig;
+    }
 
-    setups.wrapper-manager.sharedModules =
+    (lib.mkIf (cfg.configs != { }) {
-      [ ../../wrapper-manager ../../wrapper-manager/_private ];
-
       perSystem = { system, config, lib, ... }:
         let
           validWrapperManagerConfigs =
@@ -182,5 +182,6 @@ in {
                 ++ metadata.modules;
             }) validWrapperManagerConfigs;
         };
-  };
+    });
+  ];
 }