diff --git a/vim/colors/molokai-perso.vim b/vim/colors/molokai-perso.vim deleted file mode 100644 index 7bd91d0..0000000 --- a/vim/colors/molokai-perso.vim +++ /dev/null @@ -1,231 +0,0 @@ -" Vim color file -" -" Author: Tomas Restrepo -" -" Note: Based on the monokai theme for textmate -" by Wimer Hazenberg and its darker variant -" by Hamish Stuart Macpherson -" - -hi clear - -set background=dark -if version > 580 - " no guarantees for version 5.8 and below, but this makes it stop - " complaining - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="molokai" - -if exists("g:molokai_original") - let s:molokai_original = g:molokai_original -else - let s:molokai_original = 0 -endif - - -hi Boolean guifg=#AE81FF -hi Character guifg=#E6DB74 -hi Number guifg=#AE81FF -hi String guifg=#E6DB74 -hi Conditional guifg=#F92672 gui=bold -hi Constant guifg=#AE81FF gui=bold -hi Cursor guifg=#000000 guibg=#000000 -hi Debug guifg=#BCA3A3 gui=bold -hi Define guifg=#66D9EF -hi Delimiter guifg=#8F8F8F -hi DiffAdd guibg=#13354A -hi DiffChange guifg=#89807D guibg=#4C4745 -hi DiffDelete guifg=#960050 guibg=#1E0010 -hi DiffText guibg=#4C4745 gui=italic,bold - -hi Directory guifg=#A6E22E gui=bold -hi Error guifg=#960050 guibg=#FF0000 -hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold -hi Exception guifg=#A6E22E gui=bold -hi Float guifg=#AE81FF -hi FoldColumn guifg=#465457 guibg=#000000 -hi Folded guifg=#465457 guibg=#000000 -hi Function guifg=#8FC327 -hi Identifier guifg=#FD971F -hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 - -hi Keyword guifg=#F92672 gui=bold -hi Label guifg=#E6DB74 gui=none -hi Macro guifg=#C4BE89 gui=italic -hi SpecialKey guifg=#66D9EF gui=italic - -hi MatchParen guifg=#000000 guibg=#FD971F gui=bold -hi ModeMsg guifg=#E6DB74 -hi MoreMsg guifg=#E6DB74 -hi Operator guifg=#F92672 - -" complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF - -hi PreCondit guifg=#A6E22E gui=bold -hi PreProc guifg=#A6E22E -hi Question guifg=#66D9EF -hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#FFFFFF guibg=#455354 -" marks column -hi SignColumn guifg=#A6E22E guibg=#232526 -hi SpecialChar guifg=#F92672 gui=bold -hi SpecialComment guifg=#7E8E91 gui=bold -hi Special guifg=#66D9EF guibg=bg gui=italic -if has("spell") - hi SpellBad guisp=#FF0000 gui=undercurl - hi SpellCap guisp=#7070F0 gui=undercurl - hi SpellLocal guisp=#70F0F0 gui=undercurl - hi SpellRare guisp=#FFFFFF gui=undercurl -endif -hi Statement guifg=#F92672 gui=bold -hi StatusLine guifg=#455354 guibg=fg -hi StatusLineNC guifg=#808080 guibg=#080808 -hi StorageClass guifg=#FD971F gui=italic -hi Structure guifg=#66D9EF -hi Tag guifg=#F92672 gui=italic -hi Title guifg=#ef5939 -hi Todo guifg=#FFFFFF guibg=bg gui=bold - -hi Typedef guifg=#66D9EF -hi Type guifg=#66D9EF gui=none -hi Underlined guifg=#808080 gui=underline - -hi VertSplit guifg=#808080 guibg=#080808 gui=bold -hi VisualNOS guibg=#403D3D -hi Visual guibg=#403D3D -hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold -hi WildMenu guifg=#66D9EF guibg=#000000 - -if s:molokai_original == 1 - hi Normal guifg=#F8F8F2 guibg=#272822 - hi Comment guifg=#75715E - hi CursorLine guibg=#000000 - hi CursorColumn guibg=#000000 - hi ColorColumn guibg=#000000 - hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#75715E - hi SpecialKey guifg=#75715E -else - hi Normal guifg=#F8F8F2 guibg=#1B1D1E - hi Comment guifg=#7E8E91 - hi CursorLine guibg=#000000 - hi CursorColumn guibg=#000000 - hi ColorColumn guibg=#000000 - hi LineNr guifg=#465457 guibg=#232526 - hi NonText guifg=#465457 - hi SpecialKey guifg=#465457 -end - -" -" Support for 256-color terminal -" -if &t_Co > 255 - if s:molokai_original == 1 - hi Normal ctermbg=234 - hi CursorLine ctermbg=16 cterm=none - else - " changé ctermbg - hi Normal ctermfg=252 ctermbg=234 - - hi CursorLine ctermbg=16 cterm=none - endif - hi Boolean ctermfg=135 - hi Character ctermfg=144 - hi Number ctermfg=135 - - " changé - hi String ctermfg=143 - - hi Conditional ctermfg=161 cterm=bold - hi Constant ctermfg=135 cterm=bold - hi Cursor ctermfg=16 ctermbg=16 - hi Debug ctermfg=225 cterm=bold - hi Define ctermfg=81 - hi Delimiter ctermfg=241 - - hi DiffAdd ctermbg=24 - hi DiffChange ctermfg=181 ctermbg=239 - hi DiffDelete ctermfg=162 ctermbg=53 - hi DiffText ctermbg=102 cterm=bold - - hi Directory ctermfg=106 cterm=bold - hi Error ctermfg=219 ctermbg=196 - hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold - hi Exception ctermfg=106 cterm=bold - hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 - hi Function ctermfg=106 - hi Identifier ctermfg=208 cterm=none - hi Ignore ctermfg=244 ctermbg=232 - hi IncSearch ctermfg=193 ctermbg=16 - - hi Keyword ctermfg=161 cterm=bold - hi Label ctermfg=229 cterm=none - hi Macro ctermfg=193 - hi SpecialKey ctermfg=81 - - hi MatchParen ctermfg=16 ctermbg=208 cterm=bold - hi ModeMsg ctermfg=229 - hi MoreMsg ctermfg=229 - hi Operator ctermfg=161 - - " complete menu - hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermbg=244 - hi PmenuSbar ctermbg=232 - hi PmenuThumb ctermfg=81 - - hi PreCondit ctermfg=106 cterm=bold - hi PreProc ctermfg=106 - hi Question ctermfg=81 - hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=253 ctermbg=66 - - " marks column - hi SignColumn ctermfg=106 ctermbg=235 - hi SpecialChar ctermfg=161 cterm=bold - hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 - - hi Statement ctermfg=161 cterm=bold - hi StatusLine ctermfg=238 ctermbg=253 - hi StatusLineNC ctermfg=244 ctermbg=232 - hi StorageClass ctermfg=208 - hi Structure ctermfg=81 - hi Tag ctermfg=161 - hi Title ctermfg=166 - hi Todo ctermfg=231 ctermbg=232 cterm=bold - - hi Typedef ctermfg=81 - hi Type ctermfg=81 cterm=none - hi Underlined ctermfg=244 cterm=underline - - hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=16 - hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold - hi WildMenu ctermfg=81 ctermbg=16 - - " changé - hi Comment ctermfg=245 - - hi CursorColumn ctermbg=16 - hi ColorColumn ctermbg=16 - - " changé - "hi LineNr ctermfg=250 ctermbg=234 - hi LineNr ctermfg=240 ctermbg=235 - - hi NonText ctermfg=59 - hi SpecialKey ctermfg=59 -end diff --git a/vim/colors/molokai.vim b/vim/colors/molokai.vim deleted file mode 100644 index a17838d..0000000 --- a/vim/colors/molokai.vim +++ /dev/null @@ -1,231 +0,0 @@ -" Vim color file -" -" Author: Tomas Restrepo -" -" Note: Based on the monokai theme for textmate -" by Wimer Hazenberg and its darker variant -" by Hamish Stuart Macpherson -" - -hi clear - -set background=dark -if version > 580 - " no guarantees for version 5.8 and below, but this makes it stop - " complaining - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="molokai" - -if exists("g:molokai_original") - let s:molokai_original = g:molokai_original -else - let s:molokai_original = 0 -endif - - -hi Boolean guifg=#AE81FF -hi Character guifg=#E6DB74 -hi Number guifg=#AE81FF -hi String guifg=#E6DB74 -hi Conditional guifg=#F92672 gui=bold -hi Constant guifg=#AE81FF gui=bold -hi Cursor guifg=#000000 guibg=#F8F8F0 -hi Debug guifg=#BCA3A3 gui=bold -hi Define guifg=#66D9EF -hi Delimiter guifg=#8F8F8F -hi DiffAdd guibg=#13354A -hi DiffChange guifg=#89807D guibg=#4C4745 -hi DiffDelete guifg=#960050 guibg=#1E0010 -hi DiffText guibg=#4C4745 gui=italic,bold - -hi Directory guifg=#A6E22E gui=bold -hi Error guifg=#960050 guibg=#1E0010 -hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold -hi Exception guifg=#A6E22E gui=bold -hi Float guifg=#AE81FF -hi FoldColumn guifg=#465457 guibg=#000000 -hi Folded guifg=#465457 guibg=#000000 -hi Function guifg=#A6E22E -hi Identifier guifg=#FD971F -hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 - -hi Keyword guifg=#F92672 gui=bold -hi Label guifg=#E6DB74 gui=none -hi Macro guifg=#C4BE89 gui=italic -hi SpecialKey guifg=#66D9EF gui=italic - -hi MatchParen guifg=#000000 guibg=#FD971F gui=bold -hi ModeMsg guifg=#E6DB74 -hi MoreMsg guifg=#E6DB74 -hi Operator guifg=#F92672 - -" complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF - -hi PreCondit guifg=#A6E22E gui=bold -hi PreProc guifg=#A6E22E -hi Question guifg=#66D9EF -hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#FFFFFF guibg=#455354 -" marks column -hi SignColumn guifg=#A6E22E guibg=#232526 -hi SpecialChar guifg=#F92672 gui=bold -hi SpecialComment guifg=#7E8E91 gui=bold -hi Special guifg=#66D9EF guibg=bg gui=italic -if has("spell") - hi SpellBad guisp=#FF0000 gui=undercurl - hi SpellCap guisp=#7070F0 gui=undercurl - hi SpellLocal guisp=#70F0F0 gui=undercurl - hi SpellRare guisp=#FFFFFF gui=undercurl -endif -hi Statement guifg=#F92672 gui=bold -hi StatusLine guifg=#455354 guibg=fg -hi StatusLineNC guifg=#808080 guibg=#080808 -hi StorageClass guifg=#FD971F gui=italic -hi Structure guifg=#66D9EF -hi Tag guifg=#F92672 gui=italic -hi Title guifg=#ef5939 -hi Todo guifg=#FFFFFF guibg=bg gui=bold - -hi Typedef guifg=#66D9EF -hi Type guifg=#66D9EF gui=none -hi Underlined guifg=#808080 gui=underline - -hi VertSplit guifg=#808080 guibg=#080808 gui=bold -hi VisualNOS guibg=#403D3D -hi Visual guibg=#403D3D -hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold -hi WildMenu guifg=#66D9EF guibg=#000000 - -if s:molokai_original == 1 - hi Normal guifg=#F8F8F2 guibg=#272822 - hi Comment guifg=#75715E - hi CursorLine guibg=#3E3D32 - hi CursorColumn guibg=#3E3D32 - hi ColorColumn guibg=#3B3A32 - hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#75715E - hi SpecialKey guifg=#75715E -else - hi Normal guifg=#F8F8F2 guibg=#1B1D1E - hi Comment guifg=#7E8E91 - hi CursorLine guibg=#293739 - hi CursorColumn guibg=#293739 - hi ColorColumn guibg=#232526 - hi LineNr guifg=#465457 guibg=#232526 - hi NonText guifg=#465457 - hi SpecialKey guifg=#465457 -end - -" -" Support for 256-color terminal -" -if &t_Co > 255 - if s:molokai_original == 1 - hi Normal ctermbg=234 - hi CursorLine ctermbg=235 cterm=none - else - " changé ctermbg - hi Normal ctermfg=252 ctermbg=234 - - hi CursorLine ctermbg=234 cterm=none - endif - hi Boolean ctermfg=135 - hi Character ctermfg=144 - hi Number ctermfg=135 - - " changé - hi String ctermfg=143 - - hi Conditional ctermfg=161 cterm=bold - hi Constant ctermfg=135 cterm=bold - hi Cursor ctermfg=16 ctermbg=253 - hi Debug ctermfg=225 cterm=bold - hi Define ctermfg=81 - hi Delimiter ctermfg=241 - - hi DiffAdd ctermbg=24 - hi DiffChange ctermfg=181 ctermbg=239 - hi DiffDelete ctermfg=162 ctermbg=53 - hi DiffText ctermbg=102 cterm=bold - - hi Directory ctermfg=118 cterm=bold - hi Error ctermfg=219 ctermbg=89 - hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold - hi Exception ctermfg=118 cterm=bold - hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 - hi Function ctermfg=118 - hi Identifier ctermfg=208 cterm=none - hi Ignore ctermfg=244 ctermbg=232 - hi IncSearch ctermfg=193 ctermbg=16 - - hi Keyword ctermfg=161 cterm=bold - hi Label ctermfg=229 cterm=none - hi Macro ctermfg=193 - hi SpecialKey ctermfg=81 - - hi MatchParen ctermfg=16 ctermbg=208 cterm=bold - hi ModeMsg ctermfg=229 - hi MoreMsg ctermfg=229 - hi Operator ctermfg=161 - - " complete menu - hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermbg=244 - hi PmenuSbar ctermbg=232 - hi PmenuThumb ctermfg=81 - - hi PreCondit ctermfg=118 cterm=bold - hi PreProc ctermfg=118 - hi Question ctermfg=81 - hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=253 ctermbg=66 - - " marks column - hi SignColumn ctermfg=118 ctermbg=235 - hi SpecialChar ctermfg=161 cterm=bold - hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 - - hi Statement ctermfg=161 cterm=bold - hi StatusLine ctermfg=238 ctermbg=253 - hi StatusLineNC ctermfg=244 ctermbg=232 - hi StorageClass ctermfg=208 - hi Structure ctermfg=81 - hi Tag ctermfg=161 - hi Title ctermfg=166 - hi Todo ctermfg=231 ctermbg=232 cterm=bold - - hi Typedef ctermfg=81 - hi Type ctermfg=81 cterm=none - hi Underlined ctermfg=244 cterm=underline - - hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=235 - hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold - hi WildMenu ctermfg=81 ctermbg=16 - - " changé - hi Comment ctermfg=245 - - hi CursorColumn ctermbg=234 - hi ColorColumn ctermbg=234 - - " changé - "hi LineNr ctermfg=250 ctermbg=234 - hi LineNr ctermfg=240 ctermbg=235 - - hi NonText ctermfg=59 - hi SpecialKey ctermfg=59 -end diff --git a/vim/config/parametrage-plugins.vim b/vim/config/parametrage-plugins.vim new file mode 100644 index 0000000..dcba49c --- /dev/null +++ b/vim/config/parametrage-plugins.vim @@ -0,0 +1,5 @@ +runtime config/plugin/syntastic.vim +runtime config/plugin/vim-airline.vim +runtime config/plugin/tagbar.vim +runtime config/plugin/vim-yardoc.vim +runtime config/plugin/php.vim.vim diff --git a/vim/config/parametrage-vim.vim b/vim/config/parametrage-vim.vim new file mode 100644 index 0000000..15dbada --- /dev/null +++ b/vim/config/parametrage-vim.vim @@ -0,0 +1,38 @@ +set encoding=utf-8 " Encodage par défaut + +set tabstop=4 " Tabulation de 8 caractères +set shiftwidth=4 " Idem +set noexpandtab " Utilise le caractère tabulation, pas des espaces +set nostartofline " Conserve le caractère sur la même colonne quand on change de ligne +set autoindent " Indentation automatique +set smartindent " Idem + +set showcmd " Montre la commande en cours +set ignorecase " Pas de casse pour les recherches +set title " Affiche le nom et l'état du fichier dans le titre +set nonumber " Cache les numéro de ligne +set laststatus=2 " Barre de status toujours visible +set backspace=indent,eol,start " Autorise le caractère backspace +set ruler " Indique la position dans le fichier +set showmatch " Vérification présence (, {, [ lorsqu'on tappe le caractère fermant +set wildmenu " Affiche la liste des commandes vim lors d'un appuis sur (ex: set hl ) +set scrolloff=5 " Garde toujours 5 lignes visibles autour du curseur + +set viewdir=~/.vim/saveview/ " Répertoire de sauvegarde des vues (replis manuels) +set foldcolumn=2 " Repère visuel pour les replis +set incsearch " Recherche incrémentale +set nohlsearch " Ne colorie pas les recherches + +set fileformats=unix,mac,dos " Formats de fin de ligne + +set nolist " Pas de caratères non-imprimables +set listchars=eol:¶,tab:\|\ ,trail:~ " Paramétrage des caractères non-imprimables + +filetype plugin indent on " Détection automatique du type de fichier + plugin + indentation + +" Gestion de la `vue` +autocmd BufWinLeave *.* mkview +autocmd BufWinEnter *.* silent loadview + +syntax enable " Active la syntaxe +set foldmethod=syntax " Replis basé sur la syntaxe diff --git a/vim/config/parametrage.vim b/vim/config/parametrage.vim new file mode 100644 index 0000000..5e8a8d8 --- /dev/null +++ b/vim/config/parametrage.vim @@ -0,0 +1,26 @@ +runtime config/parametrage-vim.vim +runtime config/theme.vim + +autocmd BufEnter * set tabstop=4 +autocmd BufEnter * set shiftwidth=4 +autocmd BufEnter * set noexpandtab + +runtime config/parametrage-plugins.vim + +" Doxygen +autocmd BufEnter *.doc set filetype=doxygen +let g:doxygen_javadoc_autobrief = 0 + +autocmd BufEnter *.twig set filetype=htmljinja " Twig +autocmd BufEnter *.yml " Yml + \ set tabstop=4| + \ set shiftwidth=4| + \ set expandtab + +autocmd BufEnter *.vim set foldmethod=marker " Vim + +autocmd BufNewFile *.rb so ~/.vim/headers/ruby.vim " Ruby : entête auto +autocmd BufEnter apti,*.rb " Apti (ruby) : tabulation = 2 espaces + \ set tabstop=2| + \ set shiftwidth=2| + \ set expandtab diff --git a/vim/config/plugin/php.vim.vim b/vim/config/plugin/php.vim.vim new file mode 100644 index 0000000..a38c505 --- /dev/null +++ b/vim/config/plugin/php.vim.vim @@ -0,0 +1,15 @@ +"autocmd BufEnter *.php set filetype=php_new + +" vim-php +let vim_php_fold_root = 0 +let vim_php_fold_comments = 0 +let vim_php_string_allow_single_backslash = 0 + +" php.vim (Hodge) +let g:php_sql_query = 1 +let g:php_smart_members = 1 +let g:php_alt_properties = 1 +let g:php_alt_arrays = 2 +let g:php_folding = 1 +let g:php_special_functions = 0 +let g:php_nested_functions = 1 diff --git a/vim/config/plugin/syntastic.vim b/vim/config/plugin/syntastic.vim new file mode 100644 index 0000000..e52ad26 --- /dev/null +++ b/vim/config/plugin/syntastic.vim @@ -0,0 +1,8 @@ +let g:syntastic_check_on_open = 0 +let g:syntastic_loc_list_height = 5 +let g:syntastic_stl_format = '[%E{%e error(s)}%B{, }%W{%w warning(s)}]' +let g:syntastic_mode_map = { + \'mode': 'active', + \'active_filetypes': ['php'], + \'passive_filetypes': ['html', 'css'] + \} diff --git a/vim/config/plugin/tagbar.vim b/vim/config/plugin/tagbar.vim new file mode 100644 index 0000000..945525b --- /dev/null +++ b/vim/config/plugin/tagbar.vim @@ -0,0 +1,3 @@ +let g:tagbar_ctags_bin = '/usr/bin/ctags' +let g:tagbar_autofocus = 1 +let g:tagbar_autoclose = 1 diff --git a/vim/config/plugin/vim-airline.vim b/vim/config/plugin/vim-airline.vim new file mode 100644 index 0000000..c6db84e --- /dev/null +++ b/vim/config/plugin/vim-airline.vim @@ -0,0 +1,17 @@ +let g:airline_powerline_fonts = 1 + +let g:airline_section_z = '%3p%%%5l:%L%3c' + +let g:airline#extensions#whitespace#enabled = 0 " pas de détections des espaces (lignes vides ?) + +let g:airline#extensions#syntastic#enabled = 1 + +let g:airline#extensions#tagbar#enabled = 1 + +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#show_buffers = 0 +let g:airline#extensions#tabline#tab_nr_type = 1 +let g:airline#extensions#tabline#buffer_nr_show = 0 +let g:airline#extensions#tabline#buffer_nr_format = '' +let g:airline#extensions#tabline#fnamemod = ':t' +let g:airline#extensions#tabline#fnamecollapse = 0 diff --git a/vim/config/plugin/vim-yardoc.vim b/vim/config/plugin/vim-yardoc.vim new file mode 100644 index 0000000..33d00ce --- /dev/null +++ b/vim/config/plugin/vim-yardoc.vim @@ -0,0 +1,3 @@ +hi link yardGenericTag rubyInstanceVariable +hi link yardType Type +hi link yardLiteral Type diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim new file mode 100644 index 0000000..ade2764 --- /dev/null +++ b/vim/config/plugins.vim @@ -0,0 +1,27 @@ +filetype off +set rtp+=~/.vim/bundle/Vundle.vim + +call vundle#begin() + +" Vundle lui-même +Plugin 'gmarik/Vundle.vim' + +" Plugin fonctionnels +Plugin 'scrooloose/syntastic' +Plugin 'scrooloose/nerdcommenter' +Plugin 'scrooloose/nerdtree' +Plugin 'bling/vim-airline' +Plugin 'majutsushi/tagbar' + +" Plugin de syntaxe +Plugin 'othree/html5.vim' +Plugin 'itspriddle/vim-jquery' +Plugin 'estin/htmljinja' +Plugin 'ChrisYip/Better-CSS-Syntax-for-Vim' +Plugin 'noprompt/vim-yardoc' +Plugin 'php.vim--Hodge' + +" Thème +Plugin 'tomasr/molokai' + +call vundle#end() diff --git a/vim/config/shorcuts.vim b/vim/config/shorcuts.vim new file mode 100644 index 0000000..88344b6 --- /dev/null +++ b/vim/config/shorcuts.vim @@ -0,0 +1,95 @@ +" Couper, copier et coller avec le presse-papier du système +if has('x11') && has('clipboard') + :nmap "+dd + :nmap "+yy + :nmap "+p + + :vmap "+d + :vmap "+ygv + :vmap "+p + + :imap "+ddi + :imap "+yyi + :imap "+pi +endif + +" Opérations standards +:nmap :w " Sauvegarder +:nmap :q " Ferme le fichier actuel +:nmap :qa " Quitter (fermer tous) + +:nmap ggVG " Selectionner tout + +" Déplacement ligne vers le haut / bas +:nnoremap ddp +:nnoremap ddkP + +:inoremap ddpi +:inoremap ddkPi + +:vnoremap dp +:vnoremap dkP + +" (dé)Pliage de code +:nmap zc +:nmap zo +:nmap :%foldc! + +:imap zcki +:imap zoi +:imap :%foldc!i + +:vmap zcgv +:vmap zogv +:vmap :foldc!gv + +" (dé)Commenter +:nmap c +:imap ci +:vmap cgv + +:nmap cs +:imap cs +:vmap csgv + +" Gestion d'onglet +:nmap gT +:nmap gt +:nmap  :call A_askFile("File to open : "):exec ":tabnew ". Filename + +:imap gTi +:imap gti + +:vmap gT +:vmap gt + +" (dé)Indentation +:nmap >> +:nmap << + +:imap < >gv +:vmap  +:imap  +:imap  + +" Opérations standard +:nmap ggVG + +" NERD Tree : Arbre de navigation +:nmap :NERDTreeToggle + +" Liste de tags +:nmap :TagbarToggle + +" Syntastic +:nmap :SyntasticCheck:Errors +:nmap :SyntasticReset:SyntasticCheck +:nmap :SyntasticCheck + +" Autres +:nmap :w:e diff --git a/vim/config/theme.vim b/vim/config/theme.vim new file mode 100644 index 0000000..3cc3d5d --- /dev/null +++ b/vim/config/theme.vim @@ -0,0 +1,8 @@ +set nocursorline + +let g:molokai_original=0 +let g:rehash256=0 + +colorscheme molokai + +set cursorline diff --git a/vim/vimrc b/vim/vimrc index a85470f..a486ca9 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,163 +1,7 @@ set nocompatible " Pas de compatibilité avec vi -"===================================================================== -" Utilisation de "Vundle" pour les plugins -"===================================================================== -filetype off -set rtp+=~/.vim/bundle/Vundle.vim - -call vundle#begin() - -" Vundle lui-même -Plugin 'gmarik/Vundle.vim' - -" Plugin fonctionnels -Plugin 'scrooloose/syntastic' -Plugin 'scrooloose/nerdcommenter' -Plugin 'scrooloose/nerdtree' -Plugin 'bling/vim-airline' -Plugin 'majutsushi/tagbar' - -" Plugin de syntaxe -Plugin 'othree/html5.vim' -Plugin 'itspriddle/vim-jquery' -Plugin 'estin/htmljinja' -Plugin 'ChrisYip/Better-CSS-Syntax-for-Vim' -Plugin 'noprompt/vim-yardoc' -Plugin 'php.vim--Hodge' - -call vundle#end() - -"===================================================================== -" Configuration globale -"===================================================================== -set encoding=utf-8 " Encodage par défaut - -set tabstop=8 " Tabulation de 8 caractères -set shiftwidth=8 " Idem -set noexpandtab " Utilise le caractère tabulation, pas des espaces -set nostartofline " Conserve le caractère sur la même colonne quand on change de ligne -set autoindent " Indentation automatique -set smartindent " Idem - -set showcmd " Montre la commande en cours -set ignorecase " Pas de casse pour les recherches -set title " Affiche le nom et l'état du fichier dans le titre -set nonumber " Cache les numéro de ligne -set laststatus=2 " Barre de status toujours visible -set backspace=indent,eol,start " Autorise le caractère backspace -set ruler " Indique la position dans le fichier -set showmatch " Vérification présence (, {, [ lorsqu'on tappe le caractère fermant -set wildmenu " Affiche la liste des commandes vim lors d'un appuis sur (ex: set hl ) -set scrolloff=5 " Garde toujours 5 lignes visibles autour du curseur - -set viewdir=~/.vim/saveview/ " Répertoire de sauvegarde des vues (replis manuels) -set foldcolumn=2 " Repère visuel pour les replis -set incsearch " Recherche incrémentale -set nohlsearch " Ne colorie pas les recherches - -set fileformats=unix,mac,dos " Formats de fin de ligne - -set nolist " Pas de caratères non-imprimables -set listchars=eol:¶,tab:\|\ ,trail:~ " Paramétrage des caractères non-imprimables - -filetype plugin indent on " Détection automatique dutype de fichier + plugin + indentation - -autocmd BufWinLeave *.* mkview -autocmd BufWinEnter *.* silent loadview - -syntax enable " Active la syntaxe -set foldmethod=syntax " Replis basé sur la syntaxe - -set nocursorline -colorscheme molokai-perso -set cursorline - -"===================================================================== -" Configurations plugins -"===================================================================== -" tagbar -let g:tagbar_ctags_bin = '/usr/bin/ctags' -let g:tagbar_autofocus = 1 -let g:tagbar_autoclose = 1 - -" syntastic -let g:syntastic_check_on_open = 0 - -let g:syntastic_loc_list_height = 5 - -let g:syntastic_stl_format = '[%E{%e error(s)}%B{, }%W{%w warning(s)}]' - -let g:syntastic_mode_map = { 'mode': 'active', - \ 'active_filetypes': ['php'], - \ 'passive_filetypes': ['html', 'css'] } - -" vim-airline -let g:airline_powerline_fonts = 1 - -let g:airline_section_z = '%3p%%%5l:%L%3c' - -let g:airline#extensions#whitespace#enabled = 0 " pas de détections des espaces (lignes vides ?) - -let g:airline#extensions#syntastic#enabled = 1 - -let g:airline#extensions#tagbar#enabled = 1 - -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#show_buffers = 0 -let g:airline#extensions#tabline#tab_nr_type = 1 -let g:airline#extensions#tabline#buffer_nr_show = 0 -let g:airline#extensions#tabline#buffer_nr_format = '' -let g:airline#extensions#tabline#fnamemod = ':t' -let g:airline#extensions#tabline#fnamecollapse = 0 - -" vim-yardoc -hi link yardGenericTag rubyInstanceVariable -hi link yardType Type -hi link yardLiteral Type - -"===================================================================== -" Configuration par type de fichier -"===================================================================== -" Config générale -autocmd BufEnter * set tabstop=8 -autocmd BufEnter * set shiftwidth=8 -autocmd BufEnter * set noexpandtab - -" PHP -"autocmd BufEnter *.php set filetype=php_new - -let vim_php_fold_root = 0 -let vim_php_fold_comments = 0 -let vim_php_string_allow_single_backslash = 0 - -let g:php_sql_query = 1 -let g:php_smart_members = 1 -let g:php_alt_properties = 1 -let g:php_alt_arrays = 2 -let g:php_folding = 1 -let g:php_special_functions = 0 -let g:php_nested_functions = 1 - -" Doxygen -autocmd BufEnter *.doc set filetype=doxygen -let g:doxygen_javadoc_autobrief = 0 - -" Twig -autocmd BufEnter *.twig set filetype=htmljinja - -" MySQL -autocmd BufEnter *.mysql.sql set filetype=sqlmysql - -" YML : tabulation de 4, avec expansion en espaces -autocmd BufEnter *.yml set tabstop=4|set shiftwidth=4|set expandtab - -" Vim -autocmd BufEnter *.vim set tabstop=4|set shiftwidth=4|set noexpandtab|set foldmethod=marker - -" Ruby (apti) : tabulation de 2, avec expansion en espaces -autocmd BufNewFile *.rb so ~/.vim/headers/ruby.vim -autocmd BufEnter apti,*.rb set tabstop=2|set shiftwidth=2|set expandtab +runtime config/plugins.vim +runtime config/parametrage.vim "===================================================================== " Replacer le curseur à la dernière édition @@ -165,18 +9,6 @@ autocmd BufEnter apti,*.rb set tabstop=2|set shiftwidth=2|set expandtab set viminfo='10,\"100,:20,%,n~/.viminfo autocmd BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe "norm '\""|else|exe "norm $"|endif|endif -"===================================================================== -" Omni-Completion -"===================================================================== -autocmd FileType html set omnifunc=htmlcomplete#CompleteTags -autocmd FileType htmljinja set omnifunc=htmlcomplete#CompleteTags -autocmd FileType css set omnifunc=csscomplete#CompleteCSS -autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS -autocmd FileType c set omnifunc=ccomplete#Complete -autocmd FileType php set omnifunc=phpcomplete#CompletePHP -autocmd FileType sql set omnifunc=sqlcomplete#Complete -autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags - "===================================================================== " Gestion dictionnaire "===================================================================== @@ -193,11 +25,6 @@ set spellsuggest=5 autocmd BufEnter *.tex set spell autocmd BufEnter *.tex set spelllang=fr -"===================================================================== -" Personnalisation barre de status -"===================================================================== -set statusline=%f%m%r%h%w\ \ \ \ \ [%{&fileencoding}]\ \ \ \ [%{&fileformat}]\ \ \ \ [%Y]\ \ \ \ [%l,\ %c-%v]\ \ \ \ [%p%%]\ \ \ \ [%L\ lignes]\ \ \ \ %{SyntasticStatuslineFlag()} - "===================================================================== " Modification de l'affichage des replis "===================================================================== @@ -232,102 +59,5 @@ function A_askFile(text) abort call inputrestore() endfunction -function A_setPasteMode () - set paste -endfunction -function A_setNoPasteMode () - set nopaste -endfunction - -" Couper, copier et coller avec le presse-papier du système -if has('x11') && has('clipboard') - :nmap "+dd - :nmap "+yy - :nmap "+p - - :vmap "+d - :vmap "+ygv - :vmap "+p - - :imap "+ddi - :imap "+yyi - :imap "+pi -endif - -"===================================================================== -" Raccourcis -"===================================================================== - -" Déplacement ligne vers le haut / bas -:nnoremap ddp -:nnoremap ddkP - -:inoremap ddpi -:inoremap ddkPi - -:vnoremap dp -:vnoremap dkP - -" (dé)Pliage de code -:nmap zc -:nmap zo -:nmap :%foldc! - -:imap zcki -:imap zoi -:imap :%foldc!i - -:vmap zcgv -:vmap zogv -:vmap :foldc!gv - -" (dé)Commenter -:nmap c -:imap ci -:vmap cgv - -:nmap cs -:imap cs -:vmap csgv - -" Gestion d'onglet -:nmap gT -:nmap gt -:nmap  :call A_askFile("File to open : "):exec ":tabnew ". Filename - -:imap gTi -:imap gti - -:vmap gT -:vmap gt - -" (dé)Indentation -:nmap >> -:nmap << - -:imap < >gv -:vmap  -:imap  -:imap  - -" Opérations standard -:nmap ggVG - -" NERD Tree : Arbre de navigation -:nmap :NERDTreeToggle - -" Liste de tags -:nmap :TagbarToggle - -" Syntastic -:nmap :SyntasticCheck:Errors -:nmap :SyntasticReset:SyntasticCheck -:nmap :SyntasticCheck +runtime config/shorcuts.vim -" Autres -:nmap :w:e