NeoVim compatibility & CTRL-X/CTRL-A improvements

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
 
 " Additional: ========================================.
 Plug 'sheerun/vim-polyglot'                           " better syntax highlighting/indentation for multiple languages
+let g:javascript_conceal_function             = "ƒ"
+let g:javascript_conceal_null                 = "ø"
+let g:javascript_conceal_this                 = "@"
+let g:javascript_conceal_return               = "⇚"
+let g:javascript_conceal_undefined            = "¿"
+let g:javascript_conceal_NaN                  = "ℕ"
+let g:javascript_conceal_prototype            = "¶"
+let g:javascript_conceal_static               = "•"
+let g:javascript_conceal_super                = "Ω"
+let g:javascript_conceal_arrow_function       = "⇒"
+
 Plug 'majutsushi/tagbar'                              " superseeds taglist-plus, which isn't maintained any more
 let g:tagbar_autoclose   = 1
 let g:tagbar_autofocus   = 1
@@ -95,7 +106,7 @@ Plug 'scrooloose/syntastic'
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
-set signcolumn=yes                                    " always show the column
+" set signcolumn=yes                                    " always show the column
 let g:LatexBox_latexmk_preview_continuously = 1
 let g:LatexBox_viewer                       = "evince"
 let g:syntastic_always_populate_loc_list    = 1
@@ -184,6 +195,7 @@ set mouse=n                   | " allow mouse in normal mode only, so one can us
 set mousemodel=popup          | " only in gvim: right click opens a popup-menu
 set nocursorcolumn            | " turn visual cursor column off (improves performance)
 set nocursorline              | " turn visual cursor line off (improves performance)
+set nrformats+=alpha          | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers
 set nofoldenable              | " disable code folding. I hate code folding
 set relativenumber            | " relative line numbers can speed up navigation
 set noshowmode                | " because we are using some powerline derivat
@@ -193,20 +205,20 @@ set nowrap                    | " but do not (by default) wrap long lines around
 set number                    | " turn line numbers on/off (performance decreases when they are shown)
 set pumheight=8               | " Determines the maximum number of items to show in the popup menu for
 set redrawtime=400            | " The time in milliseconds for redrawing the display.
-set restorescreen             | " restores the console after exiting vim
+" set restorescreen             | " restores the console after exiting vim
 set scrolljump=5              | " how many lines get scrolled into view when cursor reaches the screens edge
 set spell spelllang=en,de     | " enable spell checker
 set splitbelow                | " open new windows below the current one (i find that more intuitive)
 " set t_Co=256                  | " required on some ssh sessions
-set textwidth=100             | " line length (80 used to be default, but...)
+" set textwidth=100             | " line length (80 used to be default, but...)
 set thesaurus+=/home/max/.vim/thesaurus/php.txt
 set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth)
 set ttimeoutlen=10            | " set esc key timeout in ms-
 set ttyfast                   | " improves speed for terminal vim
 set updatetime=1000           | " updates the screen more often
-set ttyscroll=100             | " improves speed for terminal vim
+" set ttyscroll=100             | " improves speed for terminal vim, incomp. with nvim
 set writedelay=0
-" set termguicolors             | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color)
+" set termguicolors             | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incomp. with nvim
 
 if has("multi_byte")
   scriptencoding utf-8        | " tell vim that we are using utf-8 here