From 3b4a9dc47ad660cd4d99bd66aed336abad5185b5 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 13 Feb 2025 18:36:37 -0500 Subject: modules/home-manager: make it a mixin --- modules/shared/default.nix | 1 + modules/shared/mixins/default.nix | 5 +++++ modules/shared/mixins/home-manager.nix | 15 +++++++++++++++ modules/shared/traits/default.nix | 1 - modules/shared/traits/home-manager.nix | 25 ------------------------- 5 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 modules/shared/mixins/default.nix create mode 100644 modules/shared/mixins/home-manager.nix delete mode 100644 modules/shared/traits/home-manager.nix (limited to 'modules/shared') diff --git a/modules/shared/default.nix b/modules/shared/default.nix index c0f8e18..3b105df 100644 --- a/modules/shared/default.nix +++ b/modules/shared/default.nix @@ -1,6 +1,7 @@ { imports = [ ./defaults + ./mixins ./traits ]; } diff --git a/modules/shared/mixins/default.nix b/modules/shared/mixins/default.nix new file mode 100644 index 0000000..1e9a5a4 --- /dev/null +++ b/modules/shared/mixins/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./home-manager.nix + ]; +} diff --git a/modules/shared/mixins/home-manager.nix b/modules/shared/mixins/home-manager.nix new file mode 100644 index 0000000..f5db6b9 --- /dev/null +++ b/modules/shared/mixins/home-manager.nix @@ -0,0 +1,15 @@ +{ + inputs, + inputs', + ... +}: + +{ + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit inputs inputs'; + }; + }; +} diff --git a/modules/shared/traits/default.nix b/modules/shared/traits/default.nix index 9da1352..de3ca6c 100644 --- a/modules/shared/traits/default.nix +++ b/modules/shared/traits/default.nix @@ -1,7 +1,6 @@ { imports = [ ./determinate.nix - ./home-manager.nix ./locale.nix ./users ]; diff --git a/modules/shared/traits/home-manager.nix b/modules/shared/traits/home-manager.nix deleted file mode 100644 index 01539a3..0000000 --- a/modules/shared/traits/home-manager.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - lib, - inputs, - inputs', - ... -}: -let - cfg = config.traits.home-manager; -in -{ - options.traits.home-manager = { - enable = lib.mkEnableOption "the use of home-manager"; - }; - - config = lib.mkIf cfg.enable { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { - inherit inputs inputs'; - }; - }; - }; -} -- cgit v1.2.3