diff --git a/home-environments/radio.scm b/home-environments/radio.scm
index 241c274..0e76d1a 100644
--- a/home-environments/radio.scm
+++ b/home-environments/radio.scm
@@ -69,6 +69,7 @@
 
   #|Guix|#
   #|C|# #:use-module (guix channels)
+  #|P|# #:use-module (guix packages)
 
   #|Radio|#
   #|C|# #:use-module ((radio channels) #:prefix channel:)
@@ -132,6 +133,7 @@
 (define application:terminal "foot")
 (define application:wm "river")
 
+#|Package lists|#
 (define packages:blogging
   (list #|guile-xyz|# haunt))
 
@@ -142,16 +144,21 @@
   (list #|databases|# recutils))
 
 (define packages:desktop
-  (list #|admin      |# hyfetch
-        #|freedesktop|# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr
-                        xdg-terminal-exec
-        #|glib       |# dbus
-        #|image      |# grim slurp
-        #|terminals  |# foot
-        #|toys       |# wayneko
-        #|wm         |# fnott rivercarro riverguile river-bnf swww waybar
-        #|xdisorg    |# fuzzel wl-clipboard wlrctl gammastep
-        #|zig-xyz    |# river))
+  (let ((waybar-sans-elogind
+          ((package-input-rewriting
+            `((,wireplumber . ,wireplumber-minimal)))
+           waybar)))
+    (list #|admin      |# hyfetch
+          #|freedesktop|# xdg-utils xdg-desktop-portal xdg-desktop-portal-wlr
+                          xdg-terminal-exec
+          #|glib       |# dbus
+          #|image      |# grim slurp
+          #|terminals  |# foot
+          #|toys       |# wayneko
+          #|wm         |# fnott rivercarro riverguile river-bnf swww
+                          waybar-sans-elogind
+          #|xdisorg    |# fuzzel wl-clipboard wlrctl gammastep
+          #|zig-xyz    |# river)))
 
 (define packages:development
   (list #|gnupg         |# gnupg pinentry
@@ -209,7 +216,7 @@
   (list #|guile-xyz|# guile-srfi-197 guile-srfi-232))
 
 (define packages:sound
-  (list #|linux     |# wireplumber
+  (list #|linux     |# wireplumber-minimal
         #|pulseaudio|# pamixer pavucontrol))
 
 (define packages:video