update herbstluftwm to use alacritty, and fix all the scratchpads

9 files changed, 20 insertions, 20 deletions

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 3f53457..372dbaf 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -29,7 +29,7 @@ hc detect_monitors
 # if you have a super key you will be much happier with Mod set to Mod4
 Mod=Mod1    # Use alt as the main modifier
 #Mod=Mod4   # Use the super key as the main modifier
-TERMINAL=st
+TERMINAL=alacritty
 
 hc keybind $Mod-Shift-e quit
 hc keybind $Mod-Shift-r reload
@@ -180,8 +180,8 @@ hc rule instance=sppmxr floatplacement=center floating=true floating_geometry=90
 hc rule instance=spblue floatplacement=center floating=true floating_geometry=900x600
 hc rule instance=spncmp floatplacement=center floating=true floating_geometry=900x600
 hc rule instance=spmutt floatplacement=center floating=true floating_geometry=900x600
-hc rule class=spprof floatplacement=center floating=true floating_geometry=900x600
-hc rule class=spirss floatplacement=center floating=true floating_geometry=900x600
+hc rule instance=spprof floatplacement=center floating=true floating_geometry=900x600
+hc rule instance=spirss floatplacement=center floating=true floating_geometry=900x600
 #hc rule class=mpv floatplacement=center floating=true floating_geometry=900x600
 
 hc set tree_style '╾│ ├└╼─┐'
diff --git a/herbstluftwm/spblue b/herbstluftwm/spblue
index 1f0c395..4c41a61 100755
--- a/herbstluftwm/spblue
+++ b/herbstluftwm/spblue
@@ -11,7 +11,7 @@ if [ -f $scratchpad ]; then
   fi
 fi
 if ! xdotool search --classname 'spblue' windowmap; then
-  setsid -f st -t 'spblue' -n 'spblue' -- zsh -c bluetoothctl
+  . ~/.profile && alacritty --title 'spblue' --class 'spblue' -e zsh -c bluetoothctl &
   xdotool search -sync -onlyvisible -classname 'spblue'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/sphtop b/herbstluftwm/sphtop
index 2d55a9f..c845068 100755
--- a/herbstluftwm/sphtop
+++ b/herbstluftwm/sphtop
@@ -12,7 +12,7 @@ if [ -f $scratchpad ]; then
   fi
 fi
 if ! xdotool search --classname 'sphtop' windowmap; then
-  setsid -f st -t 'sphtop' -n 'sphtop' -- zsh -c htop
+  . ~/.profile && alacritty --title 'sphtop' --class 'sphtop' -e zsh -c htop &
   xdotool search -sync -onlyvisible -classname 'sphtop'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/spirss b/herbstluftwm/spirss
index eb67989..c37c2b6 100755
--- a/herbstluftwm/spirss
+++ b/herbstluftwm/spirss
@@ -1,18 +1,18 @@
 #!/bin/sh
 scratchpad=/tmp/herbstluftwm:spirss
-if xdotool search --class 'spirss'; then 
+if xdotool search --onlyvisible --classname 'spirss'; then 
   if [ "$(herbstclient list_monitors | grep '[FOCUS]' | cut -d\" -f2)" = "$(herbstclient attr clients.$(cat $scratchpad) | grep 's - - tag' | awk '{ print $6 }' | sed 's/\"//g')" ]; then 
-    xdotool search -class 'spirss' windowunmap 
+    xdotool search -onlyvisible -classname 'spirss' windowunmap 
     exit 
   fi 
 fi 
 if [ -f $scratchpad ]; then
   if ! herbstclient bring $(cat $scratchpad); then
-    xdotool search -class 'spirss' windowmap && exit
+    xdotool search -classname 'spirss' windowmap && exit
   fi
 fi
-if ! xdotool search -class 'spirss' windowmap; then
-  . ~/.profile && st -t 'spirss' -c 'spirss' -e irssi &
-  xdotool search -sync -onlyvisible -class 'spirss'
+if ! xdotool search -classname 'spirss' windowmap; then
+  . ~/.profile && alacritty --title 'spirss' --class 'spirss' -e irssi &
+  xdotool search -sync -onlyvisible -classname 'spirss'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/spmutt b/herbstluftwm/spmutt
index 510764e..5c9c29b 100755
--- a/herbstluftwm/spmutt
+++ b/herbstluftwm/spmutt
@@ -12,7 +12,7 @@ if [ -f $scratchpad ]; then
   fi
 fi
 if ! xdotool search --classname 'spmutt' windowmap; then
