diff --git a/home/.bashrc b/home/.bashrc
index ef5c4ac..629c288 100644
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -4,6 +4,8 @@
 [[ $- != *i* ]] && return
 
 #SET PATH IN .BASH_PROFILE
+# Set the shell's editor to vi mode
+set -o vi
 
 #don't put duplicate lines or lines beginning with a space into history
 HISTCONTROL=ignoreboth
diff --git a/home/.inputrc b/home/.inputrc
new file mode 100644
index 0000000..b2cc9d6
--- /dev/null
+++ b/home/.inputrc
@@ -0,0 +1 @@
+set editing-mode vi
diff --git a/setup/setupscript.sh b/setup/setupscript.sh
index 89dee6b..7cbd81f 100755
--- a/setup/setupscript.sh
+++ b/setup/setupscript.sh
@@ -65,3 +65,6 @@ ln -s ${environ_home}/.config/mypy ~/.config/mypy
 
 ##### In home dir
 ln -s ${environ_home}/.fonts ~/.fonts
+
+# readline
+ln -s ${environ_home}/.inputrc ~/.inputrc