diff --git a/programs/zsh.nix b/programs/zsh.nix
index f5b28ca..4a4ae5f 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -8,7 +8,7 @@
       theme = "agnoster";
     };
 
-    initExtra = ''
+    initContent = ''
       # Use kitty's ssh helper if running inside kitty
       [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
     '';
diff --git a/wm/waybar.nix b/wm/waybar.nix
index c98ed68..f2f4960 100644
--- a/wm/waybar.nix
+++ b/wm/waybar.nix
@@ -21,11 +21,26 @@
       ];
 
       modules-right = [
+        "pulseaudio"
         "cpu"
         "tray"
         "clock"
       ];
 
+      pulseaudio = {
+        format = "{icon} {volume}%";
+        format-muted = "󰝟 muted";
+        tooltip = false;
+
+        scroll-step = 5;
+
+        format-icons = {
+          default = [ "󰕿" "󰖀" "󰕾" ];
+        };
+
+        on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+      };
+
       mpris = {
         player = "spotify";
         format = "{player_icon} {artist} - {title}";
@@ -35,7 +50,7 @@
       };
 
       cpu = {
-        format = "{usage}% ";
+        format = "  {usage}%";
         tooltip = false;
       };