From fa50b92a68b79f8a78f8c0054b9c8ad400522026 Mon Sep 17 00:00:00 2001
From: Daniel <89086143+BardofSprites@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:44:12 -0400
Subject: update bar, better click modules

---
 bin/.local/bin/scripts/status/battery.sh        |  1 +
 bin/.local/bin/scripts/status/volume-pulseaudio |  5 ++--
 bin/.local/bin/scripts/status/weather           |  2 +-
 dwm/Repositories/luke-dwmblocks/config.h        | 39 +++++--------------------
 4 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/bin/.local/bin/scripts/status/battery.sh b/bin/.local/bin/scripts/status/battery.sh
index e027c68..73f5c1a 100755
--- a/bin/.local/bin/scripts/status/battery.sh
+++ b/bin/.local/bin/scripts/status/battery.sh
@@ -4,6 +4,7 @@
 # to charge status (🔌 for plugged up, 🔋 for discharging on battery, etc.).
 
 case $BLOCK_BUTTON in
+    1) notify-send "🔋 $(acpi)" ;;
 	3) notify-send "🔋 Battery module" "🔋: discharging
 🛑: not charging
 ♻: stagnant charge
diff --git a/bin/.local/bin/scripts/status/volume-pulseaudio b/bin/.local/bin/scripts/status/volume-pulseaudio
index 4cb6b9d..5a005d8 100755
--- a/bin/.local/bin/scripts/status/volume-pulseaudio
+++ b/bin/.local/bin/scripts/status/volume-pulseaudio
@@ -18,8 +18,9 @@ AUDIO_DELTA=${AUDIO_DELTA:-5}
 DEFAULT_COLOR=${DEFAULT_COLOR:-"#000000"}
 MUTED_COLOR=${MUTED_COLOR:-"#a0a0a0"}
 
-LONG_FORMAT=${LONG_FORMAT:-'${SYMB} ${VOL}% [${INDEX}:${NAME}]'}
-SHORT_FORMAT=${SHORT_FORMAT:-'${SYMB} ${VOL}% [${INDEX}]'}
+# LONG_FORMAT=${LONG_FORMAT:-'${SYMB} ${VOL}% [${INDEX}:${NAME}]'}
+LONG_FORMAT=${LONG_FORMAT:-'${SYMB} ${VOL}%'}
+SHORT_FORMAT=${SHORT_FORMAT:-'${SYMB} ${VOL}%'}
 USE_ALSA_NAME=${USE_ALSA_NAME:-0}
 USE_DESCRIPTION=${USE_DESCRIPTION:-0}
 
diff --git a/bin/.local/bin/scripts/status/weather b/bin/.local/bin/scripts/status/weather
index ccf5847..3d31aa9 100755
--- a/bin/.local/bin/scripts/status/weather
+++ b/bin/.local/bin/scripts/status/weather
@@ -39,7 +39,7 @@ showweather() {
 }
 
 case $BLOCK_BUTTON in
-	1) setsid -f "$TERMINAL" -e less -Sfr "$weatherreport" ;;
+	1) setsid -f "$TERMINAL" -n "floatterm" -g "150x35" -e less -Sfr "$weatherreport" ;;
 	2) getforecast && showweather ;;
 	3) notify-send "🌈 Weather module" "\- Left click for full forecast.
 - Middle click to update forecast.
diff --git a/dwm/Repositories/luke-dwmblocks/config.h b/dwm/Repositories/luke-dwmblocks/config.h
index 2893f5d..c0736d9 100644
--- a/dwm/Repositories/luke-dwmblocks/config.h
+++ b/dwm/Repositories/luke-dwmblocks/config.h
@@ -1,40 +1,15 @@
 //Modify this file to change what commands output to your statusbar, and recompile using the make command.
 static const Block blocks[] = {
-	/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
-	/* {"⌨", "sb-kbselect", 0, 30}, */
-	/* {"", "cat /tmp/recordingicon 2>/dev/null",	0,	9}, */
-	/* {"",	"sb-tasks",	10,	26}, */
-	/* /\* {"",	"sb-music",	0,	11}, *\/ */
-	/* {"",	"sb-pacpackages",	0,	8}, */
-	/* {"",	"sb-news",		0,	6}, */
-	/* /\* {"",	"sb-price xmr-btc \"Monero to Bitcoin\" 🔒 25",	9000,	25}, *\/ */
-	/* {"",	"sb-price xmr Monero 🔒 24",			9000,	24}, */
-	/* {"",	"sb-price eth Ethereum 🍸 23",			9000,	23}, */
-	/* {"",	"sb-price btc Bitcoin 💰 21",			9000,	21}, */
-	/* {"",	"sb-torrent",	20,	7}, */
-	/* {"",	"sb-memory",	10,	14}, */
-	/* {"",	"sb-cpu",		10,	18}, */
-	/* {"",	"sb-moonphase",	18000,	17}, */
-	/* {"",	"sb-doppler",	0,	13}, */
-	/* {"",	"sb-forecast",	18000,	5}, */
-	/* {"",	"sb-mailbox",	180,	12}, */
-	/* {"",	"sb-nettraf",	1,	16}, */
-	/* {"",	"sb-volume",	0,	10}, */
-	/* {"",	"sb-battery",	5,	3}, */
-	/* {"",	"sb-clock",	60,	1}, */
-	/* {"",	"sb-internet",	5,	4}, */
-	/* /\* {"",	"sb-iplocate", 0,	27}, *\/ */
-	/* {"",	"sb-help-icon",	0,	15}, */
-    /* {"Mem: ", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",	30,		0}, */
-    {"", "~/.local/bin/scripts/status/memory	",				10,		0},
-    {"", "~/.local/bin/scripts/status/internet",				10,		1},
+    /*Icon*/	/*Command*/					/*Update Interval*/	/*Update Signal*/
+    {"", "~/.local/bin/scripts/status/memory",					10,		1},
+    {"", "~/.local/bin/scripts/status/internet",				10,		6},
     {"", "~/.local/bin/scripts/status/weather",				10,		2},
-    {"", "~/.local/bin/scripts/status/volume-pulseaudio",			10,		3},
-    {"🎵 ", "~/.local/bin/scripts/status/mediaplayer",			5,		10},
+    {"", "~/.local/bin/scripts/status/volume-pulseaudio",		1,			3},
+    {"🎵 ", "~/.local/bin/scripts/status/mediaplayer",		5,			10},
+    /* {"🔆: ", "~/.local/bin/scripts/status/brightness.sh",			0,		1}, */
+    {"", "~/.local/bin/scripts/status/battery.sh",				5,		7},
     {"", "date '+%Y-%m-%d (%A)'",						1,		4},
     {"", "date '+%R:%S'",							1,		5},
-    /* {"", "~/.local/bin/scripts/status/battery.sh",				5,		0}, */
-    /* {"🔆: ", "~/.local/bin/scripts/status/brightness.sh",			0,		0}, */
 
 };
 
-- 
cgit v1.2.3