aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
m---------autoload0
m---------bundle/Vundle.vim0
-rw-r--r--doc/shortcuts.txt1
l---------plugged1
-rw-r--r--vimrc216
6 files changed, 101 insertions, 123 deletions
diff --git a/.gitmodules b/.gitmodules
index 75554b2..605d959 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
1[submodule "bundle/Vundle.vim"] 1[submodule "autoload"]
2 path = bundle/Vundle.vim 2 path = autoload
3 url = https://github.com/VundleVim/Vundle.vim.git 3 url = https://github.com/junegunn/vim-plug
diff --git a/autoload b/autoload
new file mode 160000
Subproject 645415884669c81b2ebbcb2d341081956cc8222
diff --git a/bundle/Vundle.vim b/bundle/Vundle.vim
deleted file mode 160000
Subproject 4984767509e3d05ca051e253c8a8b37de784be4
diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt
index a95e530..3b12d57 100644
--- a/doc/shortcuts.txt
+++ b/doc/shortcuts.txt
@@ -72,5 +72,6 @@ the last line can be a mode line, which holds settings like tab width:
72 72
73[special] 73[special]
74g CTRL-g = display file properties including word and char count 74g CTRL-g = display file properties including word and char count
75CTRL-X CTRL-F = display file name completions using (vim-internal) omnicomplete
75 76
76# vim: noai:ts=2:sw=2 filetype=dosini 77# vim: noai:ts=2:sw=2 filetype=dosini
diff --git a/plugged b/plugged
new file mode 120000
index 0000000..92d0b93
--- /dev/null
+++ b/plugged
@@ -0,0 +1 @@
bundle/ \ No newline at end of file
diff --git a/vimrc b/vimrc
index 80c637a..7a9ea91 100644
--- a/vimrc
+++ b/vimrc
@@ -1,110 +1,77 @@
1set nocompatible " be iMproved, required 1call plug#begin()
2filetype off " required 2
3set shell=/bin/bash " Vundle does strange things without 3" Brilliant_Plugins_by_tpope: ========================.
4 4Plug 'tpope/vim-sensible' | " a sane and modern default configuration
5" set the runtime path to include Vundle and initialize 5Plug 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with '
6set rtp+=~/.vim/bundle/Vundle.vim 6Plug 'tpope/vim-vinegar' | " Improves :Explore
7call vundle#begin() 7" Plug 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
8 8" Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin
9" let Vundle manage Vundle, required 9" Plug 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround
10Plugin 'VundleVim/Vundle.vim' 10
11 11" Colorschemes: ======================================.
12" Brilliant Plugins by tpope =========================. 12Plug 'nelstrom/vim-mac-classic-theme' | " light theme
13Plugin 'tpope/vim-sensible' | " a sane and modern default configuration 13Plug 'Valloric/vim-valloric-colorscheme' | "
14Plugin 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' 14Plug 'chriskempson/vim-tomorrow-theme' | "
15Plugin 'tpope/vim-vinegar' | " Improves :Explore 15Plug 'chriskempson/base16-vim' | "
16" Plugin 'tpope/vim-fugitive' | " the most complete GIT integration plugin 16
17" Plugin 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround 17" AIRLINE: ===========================================.
18" Plugin 'susam/vimer' 18Plug 'vim-airline/vim-airline' | " beautification of the mode line
19" Plugin 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values) 19let g:airline_detect_modified = 0 |
20 20let g:airline_detect_paste = 0 |
21" Colorschemes =======================================. 21let g:airline_exclude_preview = 1 |
22Plugin 'nelstrom/vim-mac-classic-theme' | " light theme 22let g:airline_extensions = ['tabline']
23Plugin 'Valloric/vim-valloric-colorscheme' 23let g:airline#extensions#tabline#disable_refresh = 1 |
24" let base16colorspace=256 " Access colors present in 256 colorspace 24let g:airline#extensions#tabline#enabled = 1 |
25Plugin 'chriskempson/vim-tomorrow-theme' 25let g:airline#extensions#tabline#fnamemod = ':t:.' | " let airline just show the filename without its path
26Plugin 'chriskempson/base16-vim' 26let g:airline#extensions#tabline#show_buffers = 1 |
27"let g:miniBufExplSplitToEdge = 1 27let g:airline#extensions#tabline#show_tabs = 0 |
28 28let g:airline#extensions#tagbar#enabled = 1 |
29" AIRLINE ============================================. 29let g:airline#extensions#tagbar#flags = 's'
30" Plugin 'itchyny/lightline.vim' 30let g:airline#extensions#whitespace#enabled = 0 |
31" let g:lightline = { 31let g:airline#extensions#wordcount#enabled = 0 |
32" \ 'colorscheme': 'PaperColor', 32let g:airline_inactive_collapse = 1 |
33" \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, 33let g:airline_powerline_fonts = 1 |
34" \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" } 34let g:airline_section_c = '%F'
35" \ } 35" AIRLINE_Theme: =====================================.
36" Plugin 'fholgado/minibufexpl.vim' 36Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme
37" let g:miniBufExplAutoStart = 1
38" let g:miniBufExplShowBufNumbers = 0
39" let g:miniBufExplBRSplit = 1
40" let g:miniBufExplVSplit = 20 " column width in chars
41Plugin 'vim-airline/vim-airline' | " beautification of the mode line
42Plugin 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme
43let g:airline_theme='base16' | " specifies which colorscheme should airline uses 37let g:airline_theme='base16' | " specifies which colorscheme should airline uses
44let g:airline_powerline_fonts = 1 | " 38" let g:airline_theme='bubblegum' | " specifies which colorscheme should airline uses
45let g:airline#extensions#wordcount#enabled = 0 39" let g:airline_theme='dark' |
46" let g:airline_inactive_collapse = 1 | " 40" let g:airline_theme='luna' | " specifies which colorscheme should airline uses
47let g:airline_extensions=['tabline'] 41" let g:airline_theme='papercolor' | " specifies which colorscheme should airline uses
48let g:airline#extensions#tabline#enabled = 1 | " 42" let g:airline_theme='tomorrow' | " specifies which colorscheme should airline uses
49let g:airline#extensions#tabline#show_buffers = 1 | " 43
50let g:airline#extensions#tabline#show_tabs = 0 44" Additional: ========================================.
51let g:airline#extensions#tagbar#enabled = 1 45Plug 'loremipsum' | " Sample text generator
52let g:airline#extensions#tagbar#flags = 's' 46Plug 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages
53let g:airline#extensions#tabline#enabled = 1 47Plug 'taglist-plus' | " quick code navigator
54let airline#extensions#tabline#disable_refresh = 1 48
55let g:airline#extensions#tabline#fnamemod = ':t:.' 49" Autocompleter: =====================================.
56" let g:airline_theme='dark' 50Plug 'Valloric/MatchTagAlways'
57let g:airline_detect_modified=0 51Plug 'Valloric/YouCompleteMe'
58let g:airline_detect_paste=0 52Plug 'scrooloose/syntastic'
59let g:airline_section_c = '%F'
60" let g:airline#extensions#tabline#show_tabs = 1 | "
61" let g:airline#extensions#tabline#fnamemod = ':t' | " let airline just show the filename without its path
62" let g:airline#extensions#whitespace#enabled = 0
63" let g:airline_exclude_preview = 1
64" let g:airline_theme='bubblegum' | " specifies which colorscheme should airline uses
65" let g:airline_theme='tomorrow' | " specifies which colorscheme should airline uses
66" let g:airline_theme='papercolor' | " specifies which colorscheme should airline uses
67" let g:airline_theme='luna' | " specifies which colorscheme should airline uses
68
69
70" Additional =========================================.
71Plugin 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages
72Plugin 'taglist-plus' | " quick code navigator
73Plugin 'loremipsum' | " Sample text generator
74
75
76" Autocompleter ======================================.
77Plugin 'Valloric/MatchTagAlways'
78Plugin 'Valloric/YouCompleteMe'
79Plugin 'scrooloose/syntastic'
80set statusline+=%#warningmsg# 53set statusline+=%#warningmsg#
81set statusline+=%{SyntasticStatuslineFlag()} 54set statusline+=%{SyntasticStatuslineFlag()}
82set statusline+=%* 55set statusline+=%*
83let g:syntastic_always_populate_loc_list = 1
84let g:syntastic_auto_loc_list = 1
85let g:syntastic_check_on_open = 1
86let g:syntastic_check_on_wq = 0
87Plugin 'davidhalter/jedi-vim' | " jedi gets used to display python function signatures
88let g:jedi#show_call_signatures_delay = 0
89let g:jedi#completions_enabled = 0
90let g:LatexBox_viewer = "evince"
91let g:LatexBox_latexmk_preview_continuously = 1 56let g:LatexBox_latexmk_preview_continuously = 1
92 57let g:LatexBox_viewer = "evince"
93" let g:jedi#show_call_signatures = "2" 58let g:syntastic_always_populate_loc_list = 1
59let g:syntastic_auto_loc_list = 1
60let g:syntastic_check_on_open = 1
61let g:syntastic_check_on_wq = 0
62Plug 'davidhalter/jedi-vim' | " jedi gets used to display python function signatures
63let g:jedi#completions_enabled = 0 | " we do not need completions, because we have YouCompleteMe
64let g:jedi#show_call_signatures = 1 | " which sadly does not support signatures like jedi
65let g:jedi#show_call_signatures_delay = 0
94 66
95" Disabled ===========================================. 67" Disabled ===========================================.
96" Plugin 'Shougo/neocomplete.vim' 68" Plug 'Shougo/neocomplete.vim' | " alternative to YouCompleteMe in some cases
97" Plugin 'tweekmonster/django-plus.vim' | " django helper 69" Plug 'Shougo/vimproc.vim' | " dependency for other Shougo plugins
98" Plugin 'Shougo/vimproc.vim' | " dependency for other Shougo plugins 70" Plug 'indenthtml.vim' | " works better with mixed html/css/javascript
99" Plugin 'Shougo/neosnippet-snippets' 71" Plug 'evanmiller/nginx-vim-syntax' | " TODO: check if now included in syntastic?
100" Plugin 'Rip-Rip/clang_complete'
101" Plugin 'indenthtml.vim' | " works better with mixed html/css/javascript
102" Plugin 'evanmiller/nginx-vim-syntax'
103
104 72
73call plug#end() | " all plugins are getting loaded on this line, don't remove!
105 74
106" All of your Plugins must be added before the following line
107call vundle#end() | " required
108filetype on 75filetype on
109filetype plugin on 76filetype plugin on
110filetype indent on 77filetype indent on
@@ -113,17 +80,17 @@ syntax sync minlines=60 | " how many preceding lines will be parsed? (has
113" set term=xtermc | " required on solaris 80" set term=xtermc | " required on solaris
114 81
115let base16colorspace=256 82let base16colorspace=256
116" colorscheme mac_classic | " finally set which colorscheme to use 83colorscheme base16-phd
117" colorscheme valloric
118" colorscheme vividchalk | " finally set which colorscheme to use
119" colorscheme Tomorrow 84" colorscheme Tomorrow
120" colorscheme pencil 85" colorscheme Tomorrow-Night
121" colorscheme Tomorrow-Night-Bright
122" colorscheme Tomorrow-Night 86" colorscheme Tomorrow-Night
123" colorscheme Tomorrow-Night-Blue 87" colorscheme Tomorrow-Night-Blue
88" colorscheme Tomorrow-Night-Bright
124" colorscheme base16-default-dark 89" colorscheme base16-default-dark
125colorscheme base16-phd 90" colorscheme mac_classic | " finally set which colorscheme to use
126" colorscheme Tomorrow-Night 91" colorscheme pencil
92" colorscheme valloric
93" colorscheme vividchalk | " finally set which colorscheme to use
127 94
128" Shortcut mods =======================================. 95" Shortcut mods =======================================.
129inoremap <C-Space> <C-x><C-o> 96inoremap <C-Space> <C-x><C-o>
@@ -136,6 +103,7 @@ nnoremap <C-S-Tab> :bp<CR>| " use CTRL+Shift+Tab to switch to preview tab
136nnoremap <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L 103nnoremap <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L
137 104
138" settings ============================================. 105" settings ============================================.
106set shell=/bin/bash | " many scripts rely on bash, so make this the default
139set noshowmode | " because we are using some powerline derivat 107set noshowmode | " because we are using some powerline derivat
140set hidden | " allows switiching buffers even if the current buffer contains changes (displays +) 108set hidden | " allows switiching buffers even if the current buffer contains changes (displays +)
141set confirm | " asks 'do you want to save?' 109set confirm | " asks 'do you want to save?'
@@ -201,6 +169,9 @@ noautocmd
201 169
202if has("autocmd") 170if has("autocmd")
203 set modeline | " set variables specific to a file, like indentation by adding a comment 171 set modeline | " set variables specific to a file, like indentation by adding a comment
172 " set default completion function in case YouCompleteMe cannot help
173 set omnifunc=syntaxcomplete#Complete
174
204 " automatically reload this file when it gets edited 175 " automatically reload this file when it gets edited
205 augroup reload_vimrc " { 176 augroup reload_vimrc " {
206 autocmd! 177 autocmd!
@@ -255,29 +226,34 @@ if has("autocmd")
255endif 226endif
256 227
257 228
258" if filereadable(expand("~/.vimrc_background"))
259" let base16colorspace=256
260" source ~/.vimrc_background
261" endif
262 229
263 230
264 231
265 232
266" set colorcolumn=80 | " show an indicator (different background in column 80)
267 233
234
235" if filereadable(expand("~/.vimrc_background"))
236" let base16colorspace=256
237" source ~/.vimrc_background
238" endif
239" set colorcolumn=80 | " show an indicator (different background in column 80)
268" set title 240" set title
269" set t_ts=^[k 241" set t_ts=^[k
270" set t_fs=^[\ 242" set t_fs=^[\
271" auto BufEnter * :set title | let &titlestring = 'v:' . expand('%') 243" auto BufEnter * :set title | let &titlestring = 'v:' . expand('%')
272" auto VimLeave * :set t_ts=^[k^[\ 244" auto VimLeave * :set t_ts=^[k^[\
273" To ignore plugin indent changes, instead use:
274"
275" Brief help
276" :PluginList - lists configured plugins
277" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate
278" :PluginSearch foo - searches for foo; append `!` to refresh local cache
279" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
280"
281" see :h vundle for more details or wiki for FAQ
282" Put your non-Plugin stuff after this line
283" 245"
246" ALTERNATIVE: |
247" LightLine_and_MiniBufExplorer: =====================.
248" Plug 'itchyny/lightline.vim'
249" let g:lightline = {
250" \ 'colorscheme': 'PaperColor',
251" \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
252" \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }
253" \ }
254" Plug 'fholgado/minibufexpl.vim'
255" let g:miniBufExplAutoStart = 1
256" let g:miniBufExplBRSplit = 1
257" let g:miniBufExplShowBufNumbers = 0
258" let g:miniBufExplSplitToEdge = 1
259" let g:miniBufExplVSplit = 20 " column width in chars
..