nixos+darwin: make separate user modules

4 files changed, 9 insertions, 5 deletions

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;