commit 08aa05ba8a533e10fb214e9d3fc56005161a9c6c
parent 94f17da5cdf7718cca8b0890fa97363a679fc79a
Author: Anders Damsgaard <andersd@riseup.net>
Date: Wed, 9 Aug 2017 11:40:10 +0200
use vim-plug, split plugins to separate file
Diffstat:
| A | .vim/plugins.vim | | | 99 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | .vimrc | | | 190 | +------------------------------------------------------------------------------ |
| M | install.sh | | | 2 | +- |
3 files changed, 102 insertions(+), 189 deletions(-)
diff --git a/.vim/plugins.vim b/.vim/plugins.vim
@@ -0,0 +1,99 @@
+" Specify a directory for plugins
+" - For Neovim: ~/.local/share/nvim/plugged
+" - Avoid using standard Vim directory names like 'plugin'
+call plug#begin('~/.vim/plugged')
+
+" install plugins with :PlugInstall
+" Make sure you use single quotes
+
+"""""" Appearance """"""
+Plug 'bling/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'jacoborus/tender' " color scheme
+Plug 'kien/rainbow_parantheses.vim' " colorcode paranthesis pairs
+Plug 'mhinz/vim-startify' " startup screen
+Plug 'guns/xterm-color-table.vim' " show color table with :XtermColorTable
+Plug 'Yggdroot/indentLine' " show indent levels with thin vertical lines
+
+
+"""""" File system """""""
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
+Plug 'kien/ctrlp.vim'
+Plug 'lucidstack/ctrlp-mpc.vim' " Control mpd by CtrlP
+Plug 'justinmk/vim-gtfo' " open file manager (gof)/tmux pane (got) @ current dir
+
+
+"""""" Syntax checking """"""
+Plug 'w0rp/ale' " asynchronous syntax check
+
+
+"""""" Buffer motion """"""
+Plug 'Lokaltog/vim-easymotion'
+Plug 'christoomey/vim-tmux-navigator'
+
+" add/remove bookmark: mm
+" add/edit/remove annotation: mi
+" next bookmark: mn
+" previous bookmark: mn
+" list of all bookmarks: ma
+" clear all bookmarks in current buffer: mc
+" clear all bookmarks in all buffers: mx
+Plug 'MattesGroeger/vim-bookmarks'
+
+
+"""""" Text editing """"""
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-speeddating' " increment dates and times with C-a and C-x
+Plug 'junegunn/vim-easy-align' " align in columns (select > return > space)
+
+" cycle through yank history with <leader>p and <leader>P after pasting,
+" see history with :Yanks
+Plug 'maxbrunsfeld/vim-yankstack'
+
+
+"""""" Autocomplete """"""
+Plug 'davidhalter/jedi-vim' " (C-space)
+Plug 'ervandew/supertab' " complete with TAB in insert mode
+
+
+"""""" Version control """"""
+"Plug 'tpope/vim-fugitive' " :Gread, :Gwrite
+Plug 'airblade/vim-gitgutter' " show line changes since last git commit
+
+
+"""""" Processes """"""
+"Plug 'tpope/vim-dispatch' " for :Make
+
+
+"""""" File types """"""
+" General
+Plug 'msanders/snipmate.vim' " boilerplate code
+Plug 'majutsushi/tagbar' " ctags overview :TagBarToggle
+
+" Go
+Plug 'fatih/vim-go'
+Plug 'nsf/gocode'
+
+" Julia
+Plug 'JuliaLang/julia-vim'
+
+" Python
+Plug 'klen/python-mode'
+
+" HTML/PHP
+Plug 'captbaritone/better-indent-support-for-php-with-html'
+
+" Markdown
+Plug 'godlygeek/tabular' " line up text (req for vim-markdown)
+Plug 'plasticboy/vim-markdown'
+
+" Mail
+Plug 'vim-scripts/mutt-aliases' " auto-complete aliases from ~/.mutt/aliases
+
+
+""""" Unmanaged plugin (manually installed and updated) """"""
+"Plug '~/my-prototype-plugin'
+
+
+" Initialize plugin system
+call plug#end()
diff --git a/.vimrc b/.vimrc
@@ -6,199 +6,13 @@ filetype off
if has('vim_starting')
set nocompatible " Disable vi-compatibility
- set runtimepath+=~/.vim/bundle/neobundle.vim/
endif
-call neobundle#begin(expand('~/.vim/bundle/'))
-
-""" NeoBundle plugins
-" By default fom github.
-" Install and update with :NeoBundleInstall(!), see :h NeoBundle
-
-" let NeoBundle manage Vundle. Required!
-NeoBundle 'Shougo/neobundle.vim'
-
-" more functional statusline
-"NeoBundle 'Lokaltog/vim-powerline'
-"NeoBundle 'Lokaltog/powerline'
-NeoBundle 'bling/vim-airline'
-NeoBundle 'vim-airline/vim-airline-themes'
-
-" file system browser
-NeoBundle 'scrooloose/nerdtree'
-
-" syntax checking plugin
-"NeoBundle 'scrooloose/syntastic'
-" asynchronous syntax checking
-NeoBundle 'w0rp/ale'
-
-" fuzzy file, buffer, and tag finder
-NeoBundle 'kien/ctrlp.vim'
-
-" colorschemes
-"NeoBundle 'altercation/vim-colors-solarized'
-"NeoBundle 'chriskempson/vim-tomorrow-theme'
-"NeoBundle 'tomasr/molokai'
-NeoBundle 'jacoborus/tender'
-
-" modify surrounding characters in pairs
-NeoBundle 'tpope/vim-surround'
-
-" git wrapper. Reset changes with :Gread, stage changes with :Gwrite
-NeoBundle 'tpope/vim-fugitive'
-
-" Show which line changed since last git commit
-NeoBundle 'airblade/vim-gitgutter'
-
-" dispatch.vim for :Make
-NeoBundle 'tpope/vim-dispatch'
-
-" browse buffers (vim.org/scripts), \be, \bs, \bv
-"NeoBundle 'bufexplorer.zip'
-
-" Vim-LaTeX suite
-"NeoBundle 'git://git.code.sf.net/p/vim-latex/vim-latex'
-"NeoBundle 'LaTeX-Box-Team/LaTeX-Box'
-
-" autocompletion (C-space)
-NeoBundle 'davidhalter/jedi-vim'
-
-" Use <Tab> to autocomplete in insert mode
-NeoBundle 'ervandew/supertab'
-
-" Ack is a grep replacement. Debian pkg: ack-grep. Run from Vim:
-" usage: :Ack [options] {pattern} [{directory}]
-NeoBundle 'mileszs/ack.vim'
-
-" Rainbow parantheses
-NeoBundle 'kien/rainbow_parentheses.vim'
-
-" Calendar
-"NeoBundle 'itchyny/calendar.vim'
-"let g:calendar_google_calendar = 1
-"let g:calendar_google_task = 1
-
-" ctags list (:TlistOpen)
-NeoBundle 'taglist.vim'
-
-" vim-OrgMode
-NeoBundle 'jceb/vim-orgmode'
-
-" increment dates and times with Ctrl-a and Ctrl-x
-NeoBundle 'tpope/vim-speeddating'
-
-" support for Julia
-NeoBundle 'JuliaLang/julia-vim'
-
-" SnipMate for boilerplate code
-NeoBundle 'msanders/snipmate.vim'
-
-" vim motion on speed
-NeoBundle 'Lokaltog/vim-easymotion'
-
-" navigate between vim and tmux panes seamlessly
-NeoBundle 'christoomey/vim-tmux-navigator'
-
-" Take notes in rst
-"NeoBundle 'Rykka/clickable.vim'
-"NeoBundle 'Rykka/riv.vim'
-"NeoBundle 'Rykka/InstantRst'
-
-" add/remove bookmark: mm
-" add/edit/remove annotation: mi
-" next bookmark: mn
-" previous bookmark: mn
-" list of all bookmarks: ma
-" clear all bookmarks in current buffer: mc
-" clear all bookmarks in all buffers: mx
-NeoBundle 'MattesGroeger/vim-bookmarks'
-
-" QC, QX, QV to copy, cut and paste from system clipboard
-NeoBundle 'NLKNguyen/copy-cut-paste.vim'
-
-" Python mode
-NeoBundle 'klen/python-mode'
-
-NeoBundle 'fatih/vim-go'
-
-" vimproc for asynchronous processes
-NeoBundle 'Shougo/vimproc.vim', {
- \ 'build' : {
- \ 'wimdows' : 'tools\\update-dll-mingw',
- \ 'cygwin' : 'make -f make_cygwin.mak',
- \ 'mac' : 'make -f make_mac.mak',
- \ 'unix' : 'make -f make_unix.mak',
- \ },
- \ }
-" Unite for search, uses ag (Debian package silversearch-ag)
-NeoBundle 'Shougo/unite.vim'
-
-" insert unicode characters with latex code
-"NeoBundle 'joom/latex-unicoder.vim'
-
-" search for text in files
-NeoBundle 'rking/ag.vim'
-
-" Align things in columns (select, type Return then Space)
-NeoBundle 'junegunn/vim-easy-align'
-
-" open file manager (gof) or tmux pane (got) at current dir
-NeoBundle 'justinmk/vim-gtfo'
-
-" <C-y>,
-" http://www.vim.org/scripts/script.php?script_id=2981
-" http://emmet.io
-NeoBundle 'mattn/emmet-vim'
-
-" javascript plugins
-NeoBundle 'pangloss/vim-javascript'
-NeoBundle 'kchmck/vim-coffee-script'
-
-" spacemacs keybinds
-"NeoBundle 'jimmay5469/vim-spacemacs'
-
-" Support mixed php and html
-NeoBundle 'captbaritone/better-indent-support-for-php-with-html'
-
-" Line up text (req for vim-markdown)
-NeoBundle 'godlygeek/tabular'
-
-" Markdown support
-NeoBundle 'plasticboy/vim-markdown'
-
-" Startup screen
-NeoBundle 'mhinz/vim-startify'
-
-" Show color table with :XtermColorTable
-NeoBundle 'guns/xterm-color-table.vim'
-
-" Auto-complete mutt aliases according to ~/.mutt/aliases
-"NeoBundle 'guanqun/vim-mutt-aliases-plugin'
-NeoBundle 'vim-scripts/mutt-aliases'
-
-NeoBundle 'majutsushi/tagbar'
-
-" Control mpd by CtrlP
-NeoBundle 'lucidstack/ctrlp-mpc.vim'
-
-" Show indentation levels with thin vertical lines. This plugin enables the
-" conceal feature in Vim >= 7.3.
-NeoBundle 'Yggdroot/indentLine'
-
-" Show command documentation in a scratch buffer, usage ":G <query"
-NeoBundle 'evidanary/grepg.vim'
-
-" cycle through yank history with <leader>p and <leader>P after pasting,
-" see history with :Yanks
-NeoBundle 'maxbrunsfeld/vim-yankstack'
-
-call neobundle#end()
+" Load plugins
+source ~/.vim/plugins.vim
filetype plugin indent on
-" If there are uninstalled bundles found on startup, this will prompt you to
-" install them
-NeoBundleCheck
" Enable syntax highligting
syntax on
diff --git a/install.sh b/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-set -e
+#set -e
# Create symlinks
mkdir -p ./.vim/bundle
