diff --git a/darwin/users/default.nix b/darwin/users/default.nix index 8089f80..877c045 100644 --- a/darwin/users/default.nix +++ b/darwin/users/default.nix @@ -2,6 +2,6 @@ { imports = [ - ./guanranwang.nix + ./normal-users/guanranwang.nix ]; } \ No newline at end of file diff --git a/darwin/users/guanranwang.nix b/darwin/users/guanranwang.nix deleted file mode 100644 index abd863e..0000000 --- a/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 diff --git a/users/guanranwang/home-manager/common/home.nix b/users/guanranwang/home-manager/common/home.nix index 91ee42a..9a11a28 100644 --- a/users/guanranwang/home-manager/common/home.nix +++ b/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"; diff --git a/users/guanranwang/home-manager/darwin/home.nix b/users/guanranwang/home-manager/darwin/home.nix index 5698846..941cc37 100644 --- a/users/guanranwang/home-manager/darwin/home.nix +++ b/users/guanranwang/home-manager/darwin/home.nix @@ -51,6 +51,7 @@ yt-dlp aria2 android-tools + skim spotify spicetify-cli diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix index 3893366..3859b3a 100644 --- a/users/guanranwang/home-manager/nixos/home.nix +++ b/users/guanranwang/home-manager/nixos/home.nix @@ -61,6 +61,7 @@ fastfetch wget sops + skim zoxide # rs trashy eza