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/darwin/default.nix | 1 + modules/darwin/mixins/default.nix | 5 +++++ modules/darwin/mixins/home-manager.nix | 5 +++++ modules/darwin/profiles/personal.nix | 1 - modules/darwin/traits/default.nix | 1 - modules/darwin/traits/home-manager.nix | 4 ---- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 modules/darwin/mixins/default.nix create mode 100644 modules/darwin/mixins/home-manager.nix delete mode 100644 modules/darwin/traits/home-manager.nix (limited to 'modules/darwin') diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index af7701e..6145e27 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -5,6 +5,7 @@ ../shared ./defaults ./desktop + ./mixins ./profiles ./traits ]; diff --git a/modules/darwin/mixins/default.nix b/modules/darwin/mixins/default.nix new file mode 100644 index 0000000..1e9a5a4 --- /dev/null +++ b/modules/darwin/mixins/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./home-manager.nix + ]; +} diff --git a/modules/darwin/mixins/home-manager.nix b/modules/darwin/mixins/home-manager.nix new file mode 100644 index 0000000..c279d2f --- /dev/null +++ b/modules/darwin/mixins/home-manager.nix @@ -0,0 +1,5 @@ +{ inputs, ... }: + +{ + imports = [ inputs.home-manager.darwinModules.home-manager ]; +} diff --git a/modules/darwin/profiles/personal.nix b/modules/darwin/profiles/personal.nix index 62b0cf8..6b1ec63 100644 --- a/modules/darwin/profiles/personal.nix +++ b/modules/darwin/profiles/personal.nix @@ -11,7 +11,6 @@ in desktop.enable = true; traits = { - home-manager.enable = true; users = { seth.enable = true; }; diff --git a/modules/darwin/traits/default.nix b/modules/darwin/traits/default.nix index 2bc544a..2ed5427 100644 --- a/modules/darwin/traits/default.nix +++ b/modules/darwin/traits/default.nix @@ -1,7 +1,6 @@ { imports = [ ./determinate.nix - ./home-manager.nix ./users ]; } diff --git a/modules/darwin/traits/home-manager.nix b/modules/darwin/traits/home-manager.nix deleted file mode 100644 index 6788651..0000000 --- a/modules/darwin/traits/home-manager.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ inputs, ... }: -{ - imports = [ inputs.home-manager.darwinModules.home-manager ]; -} -- cgit v1.2.3