From 5a70175728af9693730e721fa2fb02f9cc4ef064 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Thu, 16 Apr 2015 19:38:12 +0100
Subject: Tmux

---
 vim/vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 2fbebf2..345ad1a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -111,7 +111,7 @@ set ruler
 set showcmd
 set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
-set showbreak=...
+set showbreak=\ \ \ \ \ \ ...
 set colorcolumn=0
 set scrolloff=0
 if has('gui_running')
-- 
cgit v1.2.3


From 6fc11102eb031b7ac353a581d006f6506d40cdca Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sat, 18 Apr 2015 23:04:25 +0100
Subject: Changed mappings

---
 vim/vimrc | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 12aacc7..ad31a5f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -175,27 +175,12 @@ nnoremap <s-Return> O<Esc>
 nnoremap J mzJ`z
 nnoremap Y y$
 
-" nnoremap - za
 nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
 
-nnoremap j gj
-nnoremap k gk
-nnoremap $ g$
-nnoremap ^ g^
-nnoremap gj j
-nnoremap gk k
-nnoremap g$ $
-nnoremap g^ ^
-
-vnoremap j gj
-vnoremap k gk
-vnoremap $ g$
-vnoremap ^ g^
-vnoremap gj j
-vnoremap gk k
-vnoremap g$ $
-vnoremap g^ ^
+" Dvorak specific
+nnoremap : ,
+nnoremap , :
 
 ""  Latex  
 let g:tex_fast=""
-- 
cgit v1.2.3


From 19a735fccfafdd36371d0c3463549c008fd71d71 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sun, 19 Apr 2015 17:35:20 +0100
Subject: Cleant vimrc

---
 vim/vimrc | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 3edbdd1..2603976 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -25,6 +25,7 @@ Plugin 'Tabular'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'honza/vim-snippets'
+Plugin 'Valloric/YouCompleteMe'
 
 filetype plugin indent on
 syntax on
@@ -36,7 +37,13 @@ let mapleader = "\\"
 let maplocalleader = "-"
 nmap <Space> <Leader>
 
-"  UltiSnips
+"  Plugins options
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_by_filename = 1
+let g:ctrlp_working_path_mode = ''
+let g:ctrlp_show_hidden = 1
+let g:ctrlp_open_new_file = 't'
+
 let g:UltiSnipsExpandTrigger="<tab>"
 let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
@@ -44,10 +51,7 @@ let g:UltiSnipsListSnippets="<c-l>"
 let g:UltiSnipsEditSplit="horizontal"
 let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
 let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
-let g:ctrlp_open_new_file = 't'
-noremap <c-h> :UltiSnipsEdit<Return>
 
-"  Latex-Box
 let g:tex_flavor='latex'
 let g:tex_conceal= 'adgm'
 let g:LatexBox_Folding=0
@@ -77,10 +81,6 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
 
 "  CTRL-P
 
-let g:ctrlp_map = '<c-p>'
-let g:ctrlp_by_filename = 1
-let g:ctrlp_working_path_mode = ''
-let g:ctrlp_show_hidden = 1
 
 ""  Options  
 
@@ -113,11 +113,7 @@ set fillchars=fold:\ ,vert:\ ,
 set showbreak=\ \ \ \ \ \ ...
 set colorcolumn=0
 set scrolloff=0
-if has('gui_running')
-    set t_Co=256
-else
-    set t_Co=256
-endif
+set t_Co=256
 set guitablabel=%N\ %t\ %M
 set showcmd
 
@@ -169,6 +165,7 @@ nnoremap <Leader>h :set hlsearch!<cr>
 nnoremap <Leader>n :set relativenumber!<cr>
 nnoremap <Leader>sv :source ~/.vim/vimrc<cr>
 nnoremap <Leader>sc :source %<cr>
+nnoremap <Leader>es :UltiSnipsEdit<Return>
 
 "  Other maps
 nnoremap <Return> o<Esc>
-- 
cgit v1.2.3


From 8ba8a330fb7201ae744b673b3103e950fef78563 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sun, 19 Apr 2015 19:08:46 +0100
Subject: Update of the options for ctrlp

---
 vim/vimrc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 2603976..c7180d5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -30,8 +30,6 @@ Plugin 'Valloric/YouCompleteMe'
 filetype plugin indent on
 syntax on
 
-""  Configuration  
-
 "  Leader maps
 let mapleader = "\\"
 let maplocalleader = "-"
@@ -40,9 +38,10 @@ nmap <Space> <Leader>
 "  Plugins options
 let g:ctrlp_map = '<c-p>'
 let g:ctrlp_by_filename = 1
-let g:ctrlp_working_path_mode = ''
+let g:ctrlp_working_path_mode = 'r'
 let g:ctrlp_show_hidden = 1
 let g:ctrlp_open_new_file = 't'
+let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
 
 let g:UltiSnipsExpandTrigger="<tab>"
 let g:UltiSnipsJumpForwardTrigger="<tab>"
@@ -79,9 +78,6 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
             \ '\.out$', '\.log$','\.aux$','\.sty$',
             \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$']
 
-"  CTRL-P
-
-
 ""  Options  
 
 "  Tabs and indent
-- 
cgit v1.2.3