weechat: update wee-slack

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 092f59489d404dfec4cb9c6034999938d976d318..34afc34f514993bdcd0db7b1883eedc5758d503e 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -196,6 +196,7 @@ augroup END
 set scrolloff=5                 " number of screen lines to show around the cursor
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars
 set scrolloff=5                 " number of screen lines to show around the cursor
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars

+set display+=lastline           " display as much as possible of last line

 
 set fillchars=diff:⣿,vert:│
 
 
 set fillchars=diff:⣿,vert:│
 


@@ -354,7 +355,15 @@ set isfname-==    " don't treat `=` as being part of filenames
 " various {{{2
 set virtualedit+=block     " let cursor move past last char in <C-V> mode
 set virtualedit+=onemore   " allow the cursor to move just past the end of the line
 " various {{{2
 set virtualedit+=block     " let cursor move past last char in <C-V> mode
 set virtualedit+=onemore   " allow the cursor to move just past the end of the line

-set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
+if !has('nvim')
+  " viminfo defaults but save file in .cache
+  set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo
+else
+  " shada is the replacement format for viminfo
+  " this setting is probably not needed as it's most likely the default
+  " the default path is in XDG_DATA_HOME, which is fine
+  set shada='100,<50,s10,h
+endif

 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 
 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 


@@ -409,11 +418,6 @@ augroup END
 command! NoAutoChecktime let b:autochecktime=0
 command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
 
 command! NoAutoChecktime let b:autochecktime=0
 command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
 

-augroup terminal
-  au!
-  au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
-augroup END
-

 " bindings {{{1
 
 " allow both <space> and \ to be <leader>
 " bindings {{{1
 
 " allow both <space> and \ to be <leader>