aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-01-19 12:48:21 +0100
committerMax Christian Pohle2017-01-19 12:48:21 +0100
commit79a13495d51718110f9fc074b55bc4e7e774e7c8 (patch)
tree0ab5212e8b3ca05f0ff268a7de38c0852f3d6188
parent1d6da55502f0b12b8712e956b90621aae561d97c (diff)
downloadvim-79a13495d51718110f9fc074b55bc4e7e774e7c8.tar.bz2
vim-79a13495d51718110f9fc074b55bc4e7e774e7c8.zip
NeoVim compatibility & CTRL-X/CTRL-A improvements
-rw-r--r--vimrc22
1 files changed, 17 insertions, 5 deletions
diff --git a/vimrc b/vimrc
index 2e4ff51..1e38ac7 100644
--- a/vimrc
+++ b/vimrc
@@ -65,6 +65,17 @@ let g:airline_theme='base16' | " specifies which colors
65 65
66" Additional: ========================================. 66" Additional: ========================================.
67Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages 67Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages
68let g:javascript_conceal_function = "ƒ"
69let g:javascript_conceal_null = "ø"
70let g:javascript_conceal_this = "@"
71let g:javascript_conceal_return = "⇚"
72let g:javascript_conceal_undefined = "¿"
73let g:javascript_conceal_NaN = "ℕ"
74let g:javascript_conceal_prototype = "¶"
75let g:javascript_conceal_static = "•"
76let g:javascript_conceal_super = "Ω"
77let g:javascript_conceal_arrow_function = "⇒"
78
68Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more 79Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more
69let g:tagbar_autoclose = 1 80let g:tagbar_autoclose = 1
70let g:tagbar_autofocus = 1 81let g:tagbar_autofocus = 1
@@ -95,7 +106,7 @@ Plug 'scrooloose/syntastic'
95set statusline+=%#warningmsg# 106set statusline+=%#warningmsg#
96set statusline+=%{SyntasticStatuslineFlag()} 107set statusline+=%{SyntasticStatuslineFlag()}
97set statusline+=%* 108set statusline+=%*
98set signcolumn=yes " always show the column 109" set signcolumn=yes " always show the column
99let g:LatexBox_latexmk_preview_continuously = 1 110let g:LatexBox_latexmk_preview_continuously = 1
100let g:LatexBox_viewer = "evince" 111let g:LatexBox_viewer = "evince"
101let g:syntastic_always_populate_loc_list = 1 112let g:syntastic_always_populate_loc_list = 1
@@ -184,6 +195,7 @@ set mouse=n | " allow mouse in normal mode only, so one can us
184set mousemodel=popup | " only in gvim: right click opens a popup-menu 195set mousemodel=popup | " only in gvim: right click opens a popup-menu
185set nocursorcolumn | " turn visual cursor column off (improves performance) 196set nocursorcolumn | " turn visual cursor column off (improves performance)
186set nocursorline | " turn visual cursor line off (improves performance) 197set nocursorline | " turn visual cursor line off (improves performance)
198set nrformats+=alpha | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers
187set nofoldenable | " disable code folding. I hate code folding 199set nofoldenable | " disable code folding. I hate code folding
188set relativenumber | " relative line numbers can speed up navigation 200set relativenumber | " relative line numbers can speed up navigation
189set noshowmode | " because we are using some powerline derivat 201set noshowmode | " because we are using some powerline derivat
@@ -193,20 +205,20 @@ set nowrap | " but do not (by default) wrap long lines around
193set number | " turn line numbers on/off (performance decreases when they are shown) 205set number | " turn line numbers on/off (performance decreases when they are shown)
194set pumheight=8 | " Determines the maximum number of items to show in the popup menu for 206set pumheight=8 | " Determines the maximum number of items to show in the popup menu for
195set redrawtime=400 | " The time in milliseconds for redrawing the display. 207set redrawtime=400 | " The time in milliseconds for redrawing the display.
196set restorescreen | " restores the console after exiting vim 208" set restorescreen | " restores the console after exiting vim
197set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge 209set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge
198set spell spelllang=en,de | " enable spell checker 210set spell spelllang=en,de | " enable spell checker
199set splitbelow | " open new windows below the current one (i find that more intuitive) 211set splitbelow | " open new windows below the current one (i find that more intuitive)
200" set t_Co=256 | " required on some ssh sessions 212" set t_Co=256 | " required on some ssh sessions
201set textwidth=100 | " line length (80 used to be default, but...) 213" set textwidth=100 | " line length (80 used to be default, but...)
202set thesaurus+=/home/max/.vim/thesaurus/php.txt 214set thesaurus+=/home/max/.vim/thesaurus/php.txt
203set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth) 215set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth)
204set ttimeoutlen=10 | " set esc key timeout in ms- 216set ttimeoutlen=10 | " set esc key timeout in ms-
205set ttyfast | " improves speed for terminal vim 217set ttyfast | " improves speed for terminal vim
206set updatetime=1000 | " updates the screen more often 218set updatetime=1000 | " updates the screen more often
207set ttyscroll=100 | " improves speed for terminal vim 219" set ttyscroll=100 | " improves speed for terminal vim, incomp. with nvim
208set writedelay=0 220set writedelay=0
209" set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) 221" set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
210 222
211if has("multi_byte") 223if has("multi_byte")
212 scriptencoding utf-8 | " tell vim that we are using utf-8 here 224 scriptencoding utf-8 | " tell vim that we are using utf-8 here
..