Merge branch 'master' of https://github.com/Guanran928/flake

darwin/users/default.nix

@@ -2,6 +2,6 @@
 
 {
   imports = [
-    ./guanranwang.nix
+    ./normal-users/guanranwang.nix
   ];
 }

darwin/users/guanranwang.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  users.users.guanranwang = {
-    createHome = true;
-    description = "Guanran Wang";
-    home = "/Users/guanranwang";
-    shell = pkgs.fish;
-  };
-}

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;
+    };
+  };
+}

users/guanranwang/home-manager/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";

users/guanranwang/home-manager/darwin/home.nix

@@ -51,6 +51,7 @@
       yt-dlp
       aria2
       android-tools
+      skim
 
       spotify
       spicetify-cli

users/guanranwang/home-manager/nixos/home.nix

@@ -61,6 +61,7 @@
       fastfetch
       wget
       sops
+      skim
       zoxide # rs
       trashy
       eza