modules/home-manager: make it a mixin

14 files changed, 29 insertions, 32 deletions

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/traits/home-manager.nix b/modules/darwin/mixins/home-manager.nix
index 6788651..c279d2f 100644
--- a/modules/darwin/traits/home-manager.nix
+++ b/modules/darwin/mixins/home-manager.nix
@@ -1,4 +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/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/traits/home-manager.nix b/modules/nixos/mixins/home-manager.nix
index 687f01d..d29211e 100644
--- a/modules/nixos/traits/home-manager.nix
+++ b/modules/nixos/mixins/home-manager.nix
@@ -1,4 +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/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';
-      };
-    };
-  };
-}