diff --git a/run_once_before_install_main_deps.sh.tmpl b/run_once_before_install_main_deps.sh.tmpl
index 14f05c0..51d0c15 100644
--- a/run_once_before_install_main_deps.sh.tmpl
+++ b/run_once_before_install_main_deps.sh.tmpl
@@ -3,8 +3,8 @@ cd ~
 
 {{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "fedora")) -}}
 sudo dnf install kitty-terminfo
-sudo dnf install gpg git curl wget ripgrep fd-find unzip util-linux util-linux-user python3-pip cargo go htop fzf bat -y
-sudo dnf install fish neovim kitty-fish-integration -y
+sudo dnf install gpg git curl wget ripgrep fd-find unzip python3-pip cargo go htop fzf bat -y
+sudo dnf install fish neovim -y
 
 fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher"
 
@@ -14,18 +14,25 @@ cargo install atuin
 
 {{ end -}}
 
-{{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "debian")) -}}
+{{ 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 -y
 sudo apt install gpg git curl wget ripgrep fd-find unzip python3-pip htop fzf bat snapd -y
 
 
+{{ if eq .chezmoi.osRelease.id "debian" -}}
 ## Install fish repo
 VERS={{ .chezmoi.osRelease.versionID }}
 echo "deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_$VERS/ /" | sudo tee /etc/apt/sources.list.d/shells:fish:release:3.list
 curl -fsSL "https://download.opensuse.org/repositories/shells:fish:release:3/Debian_$VERS/Release.key" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null
-sudo apt update
+{{ end -}}
 
+{{ if eq .chezmoi.osRelease.id "ubuntu" -}}
+sudo apt-add-repository ppa:fish-shell/release-3
+{{ end -}}
+
+
+sudo apt update
 
 ## Install fish
 sudo apt install fish -y
@@ -33,19 +40,7 @@ fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/fun
 
 
 ## Install neovim
-sudo curl -L https://github.com/neovim/neovim/releases/latest/download/nvim.appimage --output /usr/local/bin/nvim.appimage
-sudo chmod a+x /usr/local/bin/nvim.appimage
-sudo ln -s /usr/local/bin/nvim.appimage /usr/local/bin/nvim
-
-CUSTOM_NVIM_PATH=/usr/local/bin/nvim.appimage
-# Set the above with the correct path, then run the rest of the commands:
-set -u
-sudo update-alternatives --install /usr/bin/ex ex "${CUSTOM_NVIM_PATH}" 110
-sudo update-alternatives --install /usr/bin/vi vi "${CUSTOM_NVIM_PATH}" 110
-sudo update-alternatives --install /usr/bin/view view "${CUSTOM_NVIM_PATH}" 110
-sudo update-alternatives --install /usr/bin/vim vim "${CUSTOM_NVIM_PATH}" 110
-sudo update-alternatives --install /usr/bin/vimdiff vimdiff "${CUSTOM_NVIM_PATH}" 110
-
+sudo snap install nvim --classic
 
 ## install atuin
 bash <(curl https://raw.githubusercontent.com/ellie/atuin/main/install.sh)