nixos+darwin: make separate user modules

5 files changed, 9 insertions, 10 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 {