7 files changed, 26 insertions, 23 deletions
diff --git a/dotfiles/hyprland/.config/foot/foot.ini b/dotfiles/hyprland/.config/foot/foot.ini
index 8fe19b3..48c26a6 100644
--- a/dotfiles/hyprland/.config/foot/foot.ini
+++ b/dotfiles/hyprland/.config/foot/foot.ini
@@ -3,7 +3,7 @@
 
 [main]
 term=xterm-256color
-font=BerkeleyMono Nerd Font:size=13
+font=BerkeleyMono Nerd Font:size=14
 pad=8x8
 
 [scrollback]
diff --git a/dotfiles/hyprland/.config/hypr/hyprland.conf b/dotfiles/hyprland/.config/hypr/hyprland.conf
index dfbb49e..78c5bdf 100644
--- a/dotfiles/hyprland/.config/hypr/hyprland.conf
+++ b/dotfiles/hyprland/.config/hypr/hyprland.conf
@@ -17,7 +17,7 @@ exec-once = systemctl --user start xdg-desktop-portal-hyprland xdg-desktop-porta
 # Core services
 exec-once = /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh
 exec-once = dunst > ~/.local/var/log/dunst-$(date +%Y-%m-%d-%H%M%S).log 2>&1
-exec-once = [ -n "$(hyprpm list 2>/dev/null)" ] && hyprpm reload; sleep 2 && hyprctl dismissnotify -1
+exec-once = hyprpm update -n && sleep 2 && hyprctl dismissnotify -1
 
 # Desktop appearance (after portal is ready)
 exec-once = swww-daemon && sleep 1 && swww img ~/pictures/wallpaper/trondheim-norway.jpg
diff --git a/dotfiles/hyprland/.config/themes/dupre/foot.ini b/dotfiles/hyprland/.config/themes/dupre/foot.ini
index 8fe19b3..48c26a6 100644
--- a/dotfiles/hyprland/.config/themes/dupre/foot.ini
+++ b/dotfiles/hyprland/.config/themes/dupre/foot.ini
@@ -3,7 +3,7 @@
 
 [main]
 term=xterm-256color
-font=BerkeleyMono Nerd Font:size=13
+font=BerkeleyMono Nerd Font:size=14
 pad=8x8
 
 [scrollback]
diff --git a/dotfiles/hyprland/.config/themes/hudson/foot.ini b/dotfiles/hyprland/.config/themes/hudson/foot.ini
index 4e9681c..2ef78d4 100644
--- a/dotfiles/hyprland/.config/themes/hudson/foot.ini
+++ b/dotfiles/hyprland/.config/themes/hudson/foot.ini
@@ -3,7 +3,7 @@
 
 [main]
 term=xterm-256color
-font=BerkeleyMono Nerd Font:size=13
+font=BerkeleyMono Nerd Font:size=14
 pad=8x8
 
 [scrollback]
diff --git a/dotfiles/hyprland/.config/waybar/config b/dotfiles/hyprland/.config/waybar/config
index 676f040..7853326 100644
--- a/dotfiles/hyprland/.config/waybar/config
+++ b/dotfiles/hyprland/.config/waybar/config
@@ -15,7 +15,7 @@
     "modules-right": [
         "group/sysmonitor",
         "custom/netspeed",
-        "wireplumber",
+        "pulseaudio",
         "idle_inhibitor",
         "tray",
         "clock"
@@ -118,13 +118,14 @@
         }
     },
 
-    "wireplumber": {
-        "format": "<span size='large'>󰕾</span> {volume}%",
+    "pulseaudio": {
+        "format": "<span size='large'>{icon}</span> {volume}%",
         "format-muted": "<span size='large'>󰝟</span> Muted",
-        "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+        "format-icons": {"default": ["󰕿", "󰖀", "󰕾"]},
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
         "on-click-right": "toggle-scratchpad audio",
-        "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+",
-        "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +5%",
+        "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -5%"
     },
 
     "idle_inhibitor": {
diff --git a/dotfiles/hyprland/.config/waybar/style.css b/dotfiles/hyprland/.config/waybar/style.css
index 18ba0f1..20d6a99 100644
--- a/dotfiles/hyprland/.config/waybar/style.css
+++ b/dotfiles/hyprland/.config/waybar/style.css
@@ -52,7 +52,8 @@ window#waybar {
 #custom-disk,
 #custom-netspeed,
 #battery,
-#wireplumber,
+#pulseaudio,
+#idle_inhibitor,
 #tray,
 #clock,
 #custom-layout,
@@ -75,20 +76,13 @@ window#waybar {
 #memory:hover,
 #custom-disk:hover,
 #custom-netspeed:hover,
-#wireplumber:hover,
+#pulseaudio:hover,
 #sysmonitor:hover,
 #custom-layout:hover {
     background-color: #474544;
     border-radius: 1rem;
 }
 
-#clock {
-    color: #f0fef0;
-}
-
-#wireplumber {
-    color: #969385;
-}
 
 #custom-netspeed.disconnected {
     color: #d47c59;
diff --git a/dotfiles/hyprland/.local/bin/stash-restore b/dotfiles/hyprland/.local/bin/stash-restore
index e04945a..ddaa5a4 100755
--- a/dotfiles/hyprland/.local/bin/stash-restore
+++ b/dotfiles/hyprland/.local/bin/stash-restore
@@ -1,10 +1,18 @@
 #!/bin/bash
 # Restore all windows from special:stash to current workspace
+# Preserves current master window position using batch commands
 
 workspace=$(hyprctl activeworkspace -j | jq -r '.id')
+original_focus=$(hyprctl activewindow -j | jq -r '.address')
 
-# Get all windows in special:stash and move them to current workspace
-hyprctl clients -j | jq -r '.[] | select(.workspace.name == "special:stash") | .address' | \
-while read -r addr; do
-    hyprctl dispatch movetoworkspacesilent "$workspace",address:"$addr"
+# Get all windows in special:stash
+stashed=$(hyprctl clients -j | jq -r '.[] | select(.workspace.name == "special:stash") | .address')
+
+if [ -z "$stashed" ]; then
+    exit 0
+fi
+
+# Restore each window, then swap original back to master (batched for atomicity)
+for addr in $stashed; do
+    hyprctl --batch "dispatch movetoworkspacesilent $workspace,address:$addr ; dispatch focuswindow address:$original_focus ; dispatch layoutmsg swapwithmaster master"
 done