diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 6b4efe0..b121d06 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -16,67 +16,6 @@ else
   export EDITOR="nvim"
 end
 
-alias b="cd .."
-alias c="clear"
-alias m="mutt"
-alias v="nvim"
-alias vc="nvim --clean"
-alias vn="nvim -u NONE"
-alias vnrc="nvim -u NORC"
-alias vnp="nvim --noplugin"
-alias tksa="tmux kill-session -a"
-alias tks="tmux kill-server"
-alias tat="tmux attach -t "
-alias tls="tmux ls"
-alias vf="v (fzf)"
-alias cs="cscope -bqR"
-alias cat="bat"
-alias t="tokei ."
-alias gst="gst-inspect-1.0"
-alias gsl="gst-launch-1.0"
-alias sds="systemctl status "
-alias sde="systemctl enable "
-alias sdd="systemctl disable "
-alias sfc="source ~/.config/fish/config.fish"
-alias icat="kitty +kitten icat (fzf)"
-alias jb="journalctl -r -b -1"
-alias jf="journalctl -f"
-alias jk="journalctl -r -k"
-alias jr="journalctl -r"
-alias ju="journalctl -u"
-alias jx="journalctl -xe"
-alias dpw="pw-dump | jq | nvim -c 'setlocal ft=json' -R"
-
-# Git helpers
-alias vg="vgrep"
-alias vs="vgrep -s"
-
-# Open fugitive with nvim directly
-alias gn="nvim +Git +only"
-
-# Open modified files
-# ACMRU = Added || Copied || Modified || Renamed || Unmerged
-# Edit all uncommitted files that have changes since the last commit (be they staged or unstaged)
-alias vd="nvim (git diff HEAD --name-only --diff-filter=ACMR)"
-# Edit all staged files that have changes since the last commit
-alias vds="nvim (git diff --staged --name-only --diff-filter=ACMR)"
-# Edit all files that were altered in the last commit
-alias vdc="nvim (git diff HEAD^ --name-only --diff-filter=ACMR)"
-# Edit files changed since master
-alias vdm="nvim (git diff master --name-only --diff-filter=ACMR)"
-# Edit files unmerged
-alias vdu="nvim (git diff --name-only --diff-filter=U | uniq)"
-# Add unmerged files
-alias vdua="git add (git diff --name-only --diff-filter=U)"
-
-# Cargo aliases
-alias cba='cargo update && cargo build --all && cargo doc'
-alias cbb='cargo build --all'
-alias cbc='cargo clean'
-alias cbd='cargo doc'
-alias cbD='cargo doc --open'
-alias cbu='cargo update'
-
 fzf_key_bindings
 
 # https://github.com/fish-shell/fish-shell/issues/7485#issuecomment-728984689
