diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish
index cab5601..669fb4b 100644
--- a/dot_config/fish/executable_config.fish
+++ b/dot_config/fish/executable_config.fish
@@ -35,6 +35,7 @@ setpath ~/.emacs.d/bin
 setpath ~/.fly/bin
 setpath ~/.nimble/bin
 setpath ~/Projects/go/bin
+setpath ~/.bun/bin
 
 # zoxide setup
 zoxide init fish | source
@@ -43,7 +44,7 @@ zoxide init fish | source
 source ~/.config/fish/private.fish
 
 # Environment variables
-set -x EDITOR "vim"
+set -x EDITOR "hx"
 set -x USER "lu"
 set -x SHELL (which fish)
 set -x TERM xterm-256color
@@ -70,11 +71,9 @@ alias cr "cargo run"
 alias cb "cargo build"
 alias cwr "cargo watch -x run"
 alias be "bundle exec"
-alias rp "rustup"
 alias mkt "cd (mktemp -d)"
-alias y "sudo zypper"
 alias czm "chezmoi"
-alias r "ranger"
+alias lsh "ls -lah"
 # Git Aliases
 alias g "git"
 alias gs "g status --short"
@@ -90,27 +89,4 @@ alias gse "g send-email"
 alias wip "g add --all; and g commit -m WIP"
 alias squish "gs; and g commit -a --amend -C HEAD"
 alias editorigin "git remote set-url origin"
-# Mercurial Aliases
-alias h "hg"
-alias ha "hg addremove"
-alias hc "hg commit"
-alias hps "hg push"
-alias hp "hg push"
-alias hpl "hg pull"
-alias hs "hg status"
-alias hl "hg log"
-
-# Aliases that overwrite other, existing commands
-if command --search hub > /dev/null do
-  alias git "hub"
-end
-
-if command --search exa > /dev/null do
-  alias ls "exa"
-end
-
-if command --search nvim > /dev/null do
-  alias vim "nvim"
-  set -x EDITOR "nvim"
-end