From 5a4a67b6a72bb2231736a8ff26ecc60c55d13a56 Mon Sep 17 00:00:00 2001
From: Jannik ZANDER <jannikz@gmail.com>
Date: Wed, 11 Jul 2018 16:56:01 +0200
Subject: [PATCH] Fix leadermapping

---
 .vim/vimrc | 52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/.vim/vimrc b/.vim/vimrc
index a97869b..3fe8706 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -11,6 +11,25 @@ endif
 set path=.,,**
 set sessionoptions-=options
 
+" keyboard
+set backspace=indent,eol,start
+let mapleader = ","
+set ttimeoutlen=10
+set winaltkeys=no
+set mouse=a
+set mousemodel=extend
+set noerrorbells
+set visualbell
+
+" colors and fonts
+set t_Co=256
+set background=dark
+highlight LineNr ctermfg=grey
+let &t_ti.="\e[1 q"
+let &t_SI.="\e[5 q"
+let &t_EI.="\e[1 q"
+let &t_te.="\e[0 q"
+
 " files
 set fileformats=unix,dos,mac
 set fileignorecase
@@ -26,9 +45,9 @@ set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
 
 " buffers
 silent !mkdir -p ~/.vim/undo
-set viminfo+=n~/.vim/viminfo
-set undodir=~/.vim/undo
 set undofile
+set undodir=~/.vim/undo
+set viminfo+=n~/.vim/viminfo
 set nohidden
 set nobackup
 set noswapfile
@@ -76,28 +95,6 @@ set cmdheight=2
 set shortmess=aoOtI
 set history=1000
 
-" keyboard
-set backspace=indent,eol,start
-set ttimeout
-set ttimeoutlen=100
-set timeout
-set timeoutlen=500
-set winaltkeys=no
-set mouse=a
-set mousemodel=extend
-set noerrorbells
-set visualbell
-
-
-" colors and fonts
-set t_Co=256
-set background=dark
-let &t_ti.="\e[1 q"
-let &t_SI.="\e[5 q"
-let &t_EI.="\e[1 q"
-let &t_te.="\e[0 q"
-highlight LineNr ctermfg=grey
-
 " grep
 set grepprg=ag\ --vimgrep\ --skip-vcs-ignores\ --path-to-ignore\ ~/.ignore\ --cpp\ --cc
 set grepformat^=%f:%l:%c:%m   " file:line:coloumn:message
@@ -156,9 +153,6 @@ nnoremap <Leader>m   :CtrlPMRU<CR>
 " matchit
 packadd matchit
 
-
-let mapleader = ","
-
 " Normal mode Mappings
 nnoremap <c-h>              <c-w><c-h>
 nnoremap <c-j>              <c-w><c-j>
@@ -178,7 +172,7 @@ inoremap <C-U> <C-G>u<C-U>
 " Command aliases
 cnoreabbrev w!!      w !sudo tee "%"
 
-" autocommands
+" Autocommands
 augroup filetype
   au!
   au bufnewfile,buffilepre,bufread *.md     set filetype=markdown
@@ -199,12 +193,12 @@ augroup numbertoggle
 augroup END
 
 augroup vimrc
+  au!
   au bufwritepost ~/.vim/gvimrc source %
   au bufwritepost ~/.vim/vimrc source %
   au bufwritepost ~/.vim/vimrc.local source %
 augroup END
 
-
 " local settings
 if filereadable(expand('~/.vim/vimrc.local'))
   source ~/.vim/vimrc.local
-- 
2.43.0