From 5af7ac1c3deb73d9156a9af9e37571998157d190 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 25 Feb 2024 20:04:29 +0800 Subject: [PATCH] modules: add extra arguments private module Even easier way to set things up now. --- apps/run-workflow-with-vm/configuration.nix | 6 ------ lib/extras/home-manager-set.nix | 6 ------ lib/extras/nixos-set.nix | 6 ------ lib/extras/nixvim-set.nix | 4 ---- modules/flake-parts/setups/home-manager.nix | 5 ----- modules/flake-parts/setups/nixos.nix | 5 ----- modules/flake-parts/setups/nixvim.nix | 5 ----- modules/home-manager/_private/default.nix | 1 + modules/home-manager/_private/extra-arguments.nix | 15 +++++++++++++++ modules/nixos/_private/default.nix | 1 + modules/nixos/_private/extra-arguments.nix | 15 +++++++++++++++ modules/nixvim/_private/default.nix | 5 +++++ modules/nixvim/_private/extra-arguments.nix | 11 +++++++++++ 13 files changed, 48 insertions(+), 37 deletions(-) delete mode 100644 lib/extras/home-manager-set.nix delete mode 100644 lib/extras/nixos-set.nix delete mode 100644 lib/extras/nixvim-set.nix create mode 100644 modules/home-manager/_private/extra-arguments.nix create mode 100644 modules/nixos/_private/extra-arguments.nix create mode 100644 modules/nixvim/_private/default.nix create mode 100644 modules/nixvim/_private/extra-arguments.nix diff --git a/apps/run-workflow-with-vm/configuration.nix b/apps/run-workflow-with-vm/configuration.nix index 80d3eef4..e305bdef 100644 --- a/apps/run-workflow-with-vm/configuration.nix +++ b/apps/run-workflow-with-vm/configuration.nix @@ -46,15 +46,9 @@ import { ({ 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; diff --git a/lib/extras/home-manager-set.nix b/lib/extras/home-manager-set.nix deleted file mode 100644 index b84c3080..00000000 --- a/lib/extras/home-manager-set.nix +++ /dev/null @@ -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; }; } diff --git a/lib/extras/nixos-set.nix b/lib/extras/nixos-set.nix deleted file mode 100644 index 84e53f97..00000000 --- a/lib/extras/nixos-set.nix +++ /dev/null @@ -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; }; } diff --git a/lib/extras/nixvim-set.nix b/lib/extras/nixvim-set.nix deleted file mode 100644 index da95b8ac..00000000 --- a/lib/extras/nixvim-set.nix +++ /dev/null @@ -1,4 +0,0 @@ -# NixVim library set. -{ lib }: - -import ../default.nix { inherit lib; } diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix index 7c0c8198..1ecf8ff1 100644 --- a/modules/flake-parts/setups/home-manager.nix +++ b/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 ]; diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix index fe70c649..e46260ee 100644 --- a/modules/flake-parts/setups/nixos.nix +++ b/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; diff --git a/modules/flake-parts/setups/nixvim.nix b/modules/flake-parts/setups/nixvim.nix index 315a58f4..42037aec 100644 --- a/modules/flake-parts/setups/nixvim.nix +++ b/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, ... }: diff --git a/modules/home-manager/_private/default.nix b/modules/home-manager/_private/default.nix index aef11939..0f180cfc 100644 --- a/modules/home-manager/_private/default.nix +++ b/modules/home-manager/_private/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./extra-arguments.nix ./suites/desktop.nix ./suites/dev.nix ./suites/editors.nix diff --git a/modules/home-manager/_private/extra-arguments.nix b/modules/home-manager/_private/extra-arguments.nix new file mode 100644 index 00000000..e740024a --- /dev/null +++ b/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; }; + }); +} diff --git a/modules/nixos/_private/default.nix b/modules/nixos/_private/default.nix index 838d3eb9..3a22f193 100644 --- a/modules/nixos/_private/default.nix +++ b/modules/nixos/_private/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./extra-arguments.nix ./suites/archiving.nix ./suites/browsers.nix ./suites/desktop.nix diff --git a/modules/nixos/_private/extra-arguments.nix b/modules/nixos/_private/extra-arguments.nix new file mode 100644 index 00000000..c04619b6 --- /dev/null +++ b/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; }; + }); +} diff --git a/modules/nixvim/_private/default.nix b/modules/nixvim/_private/default.nix new file mode 100644 index 00000000..af907387 --- /dev/null +++ b/modules/nixvim/_private/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./extra-arguments.nix + ]; +} diff --git a/modules/nixvim/_private/extra-arguments.nix b/modules/nixvim/_private/extra-arguments.nix new file mode 100644 index 00000000..3acbf19c --- /dev/null +++ b/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; }); +}