diff --git a/fish/.config/fish/functions/b.fish b/fish/.config/fish/functions/b.fish
new file mode 100644
index 0000000..39ae7b3
--- /dev/null
+++ b/fish/.config/fish/functions/b.fish
@@ -0,0 +1,3 @@
+function b --wraps='cd ..' --description 'alias b=cd ..'
+  cd .. $argv; 
+end
diff --git a/fish/.config/fish/functions/c.fish b/fish/.config/fish/functions/c.fish
new file mode 100644
index 0000000..4aa8bda
--- /dev/null
+++ b/fish/.config/fish/functions/c.fish
@@ -0,0 +1,3 @@
+function c --wraps=clear --description 'alias c=clear'
+  clear $argv; 
+end
diff --git a/fish/.config/fish/functions/cat.fish b/fish/.config/fish/functions/cat.fish
new file mode 100644
index 0000000..5ef6a67
--- /dev/null
+++ b/fish/.config/fish/functions/cat.fish
@@ -0,0 +1,3 @@
+function cat --wraps=bat --description 'alias cat=bat'
+  bat $argv; 
+end
diff --git a/fish/.config/fish/functions/cbD.fish b/fish/.config/fish/functions/cbD.fish
new file mode 100644
index 0000000..422dd1d
--- /dev/null
+++ b/fish/.config/fish/functions/cbD.fish
@@ -0,0 +1,3 @@
+function cbD --wraps='cargo doc --open' --description 'alias cbD=cargo doc --open'
+  cargo doc --open $argv; 
+end
diff --git a/fish/.config/fish/functions/cba.fish b/fish/.config/fish/functions/cba.fish
new file mode 100644
index 0000000..39ce939
--- /dev/null
+++ b/fish/.config/fish/functions/cba.fish
@@ -0,0 +1,3 @@
+function cba --wraps='cargo update && cargo build --all && cargo doc' --description 'alias cba=cargo update && cargo build --all && cargo doc'
+  cargo update && cargo build --all && cargo doc $argv; 
+end
diff --git a/fish/.config/fish/functions/cbb.fish b/fish/.config/fish/functions/cbb.fish
new file mode 100644
index 0000000..8fb30e4
--- /dev/null
+++ b/fish/.config/fish/functions/cbb.fish
@@ -0,0 +1,3 @@
+function cbb --wraps='cargo build --all' --description 'alias cbb=cargo build --all'
+  cargo build --all $argv; 
+end
diff --git a/fish/.config/fish/functions/cbc.fish b/fish/.config/fish/functions/cbc.fish
new file mode 100644
index 0000000..22800a2
--- /dev/null
+++ b/fish/.config/fish/functions/cbc.fish
@@ -0,0 +1,3 @@
+function cbc --wraps='cargo clean' --description 'alias cbc=cargo clean'
+  cargo clean $argv; 
+end
diff --git a/fish/.config/fish/functions/cbd.fish b/fish/.config/fish/functions/cbd.fish
new file mode 100644
index 0000000..43d7277
--- /dev/null
+++ b/fish/.config/fish/functions/cbd.fish
@@ -0,0 +1,3 @@
+function cbd --wraps='cargo doc' --description 'alias cbd=cargo doc'
+  cargo doc $argv; 
+end
diff --git a/fish/.config/fish/functions/cbu.fish b/fish/.config/fish/functions/cbu.fish
new file mode 100644
index 0000000..5a4bf3c
--- /dev/null
+++ b/fish/.config/fish/functions/cbu.fish
@@ -0,0 +1,3 @@
+function cbu --wraps='cargo update' --description 'alias cbu=cargo update'
+  cargo update $argv; 
+end
diff --git a/fish/.config/fish/functions/dpw.fish b/fish/.config/fish/functions/dpw.fish
new file mode 100644
index 0000000..5536d79
--- /dev/null
+++ b/fish/.config/fish/functions/dpw.fish
@@ -0,0 +1,3 @@
+function dpw --wraps=pw-dump\ \|\ jq\ \|\ nvim\ -c\ \'setlocal\ ft=json\'\ -R --description alias\ dpw=pw-dump\ \|\ jq\ \|\ nvim\ -c\ \'setlocal\ ft=json\'\ -R
+  pw-dump | jq | nvim -c 'setlocal ft=json' -R $argv; 
+end
diff --git a/fish/.config/fish/functions/gn.fish b/fish/.config/fish/functions/gn.fish
new file mode 100644
index 0000000..a669dc7
--- /dev/null
+++ b/fish/.config/fish/functions/gn.fish
@@ -0,0 +1,3 @@
+function gn --wraps='nvim +Git +only' --description 'alias gn=nvim +Git +only'
+  nvim +Git +only $argv; 
+end
diff --git a/fish/.config/fish/functions/gsl.fish b/fish/.config/fish/functions/gsl.fish
new file mode 100644
index 0000000..292d170
--- /dev/null
+++ b/fish/.config/fish/functions/gsl.fish
@@ -0,0 +1,3 @@
+function gsl --wraps=gst-launch-1.0 --description 'alias gsl=gst-launch-1.0'
+  gst-launch-1.0 $argv; 
+end
diff --git a/fish/.config/fish/functions/gst.fish b/fish/.config/fish/functions/gst.fish
new file mode 100644
index 0000000..81fdb1b
--- /dev/null
+++ b/fish/.config/fish/functions/gst.fish
@@ -0,0 +1,3 @@
+function gst --wraps=gst-inspect-1.0 --description 'alias gst=gst-inspect-1.0'
+  gst-inspect-1.0 $argv; 
+end
diff --git a/fish/.config/fish/functions/icat.fish b/fish/.config/fish/functions/icat.fish
new file mode 100644
index 0000000..19b233b
--- /dev/null
+++ b/fish/.config/fish/functions/icat.fish
@@ -0,0 +1,3 @@
+function icat --wraps='kitty +kitten icat (fzf)' --description 'alias icat=kitty +kitten icat (fzf)'
+  kitty +kitten icat (fzf) $argv; 
+end
diff --git a/fish/.config/fish/functions/jb.fish b/fish/.config/fish/functions/jb.fish
new file mode 100644
index 0000000..68063fe
--- /dev/null
+++ b/fish/.config/fish/functions/jb.fish
@@ -0,0 +1,3 @@
+function jb --wraps='journalctl -r -b -1' --description 'alias jb=journalctl -r -b -1'
+  journalctl -r -b -1 $argv; 
+end
diff --git a/fish/.config/fish/functions/jf.fish b/fish/.config/fish/functions/jf.fish
new file mode 100644
index 0000000..066f0ce
--- /dev/null
+++ b/fish/.config/fish/functions/jf.fish
@@ -0,0 +1,3 @@
+function jf --wraps='journalctl -f' --description 'alias jf=journalctl -f'
+  journalctl -f $argv; 
+end
diff --git a/fish/.config/fish/functions/jk.fish b/fish/.config/fish/functions/jk.fish
new file mode 100644
index 0000000..cc85fbe
--- /dev/null
+++ b/fish/.config/fish/functions/jk.fish
@@ -0,0 +1,3 @@
+function jk --wraps='journalctl -r -k' --description 'alias jk=journalctl -r -k'
+  journalctl -r -k $argv; 
+end
diff --git a/fish/.config/fish/functions/jr.fish b/fish/.config/fish/functions/jr.fish
new file mode 100644
index 0000000..f7b5b11
--- /dev/null
+++ b/fish/.config/fish/functions/jr.fish
@@ -0,0 +1,3 @@
+function jr --wraps='journalctl -r' --description 'alias jr=journalctl -r'
+  journalctl -r $argv; 
+end
diff --git a/fish/.config/fish/functions/ju.fish b/fish/.config/fish/functions/ju.fish
new file mode 100644
index 0000000..66ddb45
--- /dev/null
+++ b/fish/.config/fish/functions/ju.fish
@@ -0,0 +1,3 @@
+function ju --wraps='journalctl -u' --description 'alias ju=journalctl -u'
+  journalctl -u $argv; 
+end
diff --git a/fish/.config/fish/functions/jx.fish b/fish/.config/fish/functions/jx.fish
new file mode 100644
index 0000000..791c1cf
--- /dev/null
+++ b/fish/.config/fish/functions/jx.fish
@@ -0,0 +1,3 @@
+function jx --wraps='journalctl -xe' --description 'alias jx=journalctl -xe'
+  journalctl -xe $argv; 
+end
diff --git a/fish/.config/fish/functions/lg.fish b/fish/.config/fish/functions/lg.fish
new file mode 100644
index 0000000..c38d288
--- /dev/null
+++ b/fish/.config/fish/functions/lg.fish
@@ -0,0 +1,3 @@
+function lg
+  lazygit -ucd ~/.config/lazygit
+end
diff --git a/fish/.config/fish/functions/m.fish b/fish/.config/fish/functions/m.fish
new file mode 100644
index 0000000..5e02c63
--- /dev/null
+++ b/fish/.config/fish/functions/m.fish
@@ -0,0 +1,3 @@
+function m --wraps=mutt --description 'alias m=mutt'
+  mutt $argv; 
+end
diff --git a/fish/.config/fish/functions/sdd.fish b/fish/.config/fish/functions/sdd.fish
new file mode 100644
index 0000000..7357404
--- /dev/null
+++ b/fish/.config/fish/functions/sdd.fish
@@ -0,0 +1,3 @@
+function sdd --wraps='systemctl disable ' --description 'alias sdd=systemctl disable '
+  systemctl disable  $argv; 
+end
diff --git a/fish/.config/fish/functions/sde.fish b/fish/.config/fish/functions/sde.fish
new file mode 100644
index 0000000..20751dd
--- /dev/null
+++ b/fish/.config/fish/functions/sde.fish
@@ -0,0 +1,3 @@
+function sde --wraps='systemctl enable ' --description 'alias sde=systemctl enable '
+  systemctl enable  $argv; 
+end
diff --git a/fish/.config/fish/functions/sds.fish b/fish/.config/fish/functions/sds.fish
new file mode 100644
index 0000000..20d6b59
--- /dev/null
+++ b/fish/.config/fish/functions/sds.fish
@@ -0,0 +1,3 @@
+function sds --wraps='systemctl status ' --description 'alias sds=systemctl status '
+  systemctl status  $argv; 
+end
diff --git a/fish/.config/fish/functions/sfc.fish b/fish/.config/fish/functions/sfc.fish
new file mode 100644
index 0000000..4819d49
--- /dev/null
+++ b/fish/.config/fish/functions/sfc.fish
@@ -0,0 +1,3 @@
+function sfc --wraps='source ~/.config/fish/config.fish' --description 'alias sfc=source ~/.config/fish/config.fish'
+  source ~/.config/fish/config.fish $argv; 
+end
diff --git a/fish/.config/fish/functions/t.fish b/fish/.config/fish/functions/t.fish
new file mode 100644
index 0000000..e1aeb29
--- /dev/null
+++ b/fish/.config/fish/functions/t.fish
@@ -0,0 +1,3 @@
+function t --wraps='tokei .' --description 'alias t=tokei .'
+  tokei . $argv; 
+end
diff --git a/fish/.config/fish/functions/tat.fish b/fish/.config/fish/functions/tat.fish
new file mode 100644
index 0000000..b0f34e3
--- /dev/null
+++ b/fish/.config/fish/functions/tat.fish
@@ -0,0 +1,3 @@
+function tat --wraps='tmux attach -t ' --description 'alias tat=tmux attach -t '
+  tmux attach -t  $argv; 
+end
diff --git a/fish/.config/fish/functions/tks.fish b/fish/.config/fish/functions/tks.fish
new file mode 100644
index 0000000..e4ff864
--- /dev/null
+++ b/fish/.config/fish/functions/tks.fish
@@ -0,0 +1,3 @@
+function tks --wraps='tmux kill-server' --description 'alias tks=tmux kill-server'
+  tmux kill-server $argv; 
+end
diff --git a/fish/.config/fish/functions/tksa.fish b/fish/.config/fish/functions/tksa.fish
new file mode 100644
index 0000000..2f0cfd4
--- /dev/null
+++ b/fish/.config/fish/functions/tksa.fish
@@ -0,0 +1,3 @@
+function tksa --wraps='tmux kill-session -a' --description 'alias tksa=tmux kill-session -a'
+  tmux kill-session -a $argv; 
+end
diff --git a/fish/.config/fish/functions/tls.fish b/fish/.config/fish/functions/tls.fish
new file mode 100644
index 0000000..f7418a4
--- /dev/null
+++ b/fish/.config/fish/functions/tls.fish
@@ -0,0 +1,3 @@
+function tls --wraps='tmux ls' --description 'alias tls=tmux ls'
+  tmux ls $argv; 
+end
diff --git a/fish/.config/fish/functions/v.fish b/fish/.config/fish/functions/v.fish
new file mode 100644
index 0000000..d4ceb93
--- /dev/null
+++ b/fish/.config/fish/functions/v.fish
@@ -0,0 +1,3 @@
+function v --wraps=nvim --description 'alias v=nvim'
+  nvim $argv; 
+end
diff --git a/fish/.config/fish/functions/vc.fish b/fish/.config/fish/functions/vc.fish
new file mode 100644
index 0000000..97e1084
--- /dev/null
+++ b/fish/.config/fish/functions/vc.fish
@@ -0,0 +1,3 @@
+function vc --wraps='nvim --clean' --description 'alias vc=nvim --clean'
+  nvim --clean $argv; 
+end
diff --git a/fish/.config/fish/functions/vd.fish b/fish/.config/fish/functions/vd.fish
new file mode 100644
index 0000000..2c5862c
--- /dev/null
+++ b/fish/.config/fish/functions/vd.fish
@@ -0,0 +1,6 @@
+# Open modified files
+# ACMRU = Added || Copied || Modified || Renamed || Unmerged
+# Edit all uncommitted files that have changes since the last commit (be they staged or unstaged)
+function vd --wraps='nvim (git diff HEAD --name-only --diff-filter=ACMR)' --description 'alias vd=nvim (git diff HEAD --name-only --diff-filter=ACMR)'
+  nvim (git diff HEAD --name-only --diff-filter=ACMR) $argv; 
+end
diff --git a/fish/.config/fish/functions/vdc.fish b/fish/.config/fish/functions/vdc.fish
new file mode 100644
index 0000000..9183790
--- /dev/null
+++ b/fish/.config/fish/functions/vdc.fish
@@ -0,0 +1,3 @@
+function vdc --wraps='nvim (git diff HEAD^ --name-only --diff-filter=ACMR)' --description 'Edit all files that were altered in the last commit'
+  nvim (git diff HEAD^ --name-only --diff-filter=ACMR) $argv; 
+end
diff --git a/fish/.config/fish/functions/vdm.fish b/fish/.config/fish/functions/vdm.fish
new file mode 100644
index 0000000..abf451d
--- /dev/null
+++ b/fish/.config/fish/functions/vdm.fish
@@ -0,0 +1,3 @@
+function vdm --wraps='nvim (git diff master --name-only --diff-filter=ACMR)' --description 'Edit files changed since master'
+  nvim (git diff master --name-only --diff-filter=ACMR) $argv; 
+end
diff --git a/fish/.config/fish/functions/vds.fish b/fish/.config/fish/functions/vds.fish
new file mode 100644
index 0000000..cd058f7
--- /dev/null
+++ b/fish/.config/fish/functions/vds.fish
@@ -0,0 +1,3 @@
+function vds --wraps='nvim (git diff --staged --name-only --diff-filter=ACMR)' --description 'Edit all staged files that have changes since the last commit'
+  nvim (git diff --staged --name-only --diff-filter=ACMR) $argv; 
+end
diff --git a/fish/.config/fish/functions/vdu.fish b/fish/.config/fish/functions/vdu.fish
new file mode 100644
index 0000000..65ab1ba
--- /dev/null
+++ b/fish/.config/fish/functions/vdu.fish
@@ -0,0 +1,3 @@
+function vdu --wraps='nvim (git diff --name-only --diff-filter=U | uniq)' --description 'Edit files unmerged'
+  nvim (git diff --name-only --diff-filter=U | uniq) $argv; 
+end
diff --git a/fish/.config/fish/functions/vdua.fish b/fish/.config/fish/functions/vdua.fish
new file mode 100644
index 0000000..774fd97
--- /dev/null
+++ b/fish/.config/fish/functions/vdua.fish
@@ -0,0 +1,3 @@
+function vdua --wraps='git add (git diff --name-only --diff-filter=U)' --description 'Add unmerged files'
+  git add (git diff --name-only --diff-filter=U) $argv; 
+end
diff --git a/fish/.config/fish/functions/vf.fish b/fish/.config/fish/functions/vf.fish
new file mode 100644
index 0000000..ee30c2b
--- /dev/null
+++ b/fish/.config/fish/functions/vf.fish
@@ -0,0 +1,3 @@
+function vf --wraps='v (fzf)' --description 'alias vf=v (fzf)'
+  v (fzf) $argv; 
+end
diff --git a/fish/.config/fish/functions/vg.fish b/fish/.config/fish/functions/vg.fish
new file mode 100644
index 0000000..7cfa181
--- /dev/null
+++ b/fish/.config/fish/functions/vg.fish
@@ -0,0 +1,3 @@
+function vg --wraps=vgrep --description 'alias vg=vgrep'
+  vgrep $argv; 
+end
diff --git a/fish/.config/fish/functions/vn.fish b/fish/.config/fish/functions/vn.fish
new file mode 100644
index 0000000..d13fbe9
--- /dev/null
+++ b/fish/.config/fish/functions/vn.fish
@@ -0,0 +1,3 @@
+function vn --wraps='nvim -u NONE' --description 'alias vn=nvim -u NONE'
+  nvim -u NONE $argv; 
+end
diff --git a/fish/.config/fish/functions/vnp.fish b/fish/.config/fish/functions/vnp.fish
new file mode 100644
index 0000000..24f70cf
--- /dev/null
+++ b/fish/.config/fish/functions/vnp.fish
@@ -0,0 +1,3 @@
+function vnp --wraps='nvim --noplugin' --description 'alias vnp=nvim --noplugin'
+  nvim --noplugin $argv; 
+end
diff --git a/fish/.config/fish/functions/vnrc.fish b/fish/.config/fish/functions/vnrc.fish
new file mode 100644
index 0000000..3ea1848
--- /dev/null
+++ b/fish/.config/fish/functions/vnrc.fish
@@ -0,0 +1,3 @@
+function vnrc --wraps='nvim -u NORC' --description 'alias vnrc=nvim -u NORC'
+  nvim -u NORC $argv; 
+end
diff --git a/fish/.config/fish/functions/vs.fish b/fish/.config/fish/functions/vs.fish
new file mode 100644
index 0000000..f9e4b2b
--- /dev/null
+++ b/fish/.config/fish/functions/vs.fish
@@ -0,0 +1,3 @@
+function vs --wraps='vgrep -s' --description 'alias vs=vgrep -s'
+  vgrep -s $argv; 
+end