modules: use individual files for user traits

3 files changed, 14 insertions, 11 deletions

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";
       };