10 files changed, 66 insertions, 54 deletions
diff --git a/modules/darwin/traits/default.nix b/modules/darwin/traits/default.nix
index 0939a66..3664eb7 100644
--- a/modules/darwin/traits/default.nix
+++ b/modules/darwin/traits/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
     ./home-manager.nix
-    ./users.nix
+    ./users
   ];
 }
diff --git a/modules/darwin/traits/users/default.nix b/modules/darwin/traits/users/default.nix
new file mode 100644
index 0000000..a81dacf
--- /dev/null
+++ b/modules/darwin/traits/users/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./seth.nix
+  ];
+}
diff --git a/modules/darwin/traits/users.nix b/modules/darwin/traits/users/seth.nix
index 7ad7491..5e206f3 100644
--- a/modules/darwin/traits/users.nix
+++ b/modules/darwin/traits/users/seth.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.traits.users;
+  cfg = config.traits.users.seth;
 in {
   config = lib.mkMerge [
-    (lib.mkIf cfg.seth.enable {
+    (lib.mkIf cfg.enable {
       home-manager.users.seth = {
         seth.desktop.enable = false;
       };
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index 1a69edb..7f03a58 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -7,7 +7,7 @@
     ./nvidia.nix
     ./secrets.nix
     ./tailscale.nix
-    ./users.nix
+    ./users
     ./zram.nix
   ];
 }
diff --git a/modules/nixos/traits/users/default.nix b/modules/nixos/traits/users/default.nix
new file mode 100644
index 0000000..a81dacf
--- /dev/null
+++ b/modules/nixos/traits/users/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./seth.nix
+  ];
+}
diff --git a/modules/nixos/traits/users.nix b/modules/nixos/traits/users/seth.nix
index 2802901..9ebb6c8 100644
--- a/modules/nixos/traits/users.nix
+++ b/modules/nixos/traits/users/seth.nix
@@ -4,20 +4,18 @@
   secretsDir,
   ...
 }: let
-  cfg = config.traits.users;
+  cfg = config.traits.users.seth;
 in {
-  options.traits.users = {
-    seth = {
-      manageSecrets =
-        lib.mkEnableOption "automatic secrets management"
-        // {
-          default = config.traits.secrets.enable;
-        };
-    };
+  options.traits.users.seth = {
+    manageSecrets =
+      lib.mkEnableOption "automatic secrets management"
+      // {
+        default = config.traits.secrets.enable;
+      };
   };
 
   config = lib.mkMerge [
-    (lib.mkIf (cfg.seth.enable && cfg.seth.manageSecrets) {
+    (lib.mkIf (cfg.enable && cfg.manageSecrets) {
       age.secrets = {
         sethPassword.file = secretsDir + "/sethPassword.age";
       };
diff --git a/modules/shared/traits/default.nix b/modules/shared/traits/default.nix
index 2c409a7..ad1ecb0 100644
--- a/modules/shared/traits/default.nix
+++ b/modules/shared/traits/default.nix
@@ -2,6 +2,6 @@
   imports = [
     ./home-manager.nix
     ./locale.nix
-    ./users.nix
+    ./users
   ];
 }
diff --git a/modules/shared/traits/users.nix b/modules/shared/traits/users.nix
deleted file mode 100644
index e18e40a..0000000
--- a/modules/shared/traits/users.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.traits.users;
-in {
-  options.traits.users = {
-    seth = {
-      enable = lib.mkEnableOption "Seth's user & home configurations";
-    };
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.seth.enable {
-      users.users.seth =
-        {
-          shell = pkgs.fish;
-          home = lib.mkDefault (
-            if pkgs.stdenv.isDarwin
-            then "/Users/seth"
-            else "/home/seth"
-          );
-        }
-        // lib.optionalAttrs pkgs.stdenv.isLinux {
-          extraGroups = ["wheel"];
-          isNormalUser = true;
-        };
-
-      programs.fish.enable = lib.mkDefault true;
-
-      home-manager.users.seth = {
-        imports = [../../../users/seth];
-        seth.enable = true;
-      };
-    })
-  ];
-}
diff --git a/modules/shared/traits/users/default.nix b/modules/shared/traits/users/default.nix
new file mode 100644
index 0000000..a81dacf
--- /dev/null
+++ b/modules/shared/traits/users/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./seth.nix
+  ];
+}
diff --git a/modules/shared/traits/users/seth.nix b/modules/shared/traits/users/seth.nix
new file mode 100644
index 0000000..ce86efb
--- /dev/null
+++ b/modules/shared/traits/users/seth.nix
@@ -0,0 +1,38 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.traits.users.seth;
+in {
+  options.traits.users.seth = {
+    enable = lib.mkEnableOption "Seth's user & home configurations";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      users.users.seth.shell = pkgs.fish;
+
+      programs.fish.enable = true;
+
+      home-manager.users.seth = {
+        imports = [../../../../users/seth];
+        seth.enable = true;
+      };
+    })
+
+    (lib.mkIf (cfg.enable && pkgs.stdenv.isDarwin) {
+      users.users.seth = {
+        home = lib.mkDefault "/Users/seth";
+      };
+    })
+
+    (lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+      users.users.seth = {
+        extraGroups = ["wheel"];
+        isNormalUser = true;
+      };
+    })
+  ];
+}