6 files changed, 10 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index b57f551..b93334c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 vim/bundle/
 vifm/Trash/
 mutt/mutt-colors-solarized/
+mutt/temp/
diff --git a/inputrc b/inputrc
new file mode 100644
index 0000000..1221bb9
--- /dev/null
+++ b/inputrc
@@ -0,0 +1,2 @@
+set editing-mode vi
+set keymap vi
diff --git a/make b/make
index 2ece3d4..f8de537 100755
--- a/make
+++ b/make
@@ -4,7 +4,7 @@ dir=~/dotfiles
 olddir=~/dotfiles_old
 
 # Files to sync
-files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc"
+files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc"
 
 rm -rf $olddir
 mkdir -p $olddir
diff --git a/vim/vimrc b/vim/vimrc
index 1179bd9..8e23b6e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -18,6 +18,7 @@ Plugin 'Tabular'
 Plugin 'tComment'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
+Plugin 'klen/python-mode'
 Plugin 'honza/vim-snippets'
 
 filetype plugin indent on
@@ -251,6 +252,6 @@ endfunction
 ""  Autocommands  
 augroup autorelead_vimrc
     au! 
-    au BufWritePost ~/.vimrc source ~/.vimrc
+    au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc
 augroup END
 
diff --git a/xmodmap b/xmodmap
index 7e5dd12..4f2543b 100644
--- a/xmodmap
+++ b/xmodmap
@@ -6,7 +6,7 @@ xmodmap -e "clear Lock"
 xmodmap -e "keycode 66 = Control_L"
 xmodmap -e "add Control = Control_L"
 
-
+# New mode switch
 xmodmap -e "keycode 94 = Mode_switch"
 
 # Numbers
@@ -29,3 +29,4 @@ xmodmap -e "keycode 32 = r R 9"
 xmodmap -e "keycode 47 = s S dollar"
 
 /home/urbain/xcape/xcape -e 'Control_L=Escape'
+/home/urbain/xcape/xcape -e 'Shift_L=Escape'
diff --git a/zshrc b/zshrc
index 91d675f..7788986 100644
--- a/zshrc
+++ b/zshrc
@@ -105,8 +105,8 @@ alias oconf='vim ~/.offlineimaprc'
 alias xconf='vim ~/.xmodmap'
 
 # Fix smart search history
-bindkey "^[[A" history-beginning-search-backward
-bindkey "^[[B" history-beginning-search-forward
+bindkey -a 'k' history-beginning-search-backward
+bindkey -a 'j' history-beginning-search-forward
 
 sleep 2
 h=`date +%H`
@@ -117,8 +117,3 @@ elif [ $h -lt 18 ]; then
 else
     xdotool key Alt+t p Down Return
 fi
-
-# setxkbmap -option ctrl:swapcaps
-# sh ~/.xmodmap
-# ~/xcape/xcape -e 'Shift_L=Escape'
-# ~/xcape/xcape -e 'Shift_R=Tab'