From 6c6ad8380bb91b15e1844e9af83ab3aba9a31331 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sun, 24 Sep 2023 05:46:18 +0800
Subject: [PATCH 1/2] home,zsh: actually make fzf-tab work

---
 flakes/home-manager/guanranwang/common/home.nix | 1 +
 flakes/home-manager/guanranwang/darwin/home.nix | 1 +
 flakes/home-manager/guanranwang/nixos/home.nix  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/flakes/home-manager/guanranwang/common/home.nix b/flakes/home-manager/guanranwang/common/home.nix
index 91ee42a..9a11a28 100644
--- a/flakes/home-manager/guanranwang/common/home.nix
+++ b/flakes/home-manager/guanranwang/common/home.nix
@@ -68,6 +68,7 @@
       initExtra = ''
         source ${config.xdg.configHome}/zsh/plugins/sudo/sudo.plugin.zsh
         source ${config.xdg.configHome}/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh
+        zstyle ':fzf-tab:*' fzf-command sk
       '';
       history = {
         path = "${config.xdg.configHome}/zsh/.zsh_history";
diff --git a/flakes/home-manager/guanranwang/darwin/home.nix b/flakes/home-manager/guanranwang/darwin/home.nix
index 5698846..941cc37 100644
--- a/flakes/home-manager/guanranwang/darwin/home.nix
+++ b/flakes/home-manager/guanranwang/darwin/home.nix
@@ -51,6 +51,7 @@
       yt-dlp
       aria2
       android-tools
+      skim
 
       spotify
       spicetify-cli
diff --git a/flakes/home-manager/guanranwang/nixos/home.nix b/flakes/home-manager/guanranwang/nixos/home.nix
index 3893366..3859b3a 100644
--- a/flakes/home-manager/guanranwang/nixos/home.nix
+++ b/flakes/home-manager/guanranwang/nixos/home.nix
@@ -61,6 +61,7 @@
       fastfetch
       wget
       sops
+      skim
       zoxide # rs
       trashy
       eza

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 2/2] 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