nvim: disable LazyVim autocmds, match vimrc augroups to LazyVim

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 436ab89e6f34ea4c3f97bfe66b46cdbe2b803afb..c5fca7744f8383a6594de26362d35544c207ab50 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,14 +1,14 @@
 " force python3
 if has('python3') | endif
 
 " force python3
 if has('python3') | endif
 

+" space is leader
+let g:mapleader = " "
+

 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 " plugins {{{1
 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 " plugins {{{1

-" remove all autocommands
-autocmd!
-

 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'


@@ -376,7 +376,7 @@ set sessionoptions+=unix,slash  " damn windows and it's silly ways
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2

-augroup resize
+augroup resize_splits

     au!
     autocmd VimResized * :wincmd =
 augroup END
     au!
     autocmd VimResized * :wincmd =
 augroup END


@@ -395,7 +395,7 @@ augroup ft_stdin
 augroup END
 
 " Jump to last known cursor position {{{2
 augroup END
 
 " Jump to last known cursor position {{{2

-augroup cursor_pos
+augroup last_loc

     au!
     " blacklist certain filetype
     let blacklist = ['gitcommit']
     au!
     " blacklist certain filetype
     let blacklist = ['gitcommit']


@@ -425,9 +425,6 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
 
 " bindings {{{1
 

-" allow both <space> and \ to be <leader>
-map <space> <leader>
-

 " make
 function! MakeWithOpt()
   " TODO only do this if makeprg matches make
 " make
 function! MakeWithOpt()
   " TODO only do this if makeprg matches make