From fb0d9ba00d19944e6800b4aa8527700e252de144 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 25 Sep 2023 15:47:48 +0800
Subject: [PATCH] darwin,users: modify user config structure

---
 flakes/darwin/users/default.nix                  |  2 +-
 flakes/darwin/users/guanranwang.nix              | 10 ----------
 flakes/darwin/users/normal-users/guanranwang.nix | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 flakes/darwin/users/guanranwang.nix
 create mode 100644 flakes/darwin/users/normal-users/guanranwang.nix

diff --git a/flakes/darwin/users/default.nix b/flakes/darwin/users/default.nix
index 8089f80..877c045 100644
--- a/flakes/darwin/users/default.nix
+++ b/flakes/darwin/users/default.nix
@@ -2,6 +2,6 @@
 
 {
   imports = [
-    ./guanranwang.nix
+    ./normal-users/guanranwang.nix
   ];
 }
\ No newline at end of file
diff --git a/flakes/darwin/users/guanranwang.nix b/flakes/darwin/users/guanranwang.nix
deleted file mode 100644
index abd863e..0000000
--- a/flakes/darwin/users/guanranwang.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  users.users.guanranwang = {
-    createHome = true;
-    description = "Guanran Wang";
-    home = "/Users/guanranwang";
-    shell = pkgs.fish;
-  };
-}
\ No newline at end of file
diff --git a/flakes/darwin/users/normal-users/guanranwang.nix b/flakes/darwin/users/normal-users/guanranwang.nix
new file mode 100644
index 0000000..9867e55
--- /dev/null
+++ b/flakes/darwin/users/normal-users/guanranwang.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  users = {
+    knownUsers = [ "guanranwang" ];
+    users."guanranwang" = {
+      createHome = true;
+      description = "Guanran Wang";
+      home = "/Users/guanranwang";
+      shell = pkgs.fish;
+      uid = 501;
+    };
+  };
+}
\ No newline at end of file