major rework

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

diff --git a/base/.vimrc b/etc/vim/.vimrc
similarity index 70%
rename from base/.vimrc
rename to etc/vim/.vimrc
index 622e1af3cf07c5f7a1ec814a1b30c6716a1448d0..f79a80bd7dcbc307dda94d92d0f4df94873c443f 100644 (file)
--- a/base/.vimrc
+++ b/etc/vim/.vimrc
@@ -1,19 +1,27 @@
 source $VIMRUNTIME/defaults.vim
 
-packadd matchit
+let x = ($XDG_CONFIG_HOME??($HOME."/.config"))."/vim"
+execute 'set runtimepath='.x.','.&runtimepath.','.x.'/after'
+execute 'set packpath='.x.','.&packpath.','.x.'/after'
+unlet x
 
-set modeline "!!!
+packadd matchit
 
+if !isdirectory($HOME . "/.local/share/vim")
+    call mkdir($HOME . "/.local/share/vim", "p", 0700)
+endif
 set backup
-set backupdir=$HOME/var/tmp/vim//
+set backupdir=$HOME/.local/share/vim//
 set backupcopy=yes
+if !isdirectory($HOME . "/.local/state/vim")
+    call mkdir($HOME . "/.local/state/vim", "p", 0700)
+endif
 set undofile
-set undodir=$HOME/var/tmp/vim//
+set undodir=$HOME/.local/state/vim//
 
 set autoindent
 set colorcolumn=80
 highlight ColorColumn term=NONE ctermbg=0
-" filetype should be on from defaults.vim
 autocmd FileType python     setlocal tabstop=4 shiftwidth=4 expandtab
 autocmd FileType markdown   setlocal tabstop=4 shiftwidth=4 expandtab
 autocmd FileType javascript setlocal tabstop=2 shiftwidth=2 expandtab
@@ -36,6 +44,4 @@ highlight WhiteSpaceMol ctermfg=Black
 match WhiteSpaceMol / /
 2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
 
-let g:Modeliner_format='ft= fenc= et ts= sts= sw= tw='
-
 " vim: set et fenc=utf-8 ft=vim sts=4 sw=4 ts=8 tw=79 :