modules: add extra arguments private module

Even easier way to set things up now.

apps/run-workflow-with-vm/configuration.nix

@@ -46,15 +46,9 @@ import <nixpkgs/nixos/lib/eval-config.nix> {
           <sops-nix/modules/home-manager/sops.nix>
           ({ config, lib, ... }: {
             xdg.userDirs.createDirectories = lib.mkForce true;
-            _module.args.foodogsquaredLib =
-              import ../../lib/extras/home-manager-set.nix { inherit lib; };
           })
         ];
 
-        # Set up our own library.
-        _module.args.foodogsquaredLib =
-          import ../../lib/extras/nixos-set.nix { inherit lib; };
-
         # The main function of the configuration.
         workflows.workflows.${workflow}.enable = true;
 

lib/extras/home-manager-set.nix

@@ -1,6 +0,0 @@
-# The home-manager set.
-{ lib }:
-
-import ../default.nix { inherit lib; }
-// import ../home-manager.nix { inherit lib; }
-  // { sops-nix = import ../sops.nix { inherit lib; }; }

lib/extras/nixos-set.nix

@@ -1,6 +0,0 @@
-# The NixOS library set.
-{ lib }:
-
-import ../default.nix { inherit lib; }
-// import ../nixos.nix { inherit lib; }
-  // { sops-nix = import ../sops.nix { inherit lib; }; }

lib/extras/nixvim-set.nix

@@ -1,4 +0,0 @@
-# NixVim library set.
-{ lib }:
-
-import ../default.nix { inherit lib; }

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

@@ -236,11 +236,6 @@ in
     setups.home-manager.sharedModules = [
       homeManagerModules
 
-      ({ lib, ... }: {
-        _module.args.foodogsquaredLib =
-          import ../../../lib/extras/home-manager-set.nix { inherit lib; };
-      })
-
       # Import our private modules...
       ../../home-manager/_private
     ];

modules/flake-parts/setups/nixos.nix

@@ -514,11 +514,6 @@ in
       # Import our private modules.
       ../../nixos/_private
 
-      ({ lib, ... }: {
-        _module.args.foodogsquaredLib =
-          import ../../../lib/extras/nixos-set.nix { inherit lib; };
-      })
-
       # Set the home-manager-related settings.
       ({ lib, ... }: {
         home-manager.sharedModules = partsConfig.setups.home-manager.sharedModules;

modules/flake-parts/setups/nixvim.nix

@@ -104,11 +104,6 @@ in
   config = lib.mkIf (cfg.configs != { }) {
     setups.nixvim.sharedModules = [
       nixvimModules
-
-      ({ lib, ... }: {
-        _module.args.foodogsquaredLib =
-          import ../../../lib/extras/nixvim-set.nix { inherit lib; };
-      })
     ];
 
     perSystem = { system, config, lib, ... }:

modules/home-manager/_private/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./extra-arguments.nix
     ./suites/desktop.nix
     ./suites/dev.nix
     ./suites/editors.nix

modules/home-manager/_private/extra-arguments.nix

@@ -0,0 +1,15 @@
+# All of the extra module arguments to be passed as part of the home-manager
+# environment.
+{ options, lib, ... }:
+
+let
+  foodogsquaredLib = import ../../../lib { inherit lib; };
+in
+{
+  _module.args.foodogsquaredLib =
+    foodogsquaredLib.extend (self:
+      import ../../../lib/home-manager.nix { inherit lib; }
+      // lib.optionalAttrs (options?sops) {
+        sops-nix = import ../../../lib/sops.nix { inherit lib; };
+      });
+}

modules/nixos/_private/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./extra-arguments.nix
     ./suites/archiving.nix
     ./suites/browsers.nix
     ./suites/desktop.nix

modules/nixos/_private/extra-arguments.nix

@@ -0,0 +1,15 @@
+# All of the extra module arguments to be passed as part of the holistic NixOS
+# system.
+{ options, lib, ... }:
+
+let
+  foodogsquaredLib = import ../../../lib { inherit lib; };
+in
+{
+  _module.args.foodogsquaredLib =
+    foodogsquaredLib.extend (self:
+      import ../../../lib/nixos.nix { inherit lib; }
+      // lib.optionalAttrs (options?sops) {
+        sops-nix = import ../../../lib/sops.nix { inherit lib; };
+      });
+}

modules/nixvim/_private/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./extra-arguments.nix
+  ];
+}

modules/nixvim/_private/extra-arguments.nix

@@ -0,0 +1,11 @@
+# All of the extra module arguments to be passed as part of NixVim module.
+{ options, lib, ... }:
+
+let
+  foodogsquaredLib = import ../../../lib { inherit lib; };
+in
+{
+  _module.args.foodogsquaredLib =
+    foodogsquaredLib.extend (self:
+      import ../../../lib/nixvim.nix { inherit lib; });
+}