diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish
index 63ba98c..6a230f6 100644
--- a/dot_config/private_fish/config.fish
+++ b/dot_config/private_fish/config.fish
@@ -1,9 +1,9 @@
 if status is-interactive
     # Commands to run in interactive sessions can go here
-    if type -q $zoxide
+    if type -q zoxide
         zoxide init fish | source
     end
-    if type -q $atuin
+    if type -q atuin
         atuin init fish | source
     end
 
diff --git a/run_once_install.sh.tmpl b/run_once_install.sh.tmpl
index a65f536..0e9799f 100644
--- a/run_once_install.sh.tmpl
+++ b/run_once_install.sh.tmpl
@@ -27,7 +27,10 @@ curl https://raw.githubusercontent.com/candrewlee14/webman/main/scripts/install.
 
 /usr/bin/env fish ~/.config/fish/.on_install.fish
 
-git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
+echo "Moving current nvim config to nvim.bak"
+mv ~/.config/nvim ~/.config/nvim.bak || echo ""
+echo "Installing AstroNvim config"
+git clone --depth 1 https://github.com/AstroNvim/AstroNvim ~/.config/nvim
 git clone https://github.com/candrewlee14/astronvim_config ~/.config/nvim/lua/user
 
 if test -x ~/.webman/bin/nvim; then