diff --git a/bashrc b/bashrc
index f20f9ba..c1c1812 100644
--- a/bashrc
+++ b/bashrc
@@ -25,6 +25,10 @@ unset RED
 unset GREEN
 unset RESET
 
+# Completion
+complete -c man
+complete -cf sudo
+
 # Color ls
 alias ls="lr -1FG"
 
diff --git a/inputrc b/inputrc
new file mode 100644
index 0000000..cc1601b
--- /dev/null
+++ b/inputrc
@@ -0,0 +1,13 @@
+$include /etc/inputrc
+
+set show-all-if-ambiguous on
+
+set editing-mode vi
+$if mode=vi
+set keymap vi-command
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+set keymap vi-insert
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+$endif