diff --git a/fish/config/config.fish b/fish/config/config.fish
index c0b838f..ac15d12 100644
--- a/fish/config/config.fish
+++ b/fish/config/config.fish
@@ -36,8 +36,6 @@ function source-file-if-exists
   end
 end
 
-source-file-if-exists /usr/share/autojump/autojump.fish
-source-file-if-exists /usr/local/share/autojump/autojump.fish
 source-file-if-exists ~/.cargo/env
 
 append-path-if-exists /usr/local/bin
@@ -119,12 +117,11 @@ if status is-interactive
     alias kl="k logs -f --all-containers"
     alias issh='ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"'
     alias iscp='scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"'
-    set -q virtualfish || set -U virtualfish (
-        which pip &>/dev/null && pip show virtualfish &>/dev/null && \
-        python -m virtualfish auto_activation
-    )
-    test -n $virtualfish && eval $virtualfish
     cd $last_pwd
+    source-file-if-exists /usr/share/autojump/autojump.fish
+    source-file-if-exists /usr/local/share/autojump/autojump.fish
+    source-file-if-exists ~/.config/fish/virtualfish
+    source-file-if-exists ~/.profile.fish
     source-file-if-exists ~/.profile.fish
 end
 
diff --git a/python/install.sh b/python/install.sh
index c314b38..dfac3af 100755
--- a/python/install.sh
+++ b/python/install.sh
@@ -15,7 +15,7 @@ fi
 # install python3
 case "$PM" in
     apt)
-        sudo apt install python3 python3-pip
+        sudo apt install python3 python3-pip python-is-python3
         fish-is-default-shell && sudo pip3 install virtualfish
         ;;
     pacman)
@@ -24,6 +24,8 @@ case "$PM" in
         ;;
 esac
 
+python -m virtualfish auto_activation > ~/.config/fish/virtualfish
+
 # enable auto_activation plugin for virtualfish
 fish-is-default-shell && fish -c "yes | vf install && vf addplugins auto_activation"