From 439971abac37c20eda587de6dae330063655e43e Mon Sep 17 00:00:00 2001 From: Gardouille Date: Fri, 16 Feb 2018 10:08:47 +0100 Subject: [PATCH] Move to Plug to manage plugins instead of vundle --- .gitignore | 2 + vimrc | 214 +++++++++++++++++++++++++---------------------------- 2 files changed, 104 insertions(+), 112 deletions(-) diff --git a/.gitignore b/.gitignore index c68ca94..e7b4ddd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +autoload/ backup/ tmp/ undodir/ bundle/* !bundle/vundle +plugged/ diff --git a/vimrc b/vimrc index e7da5bb..5a4aa77 100644 --- a/vimrc +++ b/vimrc @@ -185,97 +185,6 @@ imap jj " git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/vundle set nocompatible " be iMproved -let has_vundle=1 -let vundle_readme=expand('~/.vim/bundle/Vundle.vim/README.md') -if !filereadable(vundle_readme) - echo "Installing Vundle…" - echo "" - silent !mkdir -p ~/.vim/bundle - silent !git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim - let has_vundle=0 -endif -filetype off " required! -set rtp+=~/.vim/bundle/Vundle.vim/ -call vundle#begin() - -" Add all bundles you want - -" Vundle plugin (required) -Plugin 'VundleVim/Vundle.vim' - -" Dracula colorscheme -Plugin 'dracula/vim' - -" Snippets like textmate -Plugin 'MarcWeber/vim-addon-mw-utils' -Plugin 'tomtom/tlib_vim' -Plugin 'garbas/vim-snipmate' -Plugin 'honza/vim-snippets' - -" Display a tree of directories -Plugin 'scrooloose/nerdtree' - -" Super easy commenting, toggle comments, … -Plugin 'scrooloose/nerdcommenter' - -" everything -Plugin 'ervandew/supertab' - -" Awesome syntax checker -" REQUIREMENTS: See :h syntastic-intro -Plugin 'scrooloose/syntastic' - -" Advanced auto-completion system -Plugin 'Shougo/neocomplcache' - -" Make vim mor Puppet friendly -Plugin 'rodjek/vim-puppet' - -" Auto alignment (for Puppet for example) -Plugin 'godlygeek/tabular' - -" Markdown syntax -Plugin 'plasticboy/vim-markdown' - -" A pretty statusline, bufferline integration -Plugin 'itchyny/lightline.vim' -Plugin 'bling/vim-bufferline' -"Plugin 'bling/vim-airline' -"Bundle 'edkolev/tmuxline.vim' - -" Give viual aid to navigate marks -Plugin 'jacquesbh/vim-showmarks' - -" Furry finder (files, mru, …) -Plugin 'kien/ctrlp.vim' - -" Undo history visualizer -Plugin 'mbbill/undotree' - -" Autoclose (, ", … -Plugin 'Townk/vim-autoclose' - -" Functions, class data … -" REQUIREMENTS: (exuberant)-ctags -Plugin 'majutsushi/tagbar' - -" Git wrapper inside Vim -Plugin 'tpope/vim-fugitive' - -" Glorious colorscheme -Plugin 'w0ng/vim-hybrid' - -" Finish Vundle stuff -call vundle#end() - -" Auto install all plugins -if has_vundle == 0 - echo "Installing Plugins/Bundles, please ignore key map error messages" - echo "" - silent !vim +PluginInstall +qall - ":silent! PluginInstall - ":qa -endif """ User interface {{{ """ Custom highlighting, where NONE uses terminal background {{{ @@ -295,11 +204,11 @@ call CustomHighlighting() "########################## " SnipMate "########################## -"Plugin "MarcWeber/vim-addon-mw-utils" -"Plugin "tomtom/tlib_vim" -"Plugin "garbas/vim-snipmate" +"Plug "MarcWeber/vim-addon-mw-utils" +"Plug "tomtom/tlib_vim" +"Plug "garbas/vim-snipmate" " Optional: -"Plugin "honza/vim-snippets" +"Plug "honza/vim-snippets" filetype plugin indent on " required! @@ -309,7 +218,7 @@ filetype plugin indent on " required! " Pathogen : "########################## " http://github.com/tpope/vim-pathogen -"Plugin "tpope/vim-pathogen" +"Plug "tpope/vim-pathogen" "execute pathogen#infect() @@ -318,7 +227,7 @@ filetype plugin indent on " required! "########################## " https://github.com/scrooloose/nerdtree " Nerd_tree - Permet d'afficher une arborescence du répertoire courant. -"Plugin "scrooloose/nerdtree" +"Plug "scrooloose/nerdtree" " Raccourcis de la commande avec F10 map :NERDTreeToggle @@ -333,7 +242,7 @@ let NERDTreeWinPos='right' " https://github.com/scrooloose/nerdcommenter " Mettre en commentaire une ligne " Également disponible dans le paquet vim-scripts -"Plugin "scrooloose/nerdcommenter" +"Plug "scrooloose/nerdcommenter" " Commentaire basique, mais permet également de décommenter (Attention, il y a " un espace avec le C!) @@ -351,7 +260,7 @@ map cs " http://github.com/ervandew/supertab " SuperTab offre une autocomplétion amélioré. " http://www.vim.org/scripts/script.php?script_id=182 -"Plugin "ervandew/supertab" +"Plug "ervandew/supertab" " CTRL-N en mode insertion pour rechercher le suivant " CTRL-X - CTRL-L: rechercher une ligne complète à partir du début @@ -365,7 +274,7 @@ map cs " Syntastic : "########################## " https://github.com/scrooloose/syntastic -"Plugin "scrooloose/syntastic" +"Plug "scrooloose/syntastic" " Won't work ... let g:syntastic_mode_map = { 'mode': 'active', @@ -378,7 +287,7 @@ let g:syntastic_puppet_checkers = ['puppetlint'] " Neocomplcache : "########################## " http://github.com/Shougo/neocomplcache -"Plugin "Shougo/neocomplcache" +"Plug "Shougo/neocomplcache" " Use neocomplcache. let g:neocomplcache_enable_at_startup = 1 @@ -390,19 +299,19 @@ let g:neocomplcache_lock_buffer_name_pattern = '\*ku\*' " Puppet : "########################## " github.com/rodjek/vim-puppet.git -"Plugin "rodjek/vim-puppet" +"Plug "rodjek/vim-puppet" "########################## " Tabular : "########################## " https://github.com/godlygeek/tabular -"Plugin "godlygeek/tabular" +"Plug "godlygeek/tabular" "########################## " Airline : "########################## " https://github.com/bling/vim-airline -"Plugin 'bling/vim-airline' +"Plug 'bling/vim-airline' " Toujours afficher la barre de statut "set laststatus=2 " always show statusline @@ -419,7 +328,7 @@ let g:neocomplcache_lock_buffer_name_pattern = '\*ku\*' " Tmuxline : "########################## " https://github.com/edkolev/tmuxline.vim -"Plugin 'edkolev/tmuxline.vim' +"Plug 'edkolev/tmuxline.vim' "########################## " Lightline : @@ -589,7 +498,7 @@ let Tlist_Ctags_Cmd = '/usr/bin/ctags' " Showmark : "########################## " https://github.com/jacquesbh/vim-showmarks -"Plugin 'jacquesbh/vim-showmarks' +"Plug 'jacquesbh/vim-showmarks' " Show fucking marks noremap ' :ShowMarksOnce ' @@ -597,13 +506,13 @@ noremap ' :ShowMarksOnce ' " CTRL P : "########################## " https://github.com/kien/ctrlp.vim -"Plugin 'kien/ctrlp.vim' +"Plug 'kien/ctrlp.vim' "########################## " undo-tree : "########################## " https://github.com/mbbill/undotree -"Plugin 'mbbill/undotree' +"Plug 'mbbill/undotree' " UndoTree map u :UndotreeToggle " Mapping pour l'activer/désactiver @@ -612,7 +521,7 @@ map u :UndotreeToggle " Mapping pour l'activer/désactiver "########################## " Fermeture automatique des (, [, {, ... " https://github.com/Townk/vim-autoclose -"Plugin 'Townk/vim-autoclose' +"Plug 'Townk/vim-autoclose' " Disable auto-close imap c :AutoCloseToggle "avance d'un caratere en mode insert (vim-autoclose -> plus besoin de fermer les (, [, {, ...) @@ -622,7 +531,7 @@ imap n l i " tagbar: "########################## " https://github.com/majutsushi/tagbar -"Plugin 'majutsushi/tagbar' +"Plug 'majutsushi/tagbar' " Open Tagbar: nmap t :TagbarToggle " Manage Puppet file (.pp): @@ -640,13 +549,13 @@ let g:tagbar_type_puppet = { " fugitive: "########################## " https://github.com/tpope/vim-fugitive -"Plugin 'tpope/vim-fugitive' +"Plug 'tpope/vim-fugitive' "########################## " openssl: "########################## " https://github.com/ -"Plugin 'openssl.vim' +"Plug 'openssl.vim' "########################## " Exuberant-ctags: @@ -669,6 +578,87 @@ let g:tagbar_type_puppet = { "let Tlist_Use_Right_Window = 1 " affiche les tags sur le côté droit de l'écran +" ╔═╗╦ ╦ ╦╔═╗ +" ╠═╝║ ║ ║║ ╦ +" ╩ ╩═╝╚═╝╚═╝ Gestionnaire de plugins vim +" Installation automatique de plug : +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif + +" « :source ~/.vimrc » puis « :PlugInstall ». q pour quitter. +" Commandes : https://github.com/junegunn/vim-plug#commands +call plug#begin('~/.vim/plugged') + " Snippets like textmate + Plug 'MarcWeber/vim-addon-mw-utils' + Plug 'tomtom/tlib_vim' + Plug 'garbas/vim-snipmate' + Plug 'honza/vim-snippets' + + " Dracula colorscheme + Plug 'dracula/vim' + + " Snippets like textmate + "Plug 'MarcWeber/vim-addon-mw-utils' + "Plug 'tomtom/tlib_vim' + "Plug 'garbas/vim-snipmate' + "Plug 'honza/vim-snippets' + + " Display a tree of directories + Plug 'scrooloose/nerdtree' + + " Super easy commenting, toggle comments, … + Plug 'scrooloose/nerdcommenter' + + " everything + Plug 'ervandew/supertab' + + " Awesome syntax checker + " REQUIREMENTS: See :h syntastic-intro + Plug 'scrooloose/syntastic' + + " Advanced auto-completion system + Plug 'Shougo/neocomplcache' + + " Make vim mor Puppet friendly + Plug 'rodjek/vim-puppet' + + " Auto alignment (for Puppet for example) + Plug 'godlygeek/tabular' + + " Markdown syntax + Plug 'plasticboy/vim-markdown' + + " A pretty statusline, bufferline integration + Plug 'itchyny/lightline.vim' + Plug 'bling/vim-bufferline' + "Plug 'bling/vim-airline' + "Bundle 'edkolev/tmuxline.vim' + + " Give viual aid to navigate marks + Plug 'jacquesbh/vim-showmarks' + + " Furry finder (files, mru, …) + Plug 'kien/ctrlp.vim' + + " Undo history visualizer + Plug 'mbbill/undotree' + + " Autoclose (, ", … + Plug 'Townk/vim-autoclose' + + " Functions, class data … + " REQUIREMENTS: (exuberant)-ctags + Plug 'majutsushi/tagbar' + + " Git wrapper inside Vim + Plug 'tpope/vim-fugitive' + + " Glorious colorscheme + Plug 'w0ng/vim-hybrid' + +call plug#end() """""""""""""""""""""""""""""""""""""""""""""""" " Gestion des onglets