From 81f6c74c871144aa79628095e735e35affd79f74 Mon Sep 17 00:00:00 2001 From: Tyler Hoang Date: Thu, 10 Feb 2022 13:45:25 -0800 Subject: updated vim --- vim/bundle/fzf | 2 +- vim/bundle/fzf.vim | 2 +- vim/bundle/nerdcommenter | 2 +- vim/bundle/nord-vim | 2 +- vim/vimrc | 32 +++++++++++++++++++++++--------- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/vim/bundle/fzf b/vim/bundle/fzf index 7191ebb..9cb7a36 160000 --- a/vim/bundle/fzf +++ b/vim/bundle/fzf @@ -1 +1 @@ -Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d +Subproject commit 9cb7a364a31bdb882d873807774bdcf6fad0c9e4 diff --git a/vim/bundle/fzf.vim b/vim/bundle/fzf.vim index e34f6c1..1f7bfa4 160000 --- a/vim/bundle/fzf.vim +++ b/vim/bundle/fzf.vim @@ -1 +1 @@ -Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946 +Subproject commit 1f7bfa4007043c30027b2cd79625e8aac5cff1f9 diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter index a5d1663..f9c5f0f 160000 --- a/vim/bundle/nerdcommenter +++ b/vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit a5d1663185bee20bfb120c9ab212144444514982 +Subproject commit f9c5f0fbda3be77dce5bb4b06b49d9f11b3b6c20 diff --git a/vim/bundle/nord-vim b/vim/bundle/nord-vim index 8d8b9bf..b32592e 160000 --- a/vim/bundle/nord-vim +++ b/vim/bundle/nord-vim @@ -1 +1 @@ -Subproject commit 8d8b9bf86bbc715a055b54cb53f0643fd664caa4 +Subproject commit b32592eb0842005d1d25de96e3964ccacd537039 diff --git a/vim/vimrc b/vim/vimrc index ae9a09c..76405b1 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,9 +1,26 @@ -set viminfo+=n~/.config/vim/viminfo -set undodir=$HOME/.config/vim/undo -set directory=$HOME/.config/vim/swap -set backupdir=$HOME/.config/vim/backup -set viewdir=$HOME/.config/vim/view -set runtimepath=$HOME/.config/vim,$VIMRUNTIME,$HOME/.config/vim/after +set nocompatible " be iMproved, required +filetype off " required +if &compatible | set nocompatible | endif " Avoid side effects if `nocp` already set + +if empty("$XDG_CACHE_HOME") + let $XDG_CACHE_HOME="$HOME/.cache" +endif + +if empty("$XDG_CONFIG_HOME") + let $XDG_CONFIG_HOME="$HOME/.config" +endif + +if empty("$XDG_DATA_HOME") + let $XDG_DATA_HOME="$HOME/.local/share" +endif + +set directory=$XDG_CACHE_HOME/vim/swap,~/,/tmp +set backupdir=$XDG_CACHE_HOME/vim/backup,~/,/tmp +set undodir=$XDG_CACHE_HOME/vim/undo,~/,/tmp +set viminfo+=n$XDG_CACHE_HOME/vim/viminfo +set runtimepath+=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after,$VIM,$VIMRUNTIME +let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" + set rtp+=$HOME/.config/vim/bundle/Vundle.vim set enc=utf-8 @@ -26,9 +43,6 @@ command! FZFLib call fzf#run({'source': 'find ~/.config/ ~/.local/bin -type f', "set background=dark colorscheme nord -" Don't try to be vi compatible -set nocompatible - " Turn on syntax highlighting syntax on -- cgit v1.2.3-13-gbd6f