modified vim/init.vim, modified vim/vimrc, modified vim/init.vim, modified vim/vimrc

4 files changed, 17 insertions, 7 deletions

diff --git a/ar/.config/vim/init.vim b/ar/.config/vim/init.vim
index c8bcf81..fbb9097 100644
--- a/ar/.config/vim/init.vim
+++ b/ar/.config/vim/init.vim
@@ -1,4 +1,3 @@
-
 " AUTOCMD ---------------------------------------------------------------- {{{
 
 " Close with q
diff --git a/ar/.config/vim/vimrc b/ar/.config/vim/vimrc
index b2cc1a1..0535aec 100644
--- a/ar/.config/vim/vimrc
+++ b/ar/.config/vim/vimrc
@@ -560,6 +560,8 @@ endif
 set t_Co=256
 if exists('+termguicolors')
     set termguicolors
+else
+    set notermguicolors
 endif
 
 " Cursor
diff --git a/mac/.config/vim/init.vim b/mac/.config/vim/init.vim
index ecc2c99..fbb9097 100644
--- a/mac/.config/vim/init.vim
+++ b/mac/.config/vim/init.vim
@@ -40,7 +40,7 @@ autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetyp
 autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb %
 
 " Recompile dwmblocks on config edit.
-autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks }
+autocmd BufWritePost ${XDG_SOURCES_HOME:-$HOME/.local/src}/suckless/dwmblocks/config.h !cd ${XDG_SOURCES_HOME:-$HOME/.local/src}/suckless/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks }
 
 " Which key description
 autocmd! User vim-which-key call which_key#register('<Space>', 'g:which_key_map')
@@ -52,7 +52,7 @@ let g:which_key_map = {}
 " BACKUP ----------------------------------------------------------------- {{{
 
 if version >= 703
-    set undodir=~/.config/vim/undodir
+    set undodir=${XDG_CONFIG_HOME:-$HOME/.config}/vim/undodir
     set undofile
     set undoreload=10000
 endif
@@ -231,8 +231,7 @@ augroup END
 
 let g:lsp_fold_enabled = 0
 let g:lsp_log_verbose = 1
-call mkdir(expand('~/.cache/vim'), 'p')
-let g:lsp_log_file          = expand('~/.cache/vim/vim-lsp.log')
+let g:lsp_log_file = expand('~/.cache/vim/vim-lsp.log')
 let g:asyncomplete_log_file = expand('~/.cache/vim/asyncomplete.log')
 let g:lsp_settings_filetype_python = ['pyright-langserver', 'ruff', 'ruff-lsp']
 
@@ -248,7 +247,7 @@ let g:airline_symbols.maxlinenr = ' '
 let g:airline#extensions#whitespace#symbol = '!'
 
 " colorscheme
-if isdirectory(expand("~/.config/vim/plugged/catppuccin"))
+if isdirectory(expand("${XDG_CONFIG_HOME:-$HOME/.config}/vim/plugged/catppuccin"))
     let g:airline_theme = 'catppuccin_mocha'
     colorscheme catppuccin_mocha
 endif
@@ -436,3 +435,12 @@ let g:which_key_map['w']    =   {
             \ }
 
 " }}}
+
+
+" SHORTCUTS ---------------------------------------------------------------- {{{
+
+if filereadable(expand("${XDG_CONFIG_HOME:-$HOME/.config}/nvim/shortcuts.vim"))
+    silent! source ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/shortcuts.vim
+endif
+
+" }}}
diff --git a/mac/.config/vim/vimrc b/mac/.config/vim/vimrc
index 7185687..0535aec 100644
--- a/mac/.config/vim/vimrc
+++ b/mac/.config/vim/vimrc
@@ -9,7 +9,6 @@ if $USER != "root"
 
     set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
     set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
-
     let g:netrw_home = $XDG_DATA_HOME."/vim"
     call mkdir($XDG_DATA_HOME."/vim/spell", 'p')
 
@@ -561,6 +560,8 @@ endif
 set t_Co=256
 if exists('+termguicolors')
     set termguicolors
+else
+    set notermguicolors
 endif
 
 " Cursor