diff --git a/.gitignore b/.gitignore
index 931b8131..4a7fe11b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ config/lazygit/state.yml
 config/tmux/plugins
 config/nvim/lazy-lock.json
 config/git/user_email
+config/fish/fish_variables
diff --git a/config/fish/conf.d/keychain.fish b/config/fish/conf.d/keychain.fish
index 2e7ad062..4b977a25 100644
--- a/config/fish/conf.d/keychain.fish
+++ b/config/fish/conf.d/keychain.fish
@@ -1,7 +1,3 @@
-if status is-login
-    and status is-interactive
-    # To add a key, set -Ua SSH_KEYS_TO_AUTOLOAD keypath
-    # To remove a key, set -U --erase SSH_KEYS_TO_AUTOLOAD[index_of_key]
-    keychain --eval --quiet --noask "$HOME/.ssh/id_ed25519" | source
-    keychain --eval --quiet --noask "$HOME/.ssh/id_rsa" | source
+if status is-interactive
+    keychain --eval --quiet --noask -Q id_ed25519 id_rsa | source
 end
diff --git a/config/fish/conf.d/local_paths.fish b/config/fish/conf.d/local_paths.fish
new file mode 100644
index 00000000..1cfef982
--- /dev/null
+++ b/config/fish/conf.d/local_paths.fish
@@ -0,0 +1,6 @@
+if status is-interactive
+    set -l LOCAL_BIN "$HOME/.local/bin"
+    set -l DOTFILES_BIN "$HOME/.dotfiles/bin"
+    echo $PATH | grep -i $LOCAL_BIN  - > /dev/null 2>&1 || set -gx PATH $PATH $LOCAL_BIN
+    echo $PATH | grep -i $DOTFILES_BIN  - > /dev/null 2>&1 || set -gx PATH $PATH $DOTFILES_BIN
+end
diff --git a/config/fish/config.fish b/config/fish/config.fish
index 662f8ec9..4f5eb1d3 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,5 +1,9 @@
 if status is-interactive
-    # Commands to run in interactive sessions can go here
+    fish_config theme choose CatppuccinMacchiato
+    alias vim="nvim"
+    alias vimdiff="nvim -d"
+    alias nvimdiff="nvim -d"
+    alias lg="lazygit"
 end
 
 function starship_transient_prompt_func