terrible commit message incoming: many changes

13 files changed, 49 insertions, 37 deletions

diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 250dc1d..0234073 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -3,18 +3,18 @@
 sxhkd &
 sh ~/.fehbg &
 xfce4-panel -d &
-pnmixer &
 compton &
-nm-applet &
+sleep 0.5 && pasystray --notify=all &
 
 bspc monitor -d I II III IV V VI VII VIII IX X
 #bspc monitor eDP-1 -d I II III IV V
 #bspc monitor HDMI-1 -d VI VII VIII IX X
 
-bspc config border_width         2
-bspc config window_gap           8
+#bspc config border_width         2
+#bspc config window_gap           8
+bspc config window_gap           0
 
-#bspc config top_padding 20
+bspc config bottom_padding 26
 
 bspc config split_ratio          0.52
 bspc config borderless_monocle   true
@@ -54,3 +54,5 @@ bspc rule -a discord state=floating
 bspc rule -a X2goclient state=floating
 bspc rule -a SimpleScreenRecorder state=floating
 bspc rule -a Gimp state=floating
+bspc rule -a Wrapper-2.0 state=floating
+bspc rule -a Zathura state=tiled
diff --git a/compton/.config/compton.conf b/compton/.config/compton.conf
index 6f1fb25..9c2e2b7 100644
--- a/compton/.config/compton.conf
+++ b/compton/.config/compton.conf
@@ -79,6 +79,8 @@ glx-no-stencil = true;		# Recommended.
 glx-copy-from-front = false;	# Useful with --glx-swap-method,
 # glx-use-copysubbuffermesa = true; # Recommended if it works. Breaks VSync.
 # glx-no-rebind-pixmap = true;	# Recommended if it works.	
+glx-no-rebind-pixmap = true;	# Recommended if it works.	
+#glx-swap-method = "4";	# See man page.
 glx-swap-method = "4";	# See man page.
 
 # Window type settings
diff --git a/git/.gitconfig b/git/.gitconfig
index aed8242..158c670 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,3 +11,5 @@
 	git = !exec git
 [core]
 	autocrlf = input
+[color]
+	ui = auto
diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
index d54305a..c456de2 100644
--- a/gnupg/.gnupg/gpg-agent.conf
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -3,3 +3,5 @@ max-cache-ttl 43200
 
 default-cache-ttl-ssh 10800
 max-cache-ttl-ssh 10800
+
+#pinentry-program /usr/bin/pinentry-qt
diff --git a/redshift/.config/redshift.conf b/redshift/.config/redshift.conf
index ced1805..d574809 100644
--- a/redshift/.config/redshift.conf
+++ b/redshift/.config/redshift.conf
@@ -7,7 +7,9 @@
 ;temp-day=6500
 temp-day=6200
 ;temp-night=4800
-temp-night=5500
+;temp-night=5000
+;temp-night=4500
+temp-night=4000
 
 ; Enable/Disable a smooth transition between day and night
 ; 0 will cause a direct change from day to night screen temperature.
@@ -22,7 +24,7 @@ transition=1
 ;brightness-night=0.4
 ; Set the screen gamma (for all colors, or each color channel
 ; individually)
-gamma=0.8
+;gamma=0.8
 ;gamma=1.0
 ;gamma=0.8:0.7:0.8
 ; This can also be set individually for day and night since
diff --git a/rofi/.config/rofi/config b/rofi/.config/rofi/config
index e9947be..6b5a1ac 100644
--- a/rofi/.config/rofi/config
+++ b/rofi/.config/rofi/config
@@ -14,4 +14,4 @@ rofi.monitor: -1
 !rofi.theme: /usr/share/rofi/themes//Paper.rasi
 !rofi.theme: /usr/share/rofi/themes//sidebar.rasi
 
-rofi.theme: .nix-profile/share/rofi/themes//gruvbox-light.rasi
+rofi.theme: /usr/share/rofi/themes//gruvbox-light.rasi
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 8134bac..5329d62 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -21,7 +21,7 @@ super + backslash
 	rofi -show window  -display-run '> ' -display-window ' 🗔 '
 
 # password manager
-super + shift + space
+alt + space
 	rofi-pass
 
 # firefox
@@ -65,8 +65,8 @@ XF86LaunchB
 	toggle-presentation-mode
 
 # monitor brightness
-#XF86MonBrightness{Up,Down}
-#	light -{A,U} 5
+XF86MonBrightness{Up,Down}
+	light -{A,U} 5
 
 super + apostrophe
 	rofi-light
@@ -91,9 +91,9 @@ super + {w,q}
 super + m
 	bspc desktop -l next
 
-# if the current node is automatic, send it to the last manual, otherwise pull the last leaf
+# send the newest marked node to the newest preselected node
 super + y
-	bspc query -N -n focused.automatic && bspc node -n last.!automatic || bspc node last.leaf -n focused
+	bspc node newest.marked.local -n newest.!automatic.local
 
 # swap the current node and the biggest node
 super + g
@@ -108,8 +108,8 @@ super + {t,shift + t,s,f}
 	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
 
 # set the node flags
-super + ctrl + {x,y,z}
-	bspc node -g {locked,sticky,private}
+super + ctrl + {m,x,y,z}
+	bspc node -g {marked,locked,sticky,private}
 
 #
 # focus/swap
@@ -133,7 +133,7 @@ super + bracket{left,right}
 
 # send to next/prev desktop
 super + shift + bracket{left,right}
-	bspc node -d {prev,next}
+	bspc node -d {prev,next} --follow
 
 # focus the last node/desktop
 super + {grave,Tab}
