From ee352e389ebcc70c6953923f3953331dfc7f6519 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 18 Oct 2022 22:35:05 +0200
Subject: [PATCH] Revert: I've found a way to keep dunst and notify about
 yubikey in the statusbar.

---
 _desktop/_scripts/dmenu-audio   |  4 ++--
 _desktop/_scripts/dmenu-display |  3 ++-
 _desktop/_scripts/sb-volume     |  3 +--
 _desktop/dunst/dunstrc          | 16 ++++++++--------
 _desktop/qtile/config.py        | 11 +++--------
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/_desktop/_scripts/dmenu-audio b/_desktop/_scripts/dmenu-audio
index fcb6f73..ebcd860 100755
--- a/_desktop/_scripts/dmenu-audio
+++ b/_desktop/_scripts/dmenu-audio
@@ -28,7 +28,7 @@ set_input() {
 set_bt_profile() {
   bt_sink=$(pactl list cards | awk -F'"' '/device.name.*bluez/ {print $2}')
   [ -z "${bt_sink}" ] &&
-    { notify-send -t 1000 "ﳌ no headphones connected"; exit; }
+    { dunstify -u critical "ﳌ no headphones connected"; exit; }
   profile_chosen=$(printf "profile mSBC\\nprofile LDAC\\n$div\\nback\\nexit" | dmenu -c -l 5 -i)
   case "$profile_chosen" in
     back) show_current ;;
@@ -47,7 +47,7 @@ show_current() {
   chosen=$(printf "Output: $def_snk\\nInput:  $def_src" | dmenu -c -l 2)
   if [ "$1" = "no_switch" ]; then
     case "$chosen" in
-      *) notify-send -t 1000 -t 1000 "婢 no device to switch" ;;
+      *) dunstify -u critical "婢 no device to switch" ;;
     esac
   else
     case "$chosen" in
diff --git a/_desktop/_scripts/dmenu-display b/_desktop/_scripts/dmenu-display
index e67c970..6b04d8c 100755
--- a/_desktop/_scripts/dmenu-display
+++ b/_desktop/_scripts/dmenu-display
@@ -40,6 +40,7 @@ onescreen() {
 
 postrun() {
   feh --no-fehbg --bg-scale ~/.local/share/wallpaper.jpg
+  { killall dunst ; setsid -f dunst ;} >/dev/null 2>&1 # Restart dunst to ensure proper location on screen
 }
 
 # Get all possible displays
@@ -50,7 +51,7 @@ screens=$(echo "$allposs" | awk '/ connected/ {print $1}')
 
 # If there's only one screen
 [ "$(echo "$screens" | wc -l)" -lt 2 ] &&
-  { onescreen "$screens" "native"; postrun; notify-send -t 1000 '  no device to switch';  exit ;}
+  { onescreen "$screens" "native"; postrun; dunstify -u critical '   no device to switch';  exit ;}
 
 # Get user choice including both and manual selection:
 chosen=$(printf -- "%s\\nmulti" "$screens" | dmenu -c -l 5 -i -p "select output") &&
diff --git a/_desktop/_scripts/sb-volume b/_desktop/_scripts/sb-volume
index 6d7e5be..ada236d 100755
--- a/_desktop/_scripts/sb-volume
+++ b/_desktop/_scripts/sb-volume
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-icon='\uf028'
 if [ $1 ]; then
   case $1 in
     inc) pactl set-sink-volume @DEFAULT_SINK@ +5%;;
     dec) pactl set-sink-volume @DEFAULT_SINK@ -5%;;
   esac
   volume=$(pactl get-sink-volume @DEFAULT_SINK@ | head -n 1 | awk -F' / *' '{print $2}')
-  notify-send -t 1000 "  volume: $volume"
+  dunstify -u low -h int:value:$volume -r 20 -t 800 "volume: $volume"
 else
   mic=$(pactl get-source-volume @DEFAULT_SOURCE@ | awk -F' / ' '{print $2}' | tr -d '%')
   [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && micmute="<span foreground='#ffffff' background='#770000'>  \uf131  </span> " || micmute=""
diff --git a/_desktop/dunst/dunstrc b/_desktop/dunst/dunstrc
index 90ade5f..5cf80ca 100644
--- a/_desktop/dunst/dunstrc
+++ b/_desktop/dunst/dunstrc
@@ -328,26 +328,26 @@
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
     background = "#272822"
-    foreground = "#feffff"
-    highlight = "#feffff"
-    frame_color = "#272822"
+    foreground = "#c7c7c7"
+    highlight = "#c7c7c7"
+    frame_color = "#c7c7c7"
     timeout = 1
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_normal]
-    background = "#e8b923"
-    foreground = "#272822"
+    background = "#272822"
+    foreground = "#feffff"
     highlight = "#feffff"
-    frame_color = "#272822"
+    frame_color = "#feffff"
     timeout = 2
     # Icon for notifications with normal urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_critical]
     background = "#770000"
-    foreground = "#ffffff"
-    frame_color = "#770000"
+    foreground = "#feffff"
+    frame_color = "#feffff"
     timeout = 2
     # Icon for notifications with critical urgency, uncomment to enable
     #icon = /path/to/icon
diff --git a/_desktop/qtile/config.py b/_desktop/qtile/config.py
index 1cbace8..c1d870d 100644
--- a/_desktop/qtile/config.py
+++ b/_desktop/qtile/config.py
@@ -128,19 +128,14 @@ screens = [
                     record_history=False,
                 ),
                 widget.Spacer(),
-                widget.Notify(
-                    default_timeout=5,
-                    background="#e8b923",
-                    foreground="#000000",
+                widget.GenPollText(
+                    update_interval=0.5,
+                    func=lambda: subprocess.check_output("sb-yubikey").decode(),
                 ),
                 widget.GenPollText(
                     update_interval=1,
                     func=lambda: subprocess.check_output("sb-mail").decode(),
                 ),
-                widget.GenPollText(
-                    update_interval=0.5,
-                    func=lambda: subprocess.check_output("sb-volume").decode(),
-                ),
                 widget.GenPollText(
                     update_interval=1,
                     func=lambda: subprocess.check_output("sb-network").decode(),