From 009831503e9a6d730cf9b3a9955ab8949b18ada0 Mon Sep 17 00:00:00 2001
From: Liam Waldron <liamwaldron@everestlinux.org>
Date: Mon, 25 Nov 2024 16:16:17 -0500
Subject: [PATCH] 11/25

---
 config                     | 82 +++++++++++++++++++++++---------------
 scripts/check_security_key |  4 +-
 scripts/laptopmode         |  3 +-
 scripts/mediaplayer2       |  4 +-
 scripts/tabletmode         |  3 +-
 5 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/config b/config
index 5d982e5..7523ac8 100644
--- a/config
+++ b/config
@@ -13,10 +13,11 @@ separator_block_width=30
 
 [mediaplayer2]
 command=$SCRIPT_DIR/mediaplayer2
-label=[ ♪ ] 
-CONCISE=false
+label=[♪] 
+CONCISE=true
 interval=1
-color=#ECEFF4
+#color=#ECEFF4
+color=#ebdbb2
 
 #[mediaplayer]
 #command=$SCRIPT_DIR/mediaplayer
@@ -24,10 +25,11 @@ color=#ECEFF4
 #interval=1
 #color=#ebdbb2
 
-[check-security-key]
-command=$SCRIPT_DIR/check_security_key
-interval=1
-color=#ECEFF4
+#[check-security-key]
+#command=$SCRIPT_DIR/check_security_key
+#interval=1
+#color=#ECEFF4
+#color=#ebdbb2
 
 #[rofi-wttr]
 #command=$SCRIPT_DIR/rofi-wttr
@@ -52,14 +54,15 @@ color=#ECEFF4
 
 [volume]
 command=$SCRIPT_DIR/volume
-LABEL=[ 🕪 ] 
+LABEL=[🕪] 
 interval=once
 signal=10
 STEP=5%
 MIXER=pulse
 #SCONTROL=[determined automatically]
 NATURAL_MAPPING=0
-color=#ECEFF4
+#color=#ECEFF4
+color=#ebdbb2
 
 [dunst]
 command=$SCRIPT_DIR/dunst
@@ -72,46 +75,59 @@ align=center
 [disk]
 command=$SCRIPT_DIR/disk
 DIR=/
-LABEL=[ 🖴 ] 
+LABEL=[🖴] 
 interval=30
-color=#ECEFF4
+#color=#ECEFF4
+color=#ebdbb2
 
 [batterybar]
 command=$SCRIPT_DIR/batterybar
-label=[ 🗲 ] 
+label=[🗲] 
 interval=5
 markup=pango
 min_width=bat: ■■■■■
 # Discharging colors low to high
-C1=#BF616A
-C2=#BF616A
-C3=#D08770
-C4=#D08770
-C5=#EBCB8B
-C6=#EBCB8B
-C7=#A3BE8C
-C8=#A3BE8C
-CHARGING_COLOR=#88C0D0
-FULL_COLOR=#ECEFF4
-AC_COLOR=#88C0D0
-color=#ECEFF4
+C1=#cc241d
+C2=#cc241d
+C3=#d79921
+C4=#d79921
+C5=#98971a
+C6=#98971a
+C7=#458588
+C8=#458588
+CHARGING_COLOR=#b16286
+FULL_COLOR=#ebdbb2
+AC_COLOR=#b16286
+#color=#ECEFF4
+color=#ebdbb2
 
 [time]
-label=[ 🕰 ] 
+label=[🕰] 
 command=date '+%m/%d/%Y %H:%M'
 interval=15
-color=#ECEFF4
+#color=#ECEFF4
+color=#ebdbb2
 
-#[laptop_mode]
-#full_text= ↺ Laptop Mode 
-#command=$SCRIPT_DIR/laptopmode
+[laptop_mode]
+full_text= ↺ 🖥 
+command=$SCRIPT_DIR/laptopmode
+color=#ebdbb2
+
+[tablet_mode]
+full_text= ↺ 🖵 
+command=$SCRIPT_DIR/tabletmode
+color=#ebdbb2
+
+#[run]
+#full_text= >_ 
+#command=rofi -show drun
 #background=#458588
 #color=#282828
 
-#[tablet_mode]
-#full_text= ↺ Tablet Mode 
-#command=$SCRIPT_DIR/tabletmode
-#background=#98971a
+#[kill]
+#full_text= X 
+#command=i3-msg kill > /dev/null
+#background=#cc241d
 #color=#282828
 
 #[shutdown_menu]
diff --git a/scripts/check_security_key b/scripts/check_security_key
index 4e3671c..b4fe9ae 100755
--- a/scripts/check_security_key
+++ b/scripts/check_security_key
@@ -6,7 +6,7 @@ msg_disconnected="𐄂 Security key not connected\n"
 lsusb | grep Lexar > /dev/null
 
 if [ "$?" == 0 ]; then
-	printf "[ ✓ ] Security key connected.\n"
+	printf "[ ✓ ] Unlocked.\n"
 else
-	printf "[ 𐄂 ] Security key disconnected.\n"
+	printf "[ 𐄂 ] Locked.\n"
 fi
diff --git a/scripts/laptopmode b/scripts/laptopmode
index 2fde7d2..6523e89 100755
--- a/scripts/laptopmode
+++ b/scripts/laptopmode
@@ -2,4 +2,5 @@
 
 xinput enable 12
 xinput reattach 13 3
-TABLET_MODE_ENABLED=1
+dunstify "Laptop Mode" "Laptop mode is now enabled"
+export TABLET_MODE_ENABLED="Laptop Mode"
diff --git a/scripts/mediaplayer2 b/scripts/mediaplayer2
index 13d1187..9639241 100755
--- a/scripts/mediaplayer2
+++ b/scripts/mediaplayer2
@@ -11,9 +11,9 @@ playerctl metadata title > /dev/null
 if [ "$?" != 0 ]; then
 	printf "No players found"
 elif [ ${CONCISE} == "false" ]; then
-	printf "%.${MAXCHAR}s\n" "${TRACK} - by ${ARTIST} - on ${ALBUM}"
+	printf "%.${MAXCHAR}s\n" "${TRACK} - by ${ARTIST} - from ${ALBUM}"
 elif [ ${CONCISE} == "true" ]; then
-	printf "%.${MAXCHAR}s\n" "${ARTIST} - ${TRACK}"
+	printf "%.${MAXCHAR}s\n" "${TRACK} - ${ARTIST}"
 else
 	printf "error: 'CONCISE' must be defined in i3blocks config\n"
 fi
diff --git a/scripts/tabletmode b/scripts/tabletmode
index a76944e..9e4a2d6 100755
--- a/scripts/tabletmode
+++ b/scripts/tabletmode
@@ -2,4 +2,5 @@
 
 xinput disable 12
 xinput float 13
-TABLET_MODE_ENABLED=0
+dunstify "Tablet Mode" "Tablet mode is now enabled"
+export TABLET_MODE_ENABLED="Tablet Mode"