diff --git a/x/.Xresources.d/rxvt-unicode b/x/.Xresources.d/rxvt-unicode
index a276d3a..56df5fc 100644
--- a/x/.Xresources.d/rxvt-unicode
+++ b/x/.Xresources.d/rxvt-unicode
@@ -23,7 +23,7 @@ URxvt.keysym.Shift-Down:    command:\033]721;1\007
 URxvt.perl-ext-common:      default,clipboard,url-select,keyboard-select
 URxvt.perl-ext:             bidi
 URxvt.bidi.enabled:         1
-URxvt.url-select.launcher:  firefox-nightly
+URxvt.url-select.launcher:  firefox
 URxvt.url-select.underline: true
 URxvt.keysym.M-u:           perl:url-select:select_next
 URxvt.keysym.M-Escape:      perl:keyboard-select:activate
diff --git a/x/.xprofile b/x/.xprofile
index fe9c5cb..bfe65ea 100644
--- a/x/.xprofile
+++ b/x/.xprofile
@@ -5,7 +5,6 @@ setxkbmap -option ctrl:rctrl_ralt
 setxkbmap -option altwin:swap_alt_win
 #xmodmap .Xmodmap
 
-#light -Scrs "intel_backlight" 75
 light -Scrs "intel_backlight" 2
 
 source $HOME/.zprofile
diff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
index 8e04570..74d70b5 100644
--- a/zathura/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
@@ -1,3 +1,6 @@
 set smooth-scroll true
 set selection-clipboard clipboard
 set zoom-step 05
+set default-bg "#272727"
+set statusbar-bg "#272727"
+set inputbar-bg "#373737"
diff --git a/zsh/.zimrc b/zsh/.zimrc
index 1ef71b2..4c056aa 100644
--- a/zsh/.zimrc
+++ b/zsh/.zimrc
@@ -25,8 +25,9 @@ zmodules=(directory environment git git-info history input ssh utility custom \
 
 # Set your desired prompt here
 zprompt_theme='pure'
-PURE_PROMPT_SYMBOL=λ
-#PURE_PROMPT_SYMBOL=➜
+#PURE_PROMPT_SYMBOL=λ
+#PURE_PROMPT_SYMBOL=δ
+PURE_PROMPT_SYMBOL=➜
 
 #
 # Completion
@@ -89,7 +90,7 @@ zssh_ids=(id_rsa plasma_id_rsa id_ed25519 id_rsa_aur)
 #
 
 # Set (optional) pacman front-end.
-zpacman_frontend='pacaur'
+zpacman_frontend='yay'
 
 # Load any helper scripts as defined here
 #zpacman_helper=(aur)
diff --git a/zsh/.zprofile b/zsh/.zprofile
index e1a2700..35dbce9 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -6,20 +6,23 @@ export XDG_DATA_HOME=$HOME/.local/share
 export XDG_DATA_DIRS=/usr/local/share:/usr/share
 export MAILDIR="$HOME/mail"
 export CVS_RSH=ssh
-export MATHMODELS=$HOME/src/eiffel/mathmodels
-export RUST_SRC_PATH=~/.multirust/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src
+#export MATHMODELS=$HOME/src/eiffel/mathmodels
+#export RUST_SRC_PATH=~/.multirust/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src
+#export PATH=$PATH:$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/
 
 # Eiffel2Java stuff
-export JAVA_HOME=/usr/lib/jvm/default
-export CPATH=$CPATH:"$JAVA_HOME/include:$JAVA_HOME/include/linux"
-export LIBRARY_PATH=$LIBRARY_PATH:"$JAVA_HOME/jre/lib/amd64/server"
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$JAVA_HOME/jre/lib/amd64/server"
+#export JAVA_HOME=/usr/lib/jvm/default
+#export CPATH=$CPATH:"$JAVA_HOME/include:$JAVA_HOME/include/linux"
+#export LIBRARY_PATH=$LIBRARY_PATH:"$JAVA_HOME/jre/lib/amd64/server"
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$JAVA_HOME/jre/lib/amd64/server"
 
-export PATH="$HOME/usr/build/pvs:$PATH"
-export SBCLISP_HOME=/usr/share/sbcl-source
-export PVS_LIBRARY_PATH="$HOME/usr/build/pvs/nasalib"
+#export PATH="$HOME/usr/build/pvs:$PATH"
+#export SBCLISP_HOME=/usr/share/sbcl-source
+#export PVS_LIBRARY_PATH="$HOME/usr/build/pvs/nasalib"
 
 export MOZ_USE_XINPUT2=1
 
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+export ANDROID_JACK_VM_ARGS="-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4G"
 
-if [ -e /home/amin/.nix-profile/etc/profile.d/nix.sh ]; then . /home/amin/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
+#if [ -e /home/amin/.nix-profile/etc/profile.d/nix.sh ]; then . /home/amin/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
diff --git a/zsh/.zshrc b/zsh/.zshrc
index e26b165..5d00ab0 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -2,6 +2,7 @@
 #export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
 #export WORDCHARS='*?-[]~=&;!#$%^(){}<>'
 export WORDCHARS='*?[]~=&;!#$%^(){}<>'
+#ZLE_SPACE_SUFFIX_CHARS=$'|&'
 
 #disable -r time       # disable shell reserved word
 #alias time='time -p'  # -p for POSIX output
@@ -57,14 +58,9 @@ alias scl=systemctl
 alias jcl=journalctl
 alias m="mbsync -Va; getmail; notmuch new"
 alias best="youtube-dl -f best"
-alias ace="ssh amin@ace.aminb.org"
+alias ace="mosh amin@ace.aminb.org"
 alias nix="ssh amin@aminb.org"
-alias mutt=neomutt
 
-alias p=pacaur
-alias psyu="pacaur -Syu"
-alias pS="pacaur -S"
-alias t=trizen
 aur() {
    cd ~/usr/build
    git clone https://aur.archlinux.org/${1}.git