init: Move guicursor fix to init-local example

[vimconf.git] / init.vim

diff --git a/init.vim b/init.vim
index 94493423c801caa9e5945d9a4b5e6f5ef013bc9f..2da7cac0d3816f326a38b0c46d76b4f46fe177ef 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -6,6 +6,8 @@
 " Some global settings
 
 set nocompatible
+" Breaks colors for some versions of mosh, but not if tmux is used on top of
+" mosh. See https://github.com/mobile-shell/mosh/issues/928
 set termguicolors
 set number
 set cursorline
@@ -31,17 +33,11 @@ set hlsearch
 
 set colorcolumn=+1
 set mouse=a
+set wildmenu
 set wildmode=longest,list:full
 
 set tabpagemax=100
 
-" Some terminals cause weired symbols due to broken cursor-shape termcodes.
-if has('nvim')
-    "set guicursor=
-    " Workaround some broken plugins which set guicursor indiscriminately.
-    "au OptionSet guicursor noautocmd set guicursor=
-end
-
 syntax on
 
 " Load some macros
@@ -156,17 +152,21 @@ au Filetype man setlocal nonumber
 
 " Minimum indenting for source code
 au FileType java,cpp,c,cs let g:detectindent_min_indent = 4
-au BufReadPost *.java :DetectIndent
+" Consider using localvimrc config file or editorconfig instead
+"au BufReadPost *.java :DetectIndent
 
 au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
 au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
 
 au BufEnter *.cpp,*.cc,*.cxx let b:fswitchdst='h,hxx,hpp,hh'
 au BufEnter *.h,*.hh,*.hxx let b:fswitchdst='cc,c,cxx,cpp'
+au BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
+let g:localvimrc_persistent = 1
+
 au FileType markdown call RagtagInit()
 
 let g:detectspelllang_langs = {}