simplify some things (#353)

* flake: drop flake-parts

* flake: add back flake-parts

* flake: use flake module again for configurations

2 files changed, 41 insertions, 1 deletions

diff --git a/modules/shared/traits/default.nix b/modules/shared/traits/default.nix
index fa5ba25..2c409a7 100644
--- a/modules/shared/traits/default.nix
+++ b/modules/shared/traits/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
-    ./locale.nix
     ./home-manager.nix
+    ./locale.nix
+    ./users.nix
   ];
 }
diff --git a/modules/shared/traits/users.nix b/modules/shared/traits/users.nix
new file mode 100644
index 0000000..e18e40a
--- /dev/null
+++ b/modules/shared/traits/users.nix
@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.traits.users;
+in {
+  options.traits.users = {
+    seth = {
+      enable = lib.mkEnableOption "Seth's user & home configurations";
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.seth.enable {
+      users.users.seth =
+        {
+          shell = pkgs.fish;
+          home = lib.mkDefault (
+            if pkgs.stdenv.isDarwin
+            then "/Users/seth"
+            else "/home/seth"
+          );
+        }
+        // lib.optionalAttrs pkgs.stdenv.isLinux {
+          extraGroups = ["wheel"];
+          isNormalUser = true;
+        };
+
+      programs.fish.enable = lib.mkDefault true;
+
+      home-manager.users.seth = {
+        imports = [../../../users/seth];
+        seth.enable = true;
+      };
+    })
+  ];
+}