modified vim/init.vim, modified bin/displayselect

2 files changed, 15 insertions, 6 deletions

diff --git a/ar/.config/vim/init.vim b/ar/.config/vim/init.vim
index c39c130..c8bcf81 100644
--- a/ar/.config/vim/init.vim
+++ b/ar/.config/vim/init.vim
@@ -41,7 +41,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')
@@ -53,7 +53,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
@@ -248,7 +248,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 +436,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/ar/.local/bin/displayselect b/ar/.local/bin/displayselect
index e8e9dbf..87c8bd6 100755
--- a/ar/.local/bin/displayselect
+++ b/ar/.local/bin/displayselect
@@ -34,7 +34,7 @@ twoscreen() { # If multi-monitor is selected and there are two screens.
     [ -z "$primary" ] && exit
     secondary=$(echo "$screens" | grep -v ^"$primary"$)
     direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
-    xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0
+    xrandr --output "$primary" --primary --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0
   fi
 }
 
@@ -44,7 +44,7 @@ morescreen() { # If multi-monitor is selected and there are more than two screen
   secondary=$(echo "$screens" | grep -v ^"$primary"$ | dmenu -i -p "Select secondary display:")
   direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
   tertiary=$(echo "$screens" | grep -v ^"$primary"$ | grep -v ^"$secondary"$ | dmenu -i -p "Select third display:")
-  xrandr --output "$primary" --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto
+  xrandr --output "$primary" --primary --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto
 }
 
 multimon() { # Multi-monitor handler.
@@ -55,7 +55,7 @@ multimon() { # Multi-monitor handler.
 }
 
 onescreen() { # If only one output available or chosen.
-  xrandr --output "$1" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -)
+  xrandr --output "$1" --primary --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -)
 }
 
 postrun() { # Stuff to run to clean up.