diff --git a/config/.bashrc b/config/.bashrc
index 774c23a..b105cbc 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -69,3 +69,6 @@ _BLUE="\[\033[34m\]"
 _BOLD="\[\033[1m\]"
 _RESET="\[\033[0m\]"
 export PS1="${_GREEN}${_BOLD}\u@\h${_RESET}:${_BLUE}${_BOLD}\W${_RESET} # "
+
+# Vim everywhere
+set -o vi
diff --git a/config/.inputrc b/config/.inputrc
index 236bfdd..3a22ba4 100644
--- a/config/.inputrc
+++ b/config/.inputrc
@@ -1 +1,8 @@
 set completion-ignore-case on
+
+# Show vi mode in prompt
+set show-mode-in-prompt on
+
+# Make thin cursor in insert mode
+set vi-ins-mode-string \1\e[5 q\2
+set vi-cmd-mode-string \1\e[2 q\2