nothing much

6 files changed, 49 insertions, 50 deletions

diff --git a/mutt/muttrc b/mutt/muttrc
index 8de7b7c..00ceec1 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -39,6 +39,10 @@ mailboxes +Main/Main \
           +Main/Sent \
           +Main/Drafts \
 
+# Prompts
+set delete = yes
+set quit = yes
+
 # Encryption
 source /usr/share/doc/mutt/examples/gpg.rc
 set pgp_use_gpg_agent = yes
@@ -120,13 +124,4 @@ bind compose p postpone-message
 ## Hooks
 mbox-hook .* "+Main/Main"
 
-
-##  Aliases
-
 set reverse_alias
-alias krystle Krystle Acquah <krystle.acquah-arhin13@imperial.ac.uk>
-alias khoi Khoi Nguyen <khoi@member.fsf.org>
-alias me Urbain Vaes <urbainvaes90@gmail.com>
-alias amanda Amanda Diez <amanda.diez10@imperial.ac.uk>
-alias vaes Christophe & Nathalies Vaes  <vaesvdb@gmail.com>
-alias greg Supervisor <g.pavliotis@imperial.ac.uk>
diff --git a/vim/after/ftplugin/vim/folding.vim b/vim/after/ftplugin/vim/folding.vim
index 773b38e..7f8f28d 100644
--- a/vim/after/ftplugin/vim/folding.vim
+++ b/vim/after/ftplugin/vim/folding.vim
@@ -1,25 +1,25 @@
-function! VimFolds()
-    let thisline = getline(v:lnum)
-    if match(thisline,'^""  ') >= 0
-        return ">1"
-    elseif match(thisline,'^"  ') >=0
-        return ">1"
-    else
-        return "="
-    endif
-endfunction
-
-function! VimFoldText()
-    let startline = getline(v:foldstart)
-    if match(startline,'^""  ') >= 0
-        let title = substitute(startline,'^""  \(.*\)$','\1',"")
-        return '# ' . title
-    elseif match(startline,'^"  ') >=0
-        let title = substitute(startline,'^"  \(.*\)$','\1',"")
-        return '    ## ' .title
-    endif
-endfunction
-
-setlocal foldmethod=expr
-setlocal foldexpr=VimFolds()
-setlocal foldtext=VimFoldText()
+" function! VimFolds()
+"     let thisline = getline(v:lnum)
+"     if match(thisline,'^""  ') >= 0
+"         return ">1"
+"     elseif match(thisline,'^"  ') >=0
+"         return ">1"
+"     else
+"         return "="
+"     endif
+" endfunction
+"
+" function! VimFoldText()
+"     let startline = getline(v:foldstart)
+"     if match(startline,'^""  ') >= 0
+"         let title = substitute(startline,'^""  \(.*\)$','\1',"")
+"         return '# ' . title
+"     elseif match(startline,'^"  ') >=0
+"         let title = substitute(startline,'^"  \(.*\)$','\1',"")
+"         return '    ## ' .title
+"     endif
+" endfunction
+"
+" setlocal foldmethod=expr
+" setlocal foldexpr=VimFolds()
+" setlocal foldtext=VimFoldText()
diff --git a/vim/mySnippets/mail.snippets b/vim/mySnippets/mail.snippets
index d3c7e29..5bd2e46 100644
--- a/vim/mySnippets/mail.snippets
+++ b/vim/mySnippets/mail.snippets
@@ -5,5 +5,11 @@ Urbain Vaes
 endsnippet
 
 snippet sign "Signature" b
-Urbain Vaes
+Urbain
+endsnippet
+
+snippet bisous "Gros bisous" b
+Gros bisous,
+
+Urbain
 endsnippet
diff --git a/vim/vimrc b/vim/vimrc
index b3c0b0b..6654561 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -18,7 +18,7 @@ Plugin 'Tabular'
 Plugin 'tComment'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
-Plugin 'klen/python-mode'
+" Plugin 'klen/python-mode'
 Plugin 'honza/vim-snippets'
 
 filetype plugin indent on
@@ -109,7 +109,7 @@ set incsearch
 set noswapfile
 set nowritebackup
 set undofile
-set undodir=/home/urbain/.vimundo/
+set undodir=/home/urbain/.vim/vimundo/
 
 "  Layout window
 set nonumber
@@ -167,23 +167,21 @@ autocmd! BufNewFile,BufRead,BufWrite * :call UpdateColorscheme()
 
 ""  Custom mappings
 
-"  Definition of leader and localleader
+"  Leader maps
 let mapleader = "\\"
 let maplocalleader = "-"
-
-"  Leader maps
 nmap <Space> <Leader>
-nmap <Leader>p <c-p> 
-nmap <Leader>t <c-w>
+
+" General
+nnoremap <Leader>te :tabedit 
+nnoremap <Leader>tn :tabnew<cr>
+nnoremap <Leader>to :tabonly<cr>
+nnoremap <Leader>w :w<cr>
+nnoremap <Leader>q :q!<cr>
 nnoremap <Leader>h :set hlsearch!<cr>
 nnoremap <Leader>n :set relativenumber!<cr>
-nnoremap <Leader>q :q!<cr>
 nnoremap <Leader>sv :source ~/.vim/vimrc<cr>
 nnoremap <Leader>sc :source %
-nnoremap <Leader>w :w<cr>
-nnoremap <Leader>te :tabedit 
-nnoremap <Leader>tn :tabnew<cr>
-nnoremap <Leader>to :tabonly<cr>
 
 "  Other maps
 nnoremap <Return> o<Esc>
diff --git a/vim/vimundo b/vim/vimundo
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/vimundo
diff --git a/zshrc b/zshrc
index 3042313..3e34f3f 100644
--- a/zshrc
+++ b/zshrc
@@ -78,13 +78,13 @@ bindkey -a 'j' history-beginning-search-forward
 sleep 2
 h=`date +%H`
 if [ $h -lt 9 ]; then
-    xdotool key Alt+t p Down Return
+    xdotool key Alt+t p Down Right Return
     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
 elif [ $h -lt 17 ]; then
-    xdotool key Alt+t p Down Down Return
+    xdotool key Alt+t p Down Down Right Return
     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-light`
 else
-    xdotool key Alt+t p Down Return
+    xdotool key Alt+t p Down Right Return
     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
 fi