diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 50a842e..9464e2d 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -14,6 +14,6 @@ fish_add_path $HOME/.ghcup/bin
 
 source ~/.config/fish/myfunctions/code.fish
 source ~/.config/fish/myfunctions/dotfiles.fish
-source ~/.config/fish/myfunctions/packages.fish
+source ~/.config/fish/myfunctions/pacman.fish
 source ~/.config/fish/myfunctions/qol.fish
 source ~/.config/fish/myfunctions/replacements.fish
diff --git a/.config/fish/myfunctions/dotfiles.fish b/.config/fish/myfunctions/dotfiles.fish
index 30a0f59..859999a 100644
--- a/.config/fish/myfunctions/dotfiles.fish
+++ b/.config/fish/myfunctions/dotfiles.fish
@@ -2,9 +2,6 @@ function config
 /usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME $argv
 end
 
-function lazyconfig
-    lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/ $argv
-end
-alias lc=lazyconfig
+abbr -a lc "lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/"
 
 
diff --git a/.config/fish/myfunctions/packages.fish b/.config/fish/myfunctions/packages.fish
deleted file mode 100644
index 8809bac..0000000
--- a/.config/fish/myfunctions/packages.fish
+++ /dev/null
@@ -1,32 +0,0 @@
-function i
-	sudo pacman -S $argv
-end
-
-function zi
-	sudo zypper install $argv
-end
-
-function s
-	sudo pacman -Ss $argv
-end
-
-function zs
-	sudo zypper search $argv
-end
-
-function u
-    sudo pacman -Syu
-end
-
-function zu
-    sudo zypper refresh && sudo zypper update
-end
-
-function r
-    sudo pacman -Rns $argv
-end
-
-function zr
-    sudo zypper remove $argv
-end
-
diff --git a/.config/fish/myfunctions/pacman.fish b/.config/fish/myfunctions/pacman.fish
index e3d76ee..916bc41 100644
--- a/.config/fish/myfunctions/pacman.fish
+++ b/.config/fish/myfunctions/pacman.fish
@@ -1,16 +1,5 @@
-function i
-	sudo pacman -S $argv
-end
-
-function s
-	sudo pacman -Ss $argv
-end
-
-function u
-    sudo pacman -Syu
-end
-
-function r
-    sudo pacman -Rns $argv
-end
+abbr -a i sudo pacman -S
+abbr -a s sudo pacman -Ss
+abbr -a u sudo pacman -Syu
+abbr -a r sudo pacman -Rns
 
diff --git a/.config/fish/myfunctions/replacements.fish b/.config/fish/myfunctions/replacements.fish
index 0c56528..df45d3d 100644
--- a/.config/fish/myfunctions/replacements.fish
+++ b/.config/fish/myfunctions/replacements.fish
@@ -1,8 +1,9 @@
 function ls
     exa --icons -l $argv
 end
-alias find=fd
-alias df=duf
+abbr -a find fd
+abbr -a df duf
+abbr -a v nvim
 function rm
     echo "rm is disabled, use trash instead"
 end