seth: simplify module structure

Moving to mixins generally reduces the boilerplate in all
configurations, and less custom "stuff"

These are then enabled by the regular options in programs.nix for
example

Many of the other options (like desktops) also had little use in being
abstracted as there's no situation where I'd *not* want them to be
applied when said desktop is in use

4 files changed, 23 insertions, 43 deletions

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index bc599c9..6d5552e 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -7,7 +7,6 @@
         ./defaults
         ./mixins
         ./profiles
-        ./users
       ];
     };
   };
diff --git a/modules/darwin/users/default.nix b/modules/darwin/users/default.nix
deleted file mode 100644
index df767b4..0000000
--- a/modules/darwin/users/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ imports = [ ./seth.nix ]; }
diff --git a/modules/darwin/users/seth.nix b/modules/darwin/users/seth.nix
deleted file mode 100644
index 44eb4d3..0000000
--- a/modules/darwin/users/seth.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.borealis.users.seth;
-in
-
-{
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      home-manager.users.seth = {
-        # NOTE: this module is for linux, not mac
-        seth.desktop.enable = false;
-      };
-    })
-  ];
-}
diff --git a/modules/shared/users/seth.nix b/modules/shared/users/seth.nix
index 89203c1..796171d 100644
--- a/modules/shared/users/seth.nix
+++ b/modules/shared/users/seth.nix
@@ -17,32 +17,30 @@ in
     enable = lib.mkEnableOption "Seth's user & home configurations";
   };
 
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      users.users.seth.shell = pkgs.fish;
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        users.users.seth.shell = pkgs.fish;
 
-      programs.fish.enable = true;
+        programs.fish.enable = true;
 
-      home-manager.users.seth = {
-        imports = [ (inputs.self + "/users/seth") ];
-        seth = {
-          enable = true;
-          programs.fish.enable = true;
+        home-manager.users.seth = {
+          imports = [ (inputs.self + "/users/seth") ];
         };
-      };
-    })
-
-    (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;
-      };
-    })
-  ];
+      }
+
+      (lib.mkIf isDarwin {
+        users.users.seth = {
+          home = lib.mkDefault "/Users/seth";
+        };
+      })
+
+      (lib.mkIf isLinux {
+        users.users.seth = {
+          extraGroups = [ "wheel" ];
+          isNormalUser = true;
+        };
+      })
+    ]
+  );
 }