diff --git a/run_once_before_install_main_deps.sh.tmpl b/run_once_before_install_main_deps.sh.tmpl
index 55e5e4f..330f4d1 100644
--- a/run_once_before_install_main_deps.sh.tmpl
+++ b/run_once_before_install_main_deps.sh.tmpl
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
+BASE_PACKAGES = "kitty-terminfo gpg git curl wget ripgrep fd-find unzip python3-pip htop fzf bat snapd"
+USER=$(whoami)
+
 cd ~
 
 {{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "fedora")) -}}
-sudo dnf install kitty-terminfo gpg git curl wget ripgrep fd-find unzip python3-pip htop fzf bat snapd -y
-sudo dnf install fish neovim -y
+sudo dnf install $BASE_PACKAGES -y
+sudo dnf install fish neovim util-linux-user -y
 
 fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher"
 
@@ -12,11 +15,14 @@ sudo snap install jump
 sudo dnf install cargo
 cargo install atuin
 
+echo "USER: $USER"
+sudo chsh -s /usr/bin/fish $USER
+
 {{ end -}}
 
 {{ if (and (eq .chezmoi.os "linux") (or (eq .chezmoi.osRelease.id "debian") (eq .chezmoi.osRelease.id "ubuntu"))) -}}
 sudo apt update
-sudo apt install kitty-terminfo gpg git curl wget ripgrep fd-find unzip python3-pip htop fzf bat snapd -y
+sudo apt install $BASE_PACKAGES -y
 
 
 {{ if eq .chezmoi.osRelease.id "debian" -}}