new commit

4 files changed, 47 insertions, 29 deletions

diff --git a/.muttrc b/.muttrc
index 93c281c..48280b0 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,3 +1,11 @@
+source /usr/share/doc/mutt/examples/gpg.rc
+set pgp_use_gpg_agent = yes
+set pgp_sign_as = 08AC6A48
+set pgp_timeout = 3600
+set crypt_autosign = no
+set crypt_replyencrypt = yes
+set fcc_clear = yes
+
 set from             = "u.vaes13@imperial.ac.uk"
 set realname         = "Urbain Vaes"
 set use_from         = yes
@@ -15,7 +23,6 @@ set certificate_file = ~/.mutt/certificates
 
 set editor="vim"
 set edit_headers
-my_hdr Return-Receipt-To: urbainvaes90@gmail.com
 
 set include=yes
 
diff --git a/.vimrc b/.vimrc
index 9bcfd7a..7762b86 100644
--- a/.vimrc
+++ b/.vimrc
@@ -30,6 +30,7 @@ let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
 let g:UltiSnipsEditSplit="horizontal"
 let g:UltiSnipsSnippetsDir="~/.vim/UltiSnips"
+let g:ctrlp_open_new_file = 't'
 noremap <c-tab> :UltiSnipsEdit<Return>
 
 "  Latex-Box
@@ -144,7 +145,7 @@ nnoremap <Leader>h :set hlsearch!<cr>
 nnoremap <Leader>n :set relativenumber!<cr>
 nnoremap <Leader>q :q!<cr>
 nnoremap <Leader>sv :source ~/.vimrc<cr>
-nnoremap <Leader>sc ;source %
+nnoremap <Leader>sc :source %
 nnoremap <Leader>w :w<cr>
 nnoremap <Leader>te :tabedit 
 nnoremap <Leader>tn :tabnew<cr>
@@ -175,6 +176,13 @@ vnoremap gj j
 vnoremap gk k
 vnoremap g$ $
 vnoremap g^ ^
+
+"  Convenient maps
+" nnoremap e j
+" nnoremap u k
+" nnoremap j e
+" nnoremap k u
+
 ""  Latex  
 nmap <buffer> <F2> <Plug>LatexChangeEnv
 let g:tex_fast="" 
@@ -193,7 +201,7 @@ autocmd Filetype tex call SetTexOptions()
 hi Cursor guifg=white guibg=blue
 hi iCursor guifg=black guibg=green
 hi! link conceal normal
-hi! link folded normal
+hi! link folded comment
 
 ""  Functions  
 function! Tex_ForwardSearchLaTeX()
diff --git a/.xmodmap b/.xmodmap
index 2dc3c02..7e5dd12 100644
--- a/.xmodmap
+++ b/.xmodmap
@@ -1,29 +1,31 @@
-! Remap dead key
-keycode 94 = backslash asciicircum
+# Remap dead key
+xmodmap -e "keycode 94 = backslash asciicircum"
 
-! Make caps lock a modifier
-clear Lock
-keycode 66 = Control_L
-add Control = Control_L
+# Make caps lock a modifier
+xmodmap -e "clear Lock"
+xmodmap -e "keycode 66 = Control_L"
+xmodmap -e "add Control = Control_L"
 
 
-keycode 94 = Mode_switch
+xmodmap -e "keycode 94 = Mode_switch"
 
-!Numbers
-keycode 65 = space space 0
-keycode 43 = d D 0
-keycode 39 = o O 1
-keycode 58 = m M 1
-keycode 40 = e E 2
-keycode 59 = w W 2
-keycode 41 = u U 3
-keycode 60 = v V 3
-keycode 44 = h H 4
-keycode 45 = t T 5
-keycode 46 = n N 6
-keycode 30 = g G 7
-keycode 31 = c C 8
-keycode 32 = r R 9
+# Numbers
+xmodmap -e "keycode 65 = space space 0"
+xmodmap -e "keycode 43 = d D 0"
+xmodmap -e "keycode 39 = o O 1"
+xmodmap -e "keycode 58 = m M 1"
+xmodmap -e "keycode 40 = e E 2"
+xmodmap -e "keycode 59 = w W 2"
+xmodmap -e "keycode 41 = u U 3"
+xmodmap -e "keycode 60 = v V 3"
+xmodmap -e "keycode 44 = h H 4"
+xmodmap -e "keycode 45 = t T 5"
+xmodmap -e "keycode 46 = n N 6"
+xmodmap -e "keycode 30 = g G 7"
+xmodmap -e "keycode 31 = c C 8"
+xmodmap -e "keycode 32 = r R 9"
 
-! Dollars, symbols hard to reach
-keycode 47 = s S dollar
+# Dollars, symbols hard to reach
+xmodmap -e "keycode 47 = s S dollar"
+
+/home/urbain/xcape/xcape -e 'Control_L=Escape'
diff --git a/.zshrc b/.zshrc
index 0704861..5c5877c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -47,7 +47,7 @@ COMPLETION_WAITING_DOTS="true"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
+plugins=(vi-mode git)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -78,6 +78,7 @@ alias -s cpp=vim
 alias -s c=vim
 alias -s tex=vim
 alias -s pdf=zathura
+
 alias tmux="TERM=screen-256color-bce tmux"
 alias g='git'
 alias v=$EDITOR
@@ -104,6 +105,6 @@ else
 fi
 
 # setxkbmap -option ctrl:swapcaps
-xmodmap ~/.xmodmap
+sh ~/.xmodmap
 # ~/xcape/xcape -e 'Shift_L=Escape'
 # ~/xcape/xcape -e 'Shift_R=Tab'