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/nixos/default.nix | 1 - modules/nixos/mixins/home-manager.nix | 5 +++++ modules/nixos/profiles/personal.nix | 2 -- modules/nixos/traits/default.nix | 1 - modules/nixos/traits/home-manager.nix | 4 ---- 5 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 modules/nixos/mixins/home-manager.nix delete mode 100644 modules/nixos/traits/home-manager.nix (limited to 'modules/nixos') diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 8022a7c..9d0e709 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -8,7 +8,6 @@ ./profiles ./services ./traits - ./tweaks ]; }; }; diff --git a/modules/nixos/mixins/home-manager.nix b/modules/nixos/mixins/home-manager.nix new file mode 100644 index 0000000..d29211e --- /dev/null +++ b/modules/nixos/mixins/home-manager.nix @@ -0,0 +1,5 @@ +{ inputs, ... }: + +{ + imports = [ inputs.home-manager.nixosModules.home-manager ]; +} diff --git a/modules/nixos/profiles/personal.nix b/modules/nixos/profiles/personal.nix index fd59a27..1d5ab8b 100644 --- a/modules/nixos/profiles/personal.nix +++ b/modules/nixos/profiles/personal.nix @@ -20,8 +20,6 @@ in }; traits = { - home-manager.enable = true; - secrets = { enable = true; secretsDir = inputs.self + "/secrets/personal"; diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix index 6b1e796..7301952 100644 --- a/modules/nixos/traits/default.nix +++ b/modules/nixos/traits/default.nix @@ -2,7 +2,6 @@ imports = [ ./arm-builder.nix ./determinate.nix - ./home-manager.nix ./locale.nix ./mac-builder.nix ./nvd-diff.nix diff --git a/modules/nixos/traits/home-manager.nix b/modules/nixos/traits/home-manager.nix deleted file mode 100644 index 687f01d..0000000 --- a/modules/nixos/traits/home-manager.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ inputs, ... }: -{ - imports = [ inputs.home-manager.nixosModules.home-manager ]; -} -- cgit v1.2.3