aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-02-22 17:40:58 +0100
committerMax Christian Pohle2017-02-22 17:40:58 +0100
commit3b7000901a735f880fb5cf70c5d214becfae100d (patch)
treeb8ea4fd755ee9de8eab442c9cd9422a94c5d56fd
parent4d4cc837bbf0cbfe35ff4ec642d7c6bafb3a3fe6 (diff)
downloadvim-3b7000901a735f880fb5cf70c5d214becfae100d.tar.bz2
vim-3b7000901a735f880fb5cf70c5d214becfae100d.zip
Several optical improvements, nvim compatibility fixes
-rw-r--r--vimrc64
1 files changed, 31 insertions, 33 deletions
diff --git a/vimrc b/vimrc
index 5ed666d..48f8435 100644
--- a/vimrc
+++ b/vimrc
@@ -15,6 +15,34 @@ Plug 'godlygeek/tabular' | " align code on a sign,
15Plug 'mhinz/vim-signify' | " show changes in the clutter bar 15Plug 'mhinz/vim-signify' | " show changes in the clutter bar
16 16
17 17
18" AIRLINE: ===========================================.
19Plug 'vim-airline/vim-airline' | " beautification of the mode line
20set laststatus=2 | " required by AirLine, without status line does not appear until a window split
21let g:airline_detect_modified = 0 |
22let g:airline_detect_paste = 0 |
23let g:airline_exclude_preview = 1 |
24let g:airline_extensions = ['tabline', 'branch', 'syntastic', 'tagbar']
25let g:airline#extensions#tabline#disable_refresh = 1 |
26let g:airline#extensions#tabline#enabled = 1 |
27let g:airline#extensions#tabline#fnamemod = ':t:.' | " let airline just show the filename without its path
28let g:airline#extensions#tabline#show_buffers = 1 |
29let g:airline#extensions#tabline#show_tabs = 0 |
30let g:airline#extensions#tagbar#enabled = 0 |
31let g:airline#extensions#tagbar#flags = 's'
32let g:airline#extensions#whitespace#enabled = 0 |
33let g:airline#extensions#wordcount#enabled = 0 |
34let g:airline_inactive_collapse = 1 |
35let g:airline_powerline_fonts = 1 |
36let g:airline_section_c = '%F'
37
38
39" AIRLINE_Theme: =====================================.
40Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme
41let g:airline_theme='base16' | " specifies which colorscheme should airline uses
42" let g:airline_theme='badcat' | " specifies which colorscheme should airline uses
43" let g:airline_theme='papercolor' | " specifies which colorscheme should airline uses
44
45
18" Colorschemes: ======================================. 46" Colorschemes: ======================================.
19Plug 'ryanoasis/vim-devicons' | " eye candy icons 47Plug 'ryanoasis/vim-devicons' | " eye candy icons
20Plug 'chriskempson/base16-vim' | " 48Plug 'chriskempson/base16-vim' | "
@@ -58,34 +86,6 @@ nnoremap <expr>
58nnoremap Q !!$SHELL<CR> 86nnoremap Q !!$SHELL<CR>
59 87
60 88
61" AIRLINE: ===========================================.
62Plug 'vim-airline/vim-airline' | " beautification of the mode line
63set laststatus=2 | " required by AirLine, without status line does not appear until a window split
64let g:airline_detect_modified = 0 |
65let g:airline_detect_paste = 0 |
66let g:airline_exclude_preview = 1 |
67let g:airline_extensions = ['tabline', 'branch', 'syntastic', 'tagbar']
68let g:airline#extensions#tabline#disable_refresh = 1 |
69let g:airline#extensions#tabline#enabled = 1 |
70let g:airline#extensions#tabline#fnamemod = ':t:.' | " let airline just show the filename without its path
71let g:airline#extensions#tabline#show_buffers = 1 |
72let g:airline#extensions#tabline#show_tabs = 0 |
73let g:airline#extensions#tagbar#enabled = 0 |
74let g:airline#extensions#tagbar#flags = 's'
75let g:airline#extensions#whitespace#enabled = 0 |
76let g:airline#extensions#wordcount#enabled = 0 |
77let g:airline_inactive_collapse = 1 |
78let g:airline_powerline_fonts = 1 |
79let g:airline_section_c = '%F'
80
81
82" AIRLINE_Theme: =====================================.
83Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme
84let g:airline_theme='base16' | " specifies which colorscheme should airline uses
85" let g:airline_theme='badcat' | " specifies which colorscheme should airline uses
86" let g:airline_theme='papercolor' | " specifies which colorscheme should airline uses
87
88
89" Additional: ========================================. 89" Additional: ========================================.
90Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages 90Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages
91let g:javascript_conceal_function = "ƒ" 91let g:javascript_conceal_function = "ƒ"
@@ -109,8 +109,6 @@ let g:tagbar_foldlevel = 99
109nnoremap <leader>l :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L 109nnoremap <leader>l :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L
110 110
111 111
112
113
114" Autocompleter: =====================================. 112" Autocompleter: =====================================.
115Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... 113Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/...
116Plug 'Valloric/YouCompleteMe' 114Plug 'Valloric/YouCompleteMe'
@@ -279,11 +277,8 @@ set showcmd | " essential: show keys of combined commands in t
279set thesaurus+=/home/max/.vim/thesaurus/php.txt 277set thesaurus+=/home/max/.vim/thesaurus/php.txt
280set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth) 278set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth)
281set ttimeoutlen=10 | " set esc key timeout in ms- 279set ttimeoutlen=10 | " set esc key timeout in ms-
282" set ttyfast | " improves speed for terminal vim (incomp. with nvim)
283set updatetime=1000 | " updates the screen more often 280set updatetime=1000 | " updates the screen more often
284" set ttyscroll=100 | " improves speed for terminal vim, incomp. with nvim
285set writedelay=0 281set writedelay=0
286" set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
287 282
288if has("multi_byte") 283if has("multi_byte")
289 scriptencoding utf-8 | " tell vim that we are using utf-8 here 284 scriptencoding utf-8 | " tell vim that we are using utf-8 here
@@ -431,6 +426,9 @@ endif
431 426
432if !has('nvim') 427if !has('nvim')
433 set ttymouse=xterm2 428 set ttymouse=xterm2
429 set ttyscroll=100 | " improves speed for terminal vim, incomp. with nvim
430 set ttyfast | " improves speed for terminal vim (incomp. with nvim)
431 set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
434else 432else
435 " shortcut \t opens a terminal in a horizontal split 433 " shortcut \t opens a terminal in a horizontal split
436 nnoremap <leader>t :new +terminal<CR> 434 nnoremap <leader>t :new +terminal<CR>
..