From 6fa0b2f154620cf8da209320865ac4a20e83b9ae Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 13 Feb 2025 20:10:29 -0500
Subject: nixos+darwin: make separate user modules

---
 modules/shared/default.nix              |  1 +
 modules/shared/traits/default.nix       |  1 -
 modules/shared/traits/users/default.nix |  1 -
 modules/shared/traits/users/seth.nix    | 44 ------------------------------
 modules/shared/users/default.nix        |  1 +
 modules/shared/users/seth.nix           | 48 +++++++++++++++++++++++++++++++++
 6 files changed, 50 insertions(+), 46 deletions(-)
 delete mode 100644 modules/shared/traits/users/default.nix
 delete mode 100644 modules/shared/traits/users/seth.nix
 create mode 100644 modules/shared/users/default.nix
 create mode 100644 modules/shared/users/seth.nix

(limited to 'modules/shared')

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/traits/users/default.nix
deleted file mode 100644
index df767b4..0000000
--- a/modules/shared/traits/users/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ imports = [ ./seth.nix ]; }
diff --git a/modules/shared/traits/users/seth.nix b/modules/shared/traits/users/seth.nix
deleted file mode 100644
index 401fe55..0000000
--- a/modules/shared/traits/users/seth.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-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 = [ (inputs.self + "/users/seth") ];
-        seth = {
-          enable = true;
-          programs.fish.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;
-      };
-    })
-  ];
-}
diff --git a/modules/shared/users/default.nix b/modules/shared/users/default.nix
new file mode 100644
index 0000000..df767b4
--- /dev/null
+++ b/modules/shared/users/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./seth.nix ]; }
diff --git a/modules/shared/users/seth.nix b/modules/shared/users/seth.nix
new file mode 100644
index 0000000..89203c1
--- /dev/null
+++ b/modules/shared/users/seth.nix
@@ -0,0 +1,48 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+
+let
+  cfg = config.borealis.users.seth;
+
+  inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
+in
+
+{
+  options.borealis.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 = [ (inputs.self + "/users/seth") ];
+        seth = {
+          enable = true;
+          programs.fish.enable = true;
+        };
+      };
+    })
+
+    (lib.mkIf (cfg.enable && isDarwin) {
+      users.users.seth = {
+        home = lib.mkDefault "/Users/seth";
+      };
+    })
+
+    (lib.mkIf (cfg.enable && isLinux) {
+      users.users.seth = {
+        extraGroups = [ "wheel" ];
+        isNormalUser = true;
+      };
+    })
+  ];
+}
-- 
cgit v1.2.3