diff --git a/home/bashrc b/home/bashrc
index 5d610f0..0fe2d9a 100644
--- a/home/bashrc
+++ b/home/bashrc
@@ -1,9 +1,18 @@
 #
 # ~/.bashrc
 #
+# for interactive non login shells
 
 [[ $- != *i* ]] && return
 
+# Add this lines at the top of .bashrc:
+[[ $- == *i* ]] && source /usr/share/blesh/ble.sh --noattach
+
+if [[ $- == *i* ]]; then # in interactive session
+  # vim mode
+  set -o vi
+fi
+
 colors() {
 	local fgc bgc vals seq0
 
@@ -140,3 +149,5 @@ fi
 
 src_files "$HOME/.profile.d" "$HOME/.bashrc.d"
 
+[[ ${BLE_VERSION-} ]] && ble-attach
+
diff --git a/scripts/02_setup_programs.sh b/scripts/02_setup_programs.sh
index 88098c2..5cc3397 100755
--- a/scripts/02_setup_programs.sh
+++ b/scripts/02_setup_programs.sh
@@ -53,5 +53,6 @@ sudo pacman -S --noconfirm bat
 sudo pacman -S --noconfirm fd
 
 # atuin
-yay -S --noconfirm atuin blesh
+yay -S --noconfirm blesh-git # version >=0.4 is necessary
+yay -S --noconfirm atuin