zshenv: fix xdg array logic

[dotfiles.git] / etc / vim / .vimrc

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index f79a80bd7dcbc307dda94d92d0f4df94873c443f..bad9f6a53d2b8319a87e4544ccc605d3d6067cb7 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -3,21 +3,24 @@ source $VIMRUNTIME/defaults.vim
 let x = ($XDG_CONFIG_HOME??($HOME."/.config"))."/vim"
 execute 'set runtimepath='.x.','.&runtimepath.','.x.'/after'
 execute 'set packpath='.x.','.&packpath.','.x.'/after'
 let x = ($XDG_CONFIG_HOME??($HOME."/.config"))."/vim"
 execute 'set runtimepath='.x.','.&runtimepath.','.x.'/after'
 execute 'set packpath='.x.','.&packpath.','.x.'/after'

-unlet x

 
 packadd matchit
 
 
 packadd matchit
 

-if !isdirectory($HOME . "/.local/share/vim")
-    call mkdir($HOME . "/.local/share/vim", "p", 0700)
+let x = ($XDG_DATA_HOME??($HOME."/.local/share"))."/vim"
+if !isdirectory(x)
+    call mkdir(x, "p", 0700)

 endif
 set backup
 endif
 set backup

-set backupdir=$HOME/.local/share/vim//
+execute 'set backupdir='.x.'//'

 set backupcopy=yes
 set backupcopy=yes

-if !isdirectory($HOME . "/.local/state/vim")
-    call mkdir($HOME . "/.local/state/vim", "p", 0700)
+let x = ($XDG_STATE_HOME??($HOME."/.local/state"))."/vim"
+if !isdirectory(x)
+    call mkdir(x, "p", 0700)

 endif
 set undofile
 endif
 set undofile

-set undodir=$HOME/.local/state/vim//
+execute 'set undodir='.x.'//'
+execute 'set viminfofile='.x.'/.viminfo'
+unlet x

 
 set autoindent
 set colorcolumn=80
 
 set autoindent
 set colorcolumn=80


@@ -44,4 +47,4 @@ highlight WhiteSpaceMol ctermfg=Black
 match WhiteSpaceMol / /
 2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
 
 match WhiteSpaceMol / /
 2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
 

-" vim: set et fenc=utf-8 ft=vim sts=4 sw=4 ts=8 tw=79 :
+let g:EditorConfig_enable_for_new_buf = 1