vim: update config, support nvim, del editorconfig

- many config options were not being applied globally, since they were not
  global options themselves. they have been made global using autocommands.
- nvim did not work properly as some options are not compatible/not necessary
  with it.
- editorconfig is built-in as of vim 9, so the repo is no longer necessary. it
  has been removed, and the editorconfig optional package loaded when vim
  starts.

diff --git a/.gitmodules b/.gitmodules
index e0303ba35f2715b53429a2ba5b08c70f0ff250d7..761a5e7bf667ba62d65ce85b2525317360877769 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "vim-repeat"]
        path = etc/vim/pack/vim-repeat/start/vim-repeat
        url = https://github.com/tpope/vim-repeat
-[submodule "editorconfig-vim"]
-       path = etc/vim/pack/editorconfig-vim/start/editorconfig-vim
-       url = https://github.com/editorconfig/editorconfig-vim.git
 [submodule "etc/zsh/plugins/evil-registers"]
        path = etc/zsh/plugins/zshrc/evil-registers
        url = https://github.com/zsh-vi-more/evil-registers

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index e1af798667253eb1723233965ed0e83e117985e2..799bd97562d129d5b1675c1496c83c634fc6a20b 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -1,64 +1,91 @@
-source $VIMRUNTIME/defaults.vim
-
+" use our new vim dir primarily
 let x = ($XDG_CONFIG_HOME??($HOME.'/.config')).'/vim'
 execute 'set runtimepath='.x.','.&runtimepath.','.x.'/after'
 execute 'set packpath='.x.','.&packpath.','.x.'/after'
 
-packadd matchit
+if !has('nvim')
+    " neovim doesn't have defaults to load explicitly
+    source $VIMRUNTIME/defaults.vim
+
+    " neovim does this stuff already
+    packadd matchit
+    packadd editorconfig
+
+    set autoindent
+endif
 
+" define and create a centralized dir to keep transient state files in
 let x = ($XDG_STATE_HOME??($HOME.'/.local/state')).'/vim'
 if !isdirectory(x)
     call mkdir(x, 'p', 0700)
 endif
-execute 'set viminfofile='.x.'/.viminfo'
-
-let y = x.'/swap'
-if !isdirectory(y)
-    call mkdir(y, 'p', 0700)
-endif
-execute 'set directory='.y.'//'
 
 let y = x.'/backup'
 if !isdirectory(y)
     call mkdir(y, 'p', 0700)
 endif
-set backup
 execute 'set backupdir='.y.'//'
-set backupcopy=yes
+set backup backupcopy=yes
 
-let y = x.'/undo'
-if !isdirectory(y)
-    call mkdir(y, 'p', 0700)
+
+" NOTE: neovim uses ShaDa (SHAred DAta) format for viminfo and swap, and uses a
+"       different version for undo files, so these types of files when created
+"       by vim cannot be used with neovim, and the 'viminfofile', 'directory',
+"       and 'undodir' directories cannot be shared.
+" NOTE: neovim has a nice default for these directories and files so
+"       customizing them is not necessary for it.
+if !has('nvim')
+    " NOTE: 'viminfofile' is a deprecated alias for 'shada' in neovim
+    execute 'set viminfofile='.x.'/.viminfo'
+
+    let y = x.'/swap'
+    if !isdirectory(y)
+        call mkdir(y, 'p', 0700)
+    endif
+    execute 'set directory='.y.'//'
+
+    let y = x.'/undo'
+    if !isdirectory(y)
+        call mkdir(y, 'p', 0700)
+    endif
+    execute 'set undodir='.y.'//'
 endif
-set undofile
-execute 'set undodir='.y.'//'
+
+autocmd BufNew * set undofile
 
 unlet x
 unlet y
 
-set autoindent
-set colorcolumn=80
-highlight ColorColumn term=NONE ctermbg=0
-autocmd FileType python     setlocal softtabstop=4 shiftwidth=4 expandtab
-autocmd FileType markdown   setlocal softtabstop=4 shiftwidth=4 expandtab
-autocmd FileType javascript setlocal softtabstop=2 shiftwidth=2 expandtab
-autocmd FileType json       setlocal softtabstop=2 shiftwidth=2 expandtab
-autocmd FileType html       setlocal softtabstop=2 shiftwidth=2 expandtab
-autocmd FileType todo       setlocal colorcolumn=0
-
-set cursorline
+" options
+autocmd VimEnter,WinNew * set number
+autocmd VimEnter,WinNew * set relativenumber
+autocmd InsertEnter * set norelativenumber
+autocmd InsertLeave * set   relativenumber
+autocmd FocusLost   * set norelativenumber
+autocmd FocusGained * set   relativenumber
+
+autocmd VimEnter,WinNew * set colorcolumn=80
+autocmd VimEnter,WinNew * set cursorline
 set hlsearch
-set list
+
+autocmd VimEnter,WinNew * set list
 set listchars=tab:├─,extends:»,precedes:«,space:·,trail:∙,nbsp:■
-set number
-set relativenumber
-autocmd InsertEnter * setlocal norelativenumber
-autocmd InsertLeave * setlocal   relativenumber
-autocmd FocusLost   * setlocal norelativenumber
-autocmd FocusGained * setlocal   relativenumber
-highlight WhiteSpaceBol ctermfg=DarkBlue
+
+" styles
+highlight ColorColumn term=NONE ctermbg=0
+
 highlight WhiteSpaceMol ctermfg=Black
-autocmd BufEnter * match WhiteSpaceMol / /
-autocmd BufEnter * 2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
+autocmd VimEnter,WinNew * match WhiteSpaceMol / /
+highlight WhiteSpaceBol ctermfg=DarkBlue
+autocmd VimEnter,WinNew * 2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
 
+" indent
+autocmd FileType python     set softtabstop=4 shiftwidth=4 expandtab
+autocmd FileType markdown   set softtabstop=4 shiftwidth=4 expandtab
+autocmd FileType javascript set softtabstop=2 shiftwidth=2 expandtab
+autocmd FileType json       set softtabstop=2 shiftwidth=2 expandtab
+autocmd FileType html       set softtabstop=2 shiftwidth=2 expandtab
 let g:EditorConfig_enable_for_new_buf = 1
+
+" syntax
+autocmd FileType todo       set colorcolumn=0

diff --git a/etc/vim/pack/editorconfig-vim/start/editorconfig-vim b/etc/vim/pack/editorconfig-vim/start/editorconfig-vim
deleted file mode 160000 (submodule)
index ba2ce02..0000000
--- a/etc/vim/pack/editorconfig-vim/start/editorconfig-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ba2ce027c5b0e523e658d24657ce3ae3306c9fe0