4 files changed, 37 insertions, 34 deletions
diff --git a/common/.config/wal/templates/dunstrc b/common/.config/wal/templates/dunstrc
deleted file mode 100644
index bcfbdb8..0000000
--- a/common/.config/wal/templates/dunstrc
+++ /dev/null
@@ -1,30 +0,0 @@
-[global]
-follow = mouse
-enable_posix_regex = true
-
-width = (200, 300)
-offset = (20, 10)
-
-transparency = 20
-
-gap_size = 1
-
-idle_threshold = 5m
-
-frame_color = "{cursor}"
-
-[urgency_low]
-    background = "{background}"
-    foreground = "{foreground}"
-    timeout = 5
-
-[urgency_normal]
-    background = "{background}"
-    foreground = "{foreground}"
-    timeout = 10
-
-[urgency_critical]
-    background = "{background}"
-    foreground = "{foreground}"
-    frame_color = "{color4}"
-    timeout = 0
diff --git a/common/.emacs.d/init.el b/common/.emacs.d/init.el
index 13189d1..0a17db2 100644
--- a/common/.emacs.d/init.el
+++ b/common/.emacs.d/init.el
@@ -3930,6 +3930,32 @@ instead."
     (interactive)
     (spawn-term default-directory)))
 
+(use-package ednc-popup
+  :if (group-enabled-p 'exwm)
+  :vc (:url "https://codeberg.org/akib/emacs-ednc-popup")
+  :ensure t
+  :init
+  (defun my/ednc-popup-clear-one ()
+    (interactive)
+    (require 'ednc)
+    (ednc-popup--hide
+     (car ednc-popup--active-notifications)))
+  (defun my/ednc-popup-clear-all ()
+    (interactive)
+    (require 'ednc)
+    (ednc-popup--hide-all)))
+
+(use-package ednc
+  :if (group-enabled-p 'exwm)
+  :ensure t
+  :diminish
+  :init
+  (ednc-mode 1)
+  :config
+  (add-hook
+   'ednc-notification-presentation-functions
+   #'ednc-popup-presentation-function))
+
 (use-package exwm
   :if (group-enabled-p 'exwm)
   :ensure t
@@ -3991,6 +4017,12 @@ instead."
   (define-rrr wallpapers "dired-wallpapers" "\\*wallpapers\\*")
   (defalias 'walls 'wallpapers)
 
+  (defun notifications ()
+    (interactive)
+    (run-raise-remove
+     nil "\\*ednc-log\\*"
+     (lambda (_) (switch-to-buffer "*ednc-log*"))))
+
   (defun email ()
     (interactive)
     (run-raise-remove (lambda ()
@@ -4262,7 +4294,11 @@ instead."
      ("s-x B 1" barrier-on)
      ("s-x B 0" barrier-off)
 
-     ("s-h" exwm-workspace-switch)))
+     ("s-h" exwm-workspace-switch)
+
+     ("s-`" my/ednc-popup-clear-one)
+     ("C-s-`" my/ednc-popup-clear-all)
+     ("s-~" notifications)))
 
   (define-keymap
     :keymap exwm-mode-map
diff --git a/common/.xinitrc b/common/.xinitrc
index 72ab245..8e0af9c 100644
--- a/common/.xinitrc
+++ b/common/.xinitrc
@@ -5,7 +5,6 @@ mywal -R
 xsettingsd &
 xset s 3600
 [ ! "$IS_UNDERPOWERED" = 1 ] && picom --config ~/.picom.conf &
-dunst &
 unclutter -root -idle 5 &
 (pidof transmission-daemon >/dev/null || \
      (which transmission-daemon 2>&1 >/dev/null &&\
diff --git a/common/bin/mywal b/common/bin/mywal
index df53c4c..9ddd89f 100755
--- a/common/bin/mywal
+++ b/common/bin/mywal
@@ -1,8 +1,6 @@
 #!/bin/sh
 wal -ta 90 $*
 
-pidof dunst && dunstctl reload
-
 pidof xsettingsd && pkill -HUP xsettingsd
 
 (pidof emacs >/dev/null 2>&1) && setsid -f emacsclient --eval "(reload-theme)"