who knows lmao

4 files changed, 47 insertions, 47 deletions

diff --git a/x/.xinitrc b/x/.xinitrc
index dd30be4..8f20975 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,7 +1,7 @@
 #!/bin/sh
-# executed by startx
-# for use when dingo is DOCKED
-export DOCKED=true
+# executed by startx-not-docked
+# for use when dingo is NOT docked
+export DOCKED=false
 
 # load xinitrc.d stuff
 
@@ -40,21 +40,23 @@ fi
 # start notifications (dunst)
 /usr/bin/dunst &
 
-# open picom compositor
+# start picom compositor
 picom --config ~/.config/picom.conf & 
 
 #spotifyd &
 
-# set up monitors
-sh ~/.config/screenlayout.sh &
+# add network, battery, date and time to xsetroot
+slstatus &
 
-# set default audio device to be dock audio jack
-pulseaudio -k &
-pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo &
+# reset backlight
+light -S 30 &
 
-# add weather, date and time to xsetroot
-#sh ~/bin/xsetloop-docked.sh &
-slstatus &
+# set default audio device to be laptop speakers
+# pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink &
+# pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 &
+
+# set up wallpaper
+feh --bg-fill ~/git/wallpapers-exorcist/gruvbox/mountains-2.jpg
 
 # apply Xresources
 xrdb -merge ~/.Xresources
@@ -62,18 +64,17 @@ xrdb -merge ~/.Xresources
 # make cursor disappear after typing
 xbanish &
 
-# enable numlock
-numlockx &
+# turn tearfree on
+xrandr --output eDP --auto --set TearFree on --output HDMI-A-0 --set TearFree on &
+
+# run battery checker
+~/bin/battery &
 
 # start keepassxc for passwords
 keepassxc ~/.passwords/Passwords.kdbx &
 
-# set up wallpapers
-#wallpapers.sh &
-feh --bg-fill git/wallpapers-exorcist/gruvbox/mountains-2.jpg git/wallpapers-exorcist/gruvbox/mountains-2.jpg &
-
-# if unicomp keyboard detected, turn alt into super
-if $(lsusb | grep -qi "Unicomp"); then
+# if logitech keyboard detected, turn alt into super
+if $(lsusb | grep -qi "Logitech Mechanical Keyboard"); then
   xmodmap -e "remove mod1 = Alt_L"
   xmodmap -e "remove mod4 = Super_L"
   xmodmap -e "add mod1 = Super_L"
@@ -82,5 +83,5 @@ fi
 
 # start dwm
 redshift &
-xset r rate 300 50
-exec /home/bryson/bin/startdwm.sh
+xset r rate 300 80
+exec /home/bryson/bin/startdwm
diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-docked
index b102bb6..dd30be4 100644
--- a/x/.xinitrc-not-docked
+++ b/x/.xinitrc-docked
@@ -1,7 +1,7 @@
 #!/bin/sh
-# executed by startx-not-docked
-# for use when dingo is NOT docked
-export DOCKED=false
+# executed by startx
+# for use when dingo is DOCKED
+export DOCKED=true
 
 # load xinitrc.d stuff
 
@@ -40,23 +40,21 @@ fi
 # start notifications (dunst)
 /usr/bin/dunst &
 
-# start picom compositor
+# open picom compositor
 picom --config ~/.config/picom.conf & 
 
 #spotifyd &
 
-# add network, battery, date and time to xsetroot
-slstatus-not-docked &
+# set up monitors
+sh ~/.config/screenlayout.sh &
 
-# reset backlight
-light -S 50 &
+# set default audio device to be dock audio jack
+pulseaudio -k &
+pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo &
 
-# set default audio device to be laptop speakers
-pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink &
-pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 &
-
-# set up wallpaper
-feh --bg-fill ~/git/wallpapers-exorcist/gruvbox/mountains-2.jpg
+# add weather, date and time to xsetroot
+#sh ~/bin/xsetloop-docked.sh &
+slstatus &
 
 # apply Xresources
 xrdb -merge ~/.Xresources
@@ -64,17 +62,18 @@ xrdb -merge ~/.Xresources
 # make cursor disappear after typing
 xbanish &
 
-# turn tearfree on
-xrandr --output eDP --auto --set TearFree on --output HDMI-A-0 --set TearFree on &
-
-# run battery checker
-~/bin/battery.pl &
+# enable numlock
+numlockx &
 
 # start keepassxc for passwords
 keepassxc ~/.passwords/Passwords.kdbx &
 
-# if logitech keyboard detected, turn alt into super
-if $(lsusb | grep -qi "Logitech Mechanical Keyboard"); then
+# set up wallpapers
+#wallpapers.sh &
+feh --bg-fill git/wallpapers-exorcist/gruvbox/mountains-2.jpg git/wallpapers-exorcist/gruvbox/mountains-2.jpg &
+
+# if unicomp keyboard detected, turn alt into super
+if $(lsusb | grep -qi "Unicomp"); then
   xmodmap -e "remove mod1 = Alt_L"
   xmodmap -e "remove mod4 = Super_L"
   xmodmap -e "add mod1 = Super_L"
@@ -83,5 +82,5 @@ fi
 
 # start dwm
 redshift &
-xset r rate 300 80
+xset r rate 300 50
 exec /home/bryson/bin/startdwm.sh
diff --git a/x/battery.pl b/x/battery
index b98707a..10a3673 100755
--- a/x/battery.pl
+++ b/x/battery
@@ -22,13 +22,13 @@ while (1) {
       if (int($battery_level) <= int($CRITICAL_LEVEL)) {
         $CRITICAL = 'def';
         $sent = 'def';
-        system "notify-send -i \"battery-empty\" -t 0 -u critical \"BATTERY CRITICAL\" \"Battery level is ${battery_level}%\n\nCharge the system NOW.\""
+        system "notify-send -i \"battery-empty-symbolic\" -t 0 -u critical \"BATTERY CRITICAL\" \"Battery level is ${battery_level}%\n\nCharge the system NOW.\""
       }
     } if (!$LOW && !$sent) {
       if (int($battery_level) <= int($LOW_LEVEL)) {
         $LOW = 'def';
         $sent = 'def';
-        system "notify-send -i \"battery-caution\" -t 0 -u normal \"BATTERY LOW\" \"Battery level is ${battery_level}%\n\nCharge the system soon.\""
+        system "notify-send -i \"battery-caution-symbolic\" -t 0 -u normal \"BATTERY LOW\" \"Battery level is ${battery_level}%\n\nCharge the system soon.\""
       }
     } if (int($battery_level) <= int($DEAD_LEVEL)) {
         system "notify-send -t 0 -u critical \"SHUTTING DOWN\" \"Battery level is too low. The system will shutdown in 2 minutes to prevent corruption.\n\nCharge the system NOW to cancel the shutdown.\"";
@@ -40,7 +40,7 @@ while (1) {
       $CRITICAL = undef;
       $LOW = undef;
       system "doas shutdown -c";
-      system "notify-send -t 3000 -i \"battery-good-charging\" \"System is now charging\"";
+      system "notify-send -t 3000 -i \"battery-good-charging-symbolic\" \"System is now charging\"";
     }
   }
 
diff --git a/x/startdwm.sh b/x/startdwm
index 496d79b..496d79b 100755
--- a/x/startdwm.sh
+++ b/x/startdwm