15 files changed, 31 insertions, 22 deletions
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index fd0aa54..56005e4 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -7,7 +7,7 @@
         ./mixins
         ./profiles
         ./services
-        ./traits
+        ./users
       ];
     };
   };
diff --git a/modules/darwin/profiles/personal.nix b/modules/darwin/profiles/personal.nix
index 537e8ae..025197a 100644
--- a/modules/darwin/profiles/personal.nix
+++ b/modules/darwin/profiles/personal.nix
@@ -1,19 +1,21 @@
 { config, lib, ... }:
+
 let
   cfg = config.profiles.personal;
 in
+
 {
   options.profiles.personal = {
     enable = lib.mkEnableOption "the Personal profile";
   };
 
   config = lib.mkIf cfg.enable {
-    homebrew.enable = true;
-
-    traits = {
+    borealis = {
       users = {
         seth.enable = true;
       };
     };
+
+    homebrew.enable = true;
   };
 }
diff --git a/modules/darwin/traits/default.nix b/modules/darwin/traits/default.nix
deleted file mode 100644
index 14812ea..0000000
--- a/modules/darwin/traits/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./users
-  ];
-}
diff --git a/modules/darwin/traits/users/default.nix b/modules/darwin/users/default.nix
index df767b4..df767b4 100644
--- a/modules/darwin/traits/users/default.nix
+++ b/modules/darwin/users/default.nix
diff --git a/modules/darwin/traits/users/seth.nix b/modules/darwin/users/seth.nix
index 4431506..44eb4d3 100644
--- a/modules/darwin/traits/users/seth.nix
+++ b/modules/darwin/users/seth.nix
@@ -1,7 +1,9 @@
 { config, lib, ... }:
+
 let
-  cfg = config.traits.users.seth;
+  cfg = config.borealis.users.seth;
 in
+
 {
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 9d0e709..b184337 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -8,6 +8,7 @@
         ./profiles
         ./services
         ./traits
+        ./users
       ];
     };
   };
diff --git a/modules/nixos/profiles/personal.nix b/modules/nixos/profiles/personal.nix
index 1d5ab8b..84697a5 100644
--- a/modules/nixos/profiles/personal.nix
+++ b/modules/nixos/profiles/personal.nix
@@ -15,6 +15,12 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    borealis = {
+      users = {
+        seth.enable = true;
+      };
+    };
+
     services = {
       tailscale.enable = true;
     };
@@ -24,10 +30,6 @@ in
         enable = true;
         secretsDir = inputs.self + "/secrets/personal";
       };
-
-      users = {
-        seth.enable = true;
-      };
     };
   };
 }
diff --git a/modules/nixos/profiles/server.nix b/modules/nixos/profiles/server.nix
index d1c54c1..d54285d 100644
--- a/modules/nixos/profiles/server.nix
+++ b/modules/nixos/profiles/server.nix
@@ -5,6 +5,7 @@
   inputs',
   ...
 }:
+
 let
   cfg = config.profiles.server;
 
@@ -13,6 +14,7 @@ let
   gb = 1024 * 1024 * 1024;
   minimumStorageKb = 15 * gb;
 in
+
 {
   options.profiles.server = {
     enable = lib.mkEnableOption "the Server profile";
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index abea86a..f4dbc3c 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -5,6 +5,5 @@
     ./mac-builder.nix
     ./nvd-diff.nix
     ./secrets.nix
-    ./users
   ];
 }
diff --git a/modules/nixos/traits/users/default.nix b/modules/nixos/users/default.nix
index df767b4..df767b4 100644
--- a/modules/nixos/traits/users/default.nix
+++ b/modules/nixos/users/default.nix
diff --git a/modules/nixos/traits/users/seth.nix b/modules/nixos/users/seth.nix
index 102dbad..34ec8ee 100644
--- a/modules/nixos/traits/users/seth.nix
+++ b/modules/nixos/users/seth.nix
@@ -4,11 +4,13 @@
   secretsDir,
   ...
 }:
+
 let
-  cfg = config.traits.users.seth;
+  cfg = config.borealis.users.seth;
 in
+
 {
-  options.traits.users.seth = {
+  options.borealis.users.seth = {
     manageSecrets = lib.mkEnableOption "automatic management of secrets" // {
       default = config.traits.secrets.enable;
       defaultText = lib.literalExpression "config.traits.secrets.enable";
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index 68faa70..9ba06e6 100644
--- a/modules/shared/default.nix
+++ b/modules/shared/default.nix
@@ -4,5 +4,6 @@
     ./mixins
     ./services
     ./traits
+    ./users
   ];
 }
diff --git a/modules/shared/traits/default.nix b/modules/shared/traits/default.nix
index 8fdce85..68dfb9d 100644
--- a/modules/shared/traits/default.nix
+++ b/modules/shared/traits/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
     ./locale.nix
-    ./users
   ];
 }
diff --git a/modules/shared/traits/users/default.nix b/modules/shared/users/default.nix
index df767b4..df767b4 100644
--- a/modules/shared/traits/users/default.nix
+++ b/modules/shared/users/default.nix
diff --git a/modules/shared/traits/users/seth.nix b/modules/shared/users/seth.nix
index 401fe55..89203c1 100644
--- a/modules/shared/traits/users/seth.nix
+++ b/modules/shared/users/seth.nix
@@ -5,11 +5,15 @@
   inputs,
   ...
 }:
+
 let
-  cfg = config.traits.users.seth;
+  cfg = config.borealis.users.seth;
+
+  inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
 in
+
 {
-  options.traits.users.seth = {
+  options.borealis.users.seth = {
     enable = lib.mkEnableOption "Seth's user & home configurations";
   };
 
@@ -28,13 +32,13 @@ in
       };
     })
 
-    (lib.mkIf (cfg.enable && pkgs.stdenv.isDarwin) {
+    (lib.mkIf (cfg.enable && isDarwin) {
       users.users.seth = {
         home = lib.mkDefault "/Users/seth";
       };
     })
 
-    (lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+    (lib.mkIf (cfg.enable && isLinux) {
       users.users.seth = {
         extraGroups = [ "wheel" ];
         isNormalUser = true;