Merge branch 'master' of https://github.com/js0ny/dotfiles

tools/fish/conf.d/alias.fish

@@ -64,7 +64,7 @@ if command -v pacman > /dev/null
     abbr --add pacu "sudo pacman -Syu"
     if command -v paru > /dev/null
         abbr --add pacs "paru -Ss"
-    elif command -v yay > /dev/null
+    else if command -v yay > /dev/null
         abbr --add pacs "yay -Ss"
     else
         abbr --add pacs "pacman -Ss"

tools/zed/keymap.json

@@ -58,5 +58,17 @@
       "k": "search::SelectNextMatch",
       "K": "search::SelectPrevMatch"
     }
+  },
+  {
+    "context": "ProjectPanel && not_editing",
+
+    "bindings": {
+      "n": "menu::SelectNext",
+      "e": "menu::SelectPrev",
+      "i": "project_panel::ExpandSelectedEntry",
+      "A": "project_panel::NewDirectory",
+      "a": "project_panel::NewFile",
+      "d": "project_panel::Delete"
+    }
   }
 ]

tools/zed/settings.json

@@ -18,9 +18,10 @@
 // custom settings, run `zed: open default settings` from the
 // command palette (cmd-shift-p / ctrl-shift-p)
 {
+  "base_keymap": "VSCode",
   "vim_mode": true,
   "ui_font_size": 16,
-  "buffer_font_size": 16,
+  "buffer_font_size": null,
   "theme": {
     "mode": "dark",
     "light": "Catppuccin Latte",