summaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2014-12-01 14:16:39 +0000
committerUrbain Vaes <urbain@vaes.uk>2014-12-01 14:16:39 +0000
commit7dee44901beca25b5d9f5b4b6f69107d3ba89603 (patch)
tree4dd74e664e5d6cf4eb7dfb2fd8471777d2515440 /vim
parentd692cc3c601fde0199cfd1f42fd4ee476de09671 (diff)
parentdc6c8cd776156a459fae5faf39462aa3e028ff92 (diff)
nothing much
Diffstat (limited to 'vim')
-rw-r--r--vim/after/ftplugin/vim/folding.vim50
-rw-r--r--vim/mySnippets/mail.snippets8
-rw-r--r--vim/vimrc22
-rw-r--r--vim/vimundo0
4 files changed, 42 insertions, 38 deletions
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