From e272191f7ebe0db0236e859a3d8275b0891ff487 Mon Sep 17 00:00:00 2001
From: Max Bucknell <max@baseup.com.au>
Date: Sun, 19 Jan 2025 12:07:56 +0000
Subject: [PATCH] Update shell config for path mapping

---
 fish/fish.xdg.symlink/config.fish | 28 ++++++++++++++++++----------
 vim/vim.xdg.symlink/vimrc         |  3 +++
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/fish/fish.xdg.symlink/config.fish b/fish/fish.xdg.symlink/config.fish
index 98b5225..f05c4c2 100644
--- a/fish/fish.xdg.symlink/config.fish
+++ b/fish/fish.xdg.symlink/config.fish
@@ -17,15 +17,15 @@ if not contains "/opt/homebrew/share/info" $INFOPATH
 end
 
 # Rust
-fish_add_path --global "$HOME/.cargo/bin"
+fish_add_path --global --move --path "$HOME/.cargo/bin"
 
 # Ruby
-fish_add_path --global "$HOMEBREW_PREFIX/ruby/bin"
+fish_add_path --global --move --path "$(brew --prefix ruby)/bin"
 
 # Go
 set -gx GOPATH "$HOME/go"
 set -gx GOBIN "$GOPATH/bin"
-fish_add_path --global "$GOBIN"
+fish_add_path --global --move --path "$GOBIN"
 
 # Python
 
@@ -39,23 +39,31 @@ source "$HOME/dotfiles/python/venv/bin/activate.fish"
 set -gx PYTHONPATH "$PYTHONPATH:$HOME/dotfiles/lib/python"
 
 # Node.js
-set -gx NODEPATH "$HOMEBREW_PREFIX/node@$NODE_VERSION"
-fish_add_path --global "$NODEPATH/bin"
+set -gx NODEPATH "$(brew --prefix node@$NODE_VERSION)"
+fish_add_path --global --move --path "$NODEPATH/bin"
 
 # pnpm
 set -gx PNPM_HOME "$HOME/Library/pnpm"
-fish_add_path --global "$PNPM_HOME"
+fish_add_path --global --move --path "$PNPM_HOME"
 
 # Java
-set -gx JAVAPATH "$HOMEBREW_PREFIX/openjdk@21"
-fish_add_path --global "$JAVAPATH/bin"
+set -gx JAVAPATH "$(brew --prefix openjdk@21)"
+fish_add_path --global --move --path "$JAVAPATH/bin"
 
 # Android
 set -gx ANDROID_HOME "$HOME/Library/Android/sdk"
-fish_add_path --global "$ANDROID_HOME/emulator" "$ANDROID_HOME/platform-tools"
+fish_add_path --global --move --path "$ANDROID_HOME/emulator" "$ANDROID_HOME/platform-tools"
+
+# Python
+source "$HOME/dotfiles/python/venv/bin/activate.fish"
+set -gx PYTHONPATH "$PYTHONPATH:$DOTFILES_PATH/lib/python"
 
 # Local path
-fish_add_path --global "$DOTFILES_PATH/bin" "$DOTFILES_PATH/bin/misc"
+fish_add_path --global --move --path "$DOTFILES_PATH/bin" "$DOTFILES_PATH/bin/misc"
+
+# FZF
+
+set -gx FZF_DEFAULT_COMMAND 'rg --files --hidden --follow --glob "!.git/*"'
 
 # Git
 
diff --git a/vim/vim.xdg.symlink/vimrc b/vim/vim.xdg.symlink/vimrc
index 32adba9..a619e84 100644
--- a/vim/vim.xdg.symlink/vimrc
+++ b/vim/vim.xdg.symlink/vimrc
@@ -124,6 +124,9 @@ inoremap <esc> <nop>
 # Hide search highlights
 nnoremap <bs> :noh<cr>
 
+" Hide warning about exiting vim when I type ctrl-c to edit windows
+nnoremap <C-c> <silent> <C-c>
+
 # Switch between recent buffers
 nnoremap <leader><leader> <c-^>