diff --git a/config/fish/config.fish b/config/fish/config.fish
index 2cfad03..f2f523f 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -2,13 +2,14 @@
 
 ## Paths
 set -xU GOPATH $HOME/.go
-set -xU PATH $PATH $HOME/.local/bin $HOME/.mix $HOME/.mix/escripts $HOME/.cargo/bin $GOPATH/bin
 set -xU DOTFILES $HOME/.dotfiles
-set -xU TERMINAL 'alacritty'
-set -xU TERM 'xterm'
-set -xU EDITOR 'hx'
+
+fish_add_path $HOME/.local/bin $HOME/.mix $HOME/.mix/escripts $HOME/.cargo/bin $GOPATH/bin
 
 ## Environment setup
+set -xU TERMINAL 'foot'
+set -xU TERM 'xterm'
+set -xU EDITOR 'hx'
 
 ## Functions