Add env for monitors, sxhkd-vim

.bashrc

@@ -86,5 +86,5 @@ shopt -s checkwinsize
 
 
 source "$HOME/.config/environment"
-[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
+[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc"
 [ -x "$(command -v thefuck)" ] && eval $(thefuck --alias)

.config/aliasrc

@@ -49,6 +49,7 @@ alias rm='rm -I --one-file-system -v'
 
 alias sudo='sudo '
 
+alias watch='watch -c'
 alias wget='wget -c'
 
 ### conditionals

.config/bspwm/bspwmrc

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. "$HOME/.config/environment"
+
 bspc config normal_border_color "#44475a"
 bspc config active_border_color "#bd93f9"
 bspc config focused_border_color "#ff79c6"
@@ -7,24 +9,24 @@ bspc config presel_feedback_color "#6272a4"
 
 host_name=$(cat /proc/sys/kernel/hostname)
 if [[ $host_name == "portalo" ]]; then
-    primary="HDMI-A-0"
+    #primary="HDMI-A-0"
-    secondary="DVI-D-0"
+    #secondary="DVI-D-0"
 
-    bspc monitor $primary -d web terminal 3 4 5 6 game
+    bspc monitor $MONITOR_PRIMARY -d web terminal 3 4 5 6 game
-    bspc monitor $secondary -d side-view voip messenger
+    bspc monitor $MONITOR_SECONDARY -d side-view voip messenger
 
     sleep 0.1
-    bspc wm -O $primary $secondary
+    bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY
 
 elif [[ $host_name == *"laptop"* ]]; then
-    primary="eDP-1"
+    #primary="eDP-1"
-    secondary="HDMI-2"
+    #secondary="HDMI-2"
 
-    bspc monitor $primary -d web terminal 3 4 5 6 messenger
+    bspc monitor $MONITOR_PRIMARY -d web terminal 3 4 5 6 messenger
-    bspc monitor $secondary -d side-view 9 10
+    bspc monitor $MONITOR_SECONDARY -d side-view 9 10
 
     sleep 0.1
-    bspc wm -O $primary $secondary
+    bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY
 else
     bspc monitor primary -d web terminal 3 4 5 6 7 8 9 10
 fi
@@ -73,4 +75,5 @@ bspc rule -a 'Xarchiver' state='floating'
 bspc rule -a 'Signal' desktop='messenger'
 bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
 
+$HOME/.config/polybar/focus-voip.py &
 $HOME/.config/polybar/launch.sh &

.config/environment

@@ -27,7 +27,7 @@ export PATH=$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$GOPAT
 
 export QT_QPA_PLATFORMTHEME="qt5ct"
 
-export TERMINAL="qterminal"
+export TERMINAL="alacritty"
 
 export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
 
@@ -37,3 +37,5 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
 ### conditionals
 
 [ -x "$(command -v bat)" ] && export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+
+[ -f "$HOME/.config/environment.local" ] && . "$HOME/.config/environment.local"

.config/git/ignore

@@ -13,3 +13,7 @@ venv/
 latexmk_output/
 
 node_modules/
+
+# Jupyter Notebooks
+.ipynb_checkpoints
+*/.ipynb_checkpoints/*

.config/polybar/bars.ini

@@ -50,7 +50,7 @@
 [bar/portalo-base]
     inherit = bar/base
 
-    modules-left = bspwm bsp-layout
+    modules-left = bspwm
     modules-center = mpd
     modules-right = memory cpu temperature eth check-arch-updates date
 
@@ -59,11 +59,15 @@
 [bar/portalo-primary]
     inherit = bar/portalo-base
 
+    modules-left = bspwm bsp-layout-primary
+
     monitor = HDMI-A-0
 
 [bar/portalo-secondary]
     inherit = bar/portalo-base
 
+    modules-left = bspwm bsp-layout-secondary
+
     monitor = DVI-D-0
     tray-position = none
 

.config/polybar/custom.ini

@@ -37,3 +37,11 @@
     click-left = bsp-layout cycle --layouts tall,wide,grid,rgrid,monocle
 
     label = %output%
+
+[module/bsp-layout-primary]
+    inherit = module/bsp-layout
+    exec = bsp-layout get $(bspc query -D --names -d ${MONITOR_PRIMARY}:focused)
+
+[module/bsp-layout-secondary]
+    inherit = module/bsp-layout
+    exec = bsp-layout get $(bspc query -D --names -d ${MONITOR_SECONDARY}:focused)

.config/qutebrowser/config.py

@@ -10,7 +10,7 @@ c.auto_save.session = True
 c.colors.webpage.preferred_color_scheme = 'dark'
 
 #c.content.proxy = "socks://localhost:9050/"
-c.content.headers.accept_language = "en-IE,en;q=0.9"
+#c.content.headers.accept_language = "en-IE,en;q=0.9"
 
 c.downloads.position = 'bottom'
 

.config/sxhkd/sxhkdrc

@@ -39,9 +39,11 @@ XF86AudioNext
 XF86AudioPrev
     playerctl prev
 XF86AudioRaiseVolume
-    mpc volume +1
+    playerctl volume 0.1+
+    #mpc volume +1
 XF86AudioLowerVolume
-    mpc volume -1
+    playerctl volume 0.1-
+    #mpc volume -1
 #XF86AudioMute
 #   mpc toggleoutput
 
@@ -70,6 +72,9 @@ super + m
     bsp-layout cycle --layouts tall,wide,grid,rgrid,monocle
     #bspc desktop -l next
 
+super + shift + m
+    bsp-layout set tiled
+
 # send the newest marked node to the newest preselected node
 super + y
     bspc node newest.marked.local -n newest.!automatic.local

.config/vim/vimrc

@@ -25,6 +25,7 @@ call plug#begin('~/.config/vim/plugged')
     Plug 'matze/vim-move'
 
     " Syntax highlighting
+    Plug 'baskerville/vim-sxhkdrc'
     Plug 'sirtaj/vim-openscad'
     Plug 'lervag/vimtex'
     Plug 'sheerun/vim-polyglot'