diff --git a/common/home.nix b/common/home.nix
index 76c72994..433f405d 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -53,64 +53,57 @@ in {
 
   home.packages = with pkgs;
     [
-      # spotify-player
-      sd
-      go
-      pandoc
-      nodejs
+      _1password-cli
+      alejandra
+      ast-grep
+      bottom
+      btop
+      cachix
+      d2
       deploy-rs
-      vcpkg-tool
+      dust
+      fd
+      file
+      fzf
+      gnupg
+      go
+      gpg-tui
+      hasklig
+      hotedit
+      jq
+      jujutsu
       just
-      yarn
+      macchina
+      p7zip
+      pandoc
+      pfetch-rs
+      pkg-config
+      ripgrep
+      sd
+      tldr
+      vcpkg-tool
+      yt-dlp
+    ]
+    ++ lib.optionals (!device.isServer) [
+      (nerdfonts.override {fonts = ["FiraCode" "Hasklig" "NerdFontsSymbolsOnly"];})
       clang
       cmake
-      alejandra
-      pkg-config
       devenv
-      ra-multiplex
-      d2
-      jujutsu
-      # openapi-tui
-
-      # Misc
-      ttyper
-      qmk
-      ast-grep
-      p7zip
-      yt-dlp
-      # spotdl
-      picat
-      davis
-      gnupg
-      gpg-tui
-
-      file
-      jq
-      tldr
-      bottom
-      macchina
-      ripgrep
-      fd
-      dust
-      cachix
-      fzf
-      (nerdfonts.override {fonts = ["FiraCode" "Hasklig" "NerdFontsSymbolsOnly"];})
       monaspace
-      hasklig
-      pfetch-rs
-      hotedit
-      _1password-cli
+      qmk
+      ttyper
+      yarn
     ]
     ++ lib.optionals device.isLinux [
-      rr
-      sbctl
-      gptfdisk
       dig
-      usbutils
+      gptfdisk
       handlr-regex
       handlr-xdg
       lsof
       ncpamixer
+      rr
+      sbctl
+      usbutils
     ]
     ++ lib.optionals device.isMac [];
 
diff --git a/flake.lock b/flake.lock
index 0eb9b47c..bc8249b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1816,7 +1816,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Zoq4MEovQdTzsJOX7dBaYsH6VpoDEizvVNC39HcP/7U=",
+        "narHash": "sha256-8f299/5umLrM/pBs1qOpXuudN0A7oZ9oHfqcwEbDV8w=",
         "path": "./neovim",
         "type": "path"
       },
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index 489a9939..76f27e6b 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -68,6 +68,24 @@ in rec {
         enable = true;
         settings.skip_confirm_for_simple_edits = true;
       };
+      yazi = {
+        enable = true;
+        settings = {
+          open_for_directories = true;
+          keymaps = {
+            show_help = "<f1>";
+            open_file_in_vertical_split = "<c-v>";
+            open_file_in_horizontal_split = "<c-x>";
+            open_file_in_tab = "<c-t>";
+            grep_in_directory = "<c-s>";
+            replace_in_directory = "<c-g>";
+            cycle_open_buffers = "<tab>";
+            copy_relative_path_to_selected_files = "<c-y>";
+            send_to_quickfix_list = "<c-q>";
+            change_working_directory = "<c-c>";
+          };
+        };
+      };
 
       # navic = {
       #   enable = true;
@@ -507,7 +525,8 @@ in rec {
         "<leader>bb" = "require'dap'.toggle_breakpoint";
         "<leader>du" = "require'dapui'.toggle";
         "<leader>fb" = "require'telescope'.extensions.file_browser.file_browser";
-        "<leader>ff" = "require'telescope.builtin'.find_files";
+        "<leader>ff" = "require'yazi'.yazi";
+        "<leader>fg" = "require'telescope.builtin'.find_files";
         "<leader>gg" = "require'telescope.builtin'.live_grep";
         "<leader>;" = "require'telescope.builtin'.buffers";
         "zR" = "require'ufo'.openAllFolds";