-  setsid -f st -t 'spmutt' -n 'spmutt' -- zsh -c neomutt
+  . ~/.profile && alacritty --title 'spmutt' --class 'spmutt' -e zsh -c neomutt &
   xdotool search -sync -onlyvisible -classname 'spmutt'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/spncmp b/herbstluftwm/spncmp
index 0ad5bec..88522fc 100755
--- a/herbstluftwm/spncmp
+++ b/herbstluftwm/spncmp
@@ -12,7 +12,7 @@ if [ -f $scratchpad ]; then
   fi
 fi
 if ! xdotool search --classname 'spncmp' windowmap; then
-  setsid -f st -t 'spncmp' -n 'spncmp' -- zsh -c ncmpcpp
+  . ~/.profile && alacritty --title 'spncmp' --class 'spncmp' -e zsh -c ncmpcpp &
   xdotool search -sync -onlyvisible -classname 'spncmp'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/sppmxr b/herbstluftwm/sppmxr
index 7499312..402d6ea 100755
--- a/herbstluftwm/sppmxr
+++ b/herbstluftwm/sppmxr
@@ -12,7 +12,7 @@ if [ -f $scratchpad ]; then
   fi
 fi
 if ! xdotool search --classname 'sppmxr' windowmap; then
-  setsid -f st -t 'sppmxr' -n 'sppmxr' -- zsh -c pulsemixer
+  . ~/.profile && alacritty --title 'sppmxr' --class 'sppmxr' -e zsh -c pulsemixer &
   xdotool search -sync -onlyvisible -classname 'sppmxr'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/spprof b/herbstluftwm/spprof
index 1a4dc40..9d96bc6 100755
--- a/herbstluftwm/spprof
+++ b/herbstluftwm/spprof
@@ -1,18 +1,18 @@
 #!/bin/sh
 scratchpad=/tmp/herbstluftwm:spprof
-if xdotool search --onlyvisible --class 'spprof'; then 
+if xdotool search --onlyvisible --classname 'spprof'; then 
   if [ $(herbstclient list_monitors | grep '[FOCUS]' | cut -d\" -f2) = $(herbstclient attr clients.$(cat $scratchpad) | grep 's - - tag' | awk '{ print $6 }' | sed 's/"//g') ]; then 
-    xdotool search -onlyvisible -class 'spprof' windowunmap 
+    xdotool search -onlyvisible -classname 'spprof' windowunmap 
     exit 
   fi 
 fi 
 if [ -f $scratchpad ]; then
   if ! herbstclient bring $(cat $scratchpad); then
-    xdotool search -class 'spprof' windowmap && exit
+    xdotool search -classname 'spprof' windowmap && exit
   fi
 fi
 if ! xdotool search --class 'spprof' windowmap; then
-  . ~/.profile && st -t 'spprof' -c 'spprof' -e profanity &
-  xdotool search -sync -onlyvisible -class 'spprof'
+  . ~/.profile && alacritty --title 'spprof' --class 'spprof' -e profanity &
+  xdotool search -sync -onlyvisible -classname 'spprof'
   herbstclient attr clients.focus.winid > $scratchpad
 fi
diff --git a/herbstluftwm/spterm b/herbstluftwm/spterm
index 67f4f60..4f65af5 100755
--- a/herbstluftwm/spterm
+++ b/herbstluftwm/spterm
@@ -12,7 +12,7 @@ if [ -f $scratchpad ]; then
   fi
 fi
 if ! xdotool search --classname 'spterm' windowmap; then
-  st -t ‘spterm’ -n 'spterm' &
+  setsid -f alacritty --title 'spterm' --class 'spterm' &
   xdotool search -sync -onlyvisible -classname 'spterm'
   herbstclient attr clients.focus.winid > $scratchpad
 fi