Merge branch 'dev' into rc

bin/omarchy-toggle-idle

@@ -2,8 +2,10 @@
 
 if pgrep -x hypridle >/dev/null; then
   pkill -x hypridle
-  notify-send "Stop locking computer when idle"
+  notify-send "󱫖    Stop locking computer when idle"
 else
   uwsm-app -- hypridle >/dev/null 2>&1 &
-  notify-send "Now locking computer when idle"
+  notify-send "󱫖    Now locking computer when idle"
 fi
+
+pkill -RTMIN+9 waybar

bin/omarchy-toggle-notification-silencing

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+makoctl mode -t do-not-disturb
+
+if makoctl mode | grep -q 'do-not-disturb'; then
+  notify-send "󰂛    Silenced notifications"
+else
+  notify-send "󰂚    Enabled notifications"
+fi
+
+pkill -RTMIN+10 waybar

config/tmux/tmux.conf

@@ -12,8 +12,8 @@ bind -T copy-mode-vi v send -X begin-selection
 bind -T copy-mode-vi y send -X copy-selection-and-cancel
 
 # Pane Controls
-bind h split-window -h -c "#{pane_current_path}"
-bind v split-window -v -c "#{pane_current_path}"
+bind h split-window -v -c "#{pane_current_path}"
+bind v split-window -h -c "#{pane_current_path}"
 bind x kill-pane
 
 bind -n C-M-Left select-pane -L

config/waybar/config.jsonc

@@ -5,7 +5,7 @@
   "spacing": 0,
   "height": 26,
   "modules-left": ["custom/omarchy", "hyprland/workspaces"],
-  "modules-center": ["clock", "custom/update", "custom/voxtype", "custom/screenrecording-indicator"],
+  "modules-center": ["clock", "custom/update", "custom/voxtype", "custom/screenrecording-indicator", "custom/idle-indicator", "custom/notification-silencing-indicator"],
   "modules-right": [
     "group/tray-expander",
     "bluetooth",
@@ -142,6 +142,18 @@
     "signal": 8,
     "return-type": "json"
   },
+  "custom/idle-indicator": {
+    "on-click": "omarchy-toggle-idle",
+    "exec": "$OMARCHY_PATH/default/waybar/indicators/idle.sh",
+    "signal": 9,
+    "return-type": "json"
+  },
+  "custom/notification-silencing-indicator": {
+    "on-click": "omarchy-toggle-notification-silencing",
+    "exec": "$OMARCHY_PATH/default/waybar/indicators/notification-silencing.sh",
+    "signal": 10,
+    "return-type": "json"
+  },
   "custom/voxtype": {
     "exec": "omarchy-voxtype-status",
     "return-type": "json",

config/waybar/style.css

@@ -34,7 +34,6 @@
 #battery,
 #pulseaudio,
 #custom-omarchy,
-#custom-screenrecording-indicator,
 #custom-update {
   min-width: 12px;
   margin: 0 7.5px;
@@ -72,9 +71,12 @@ tooltip {
   opacity: 0;
 }
 
-#custom-screenrecording-indicator {
+#custom-screenrecording-indicator,
+#custom-idle-indicator,
+#custom-notification-silencing-indicator {
   min-width: 12px;
   margin-left: 5px;
+  margin-right: 0;
   font-size: 10px;
   padding-bottom: 1px;
 }
@@ -83,6 +85,11 @@ tooltip {
   color: #a55555;
 }
 
+#custom-idle-indicator.active,
+#custom-notification-silencing-indicator.active {
+  color: #a55555;
+}
+
 #custom-voxtype {
   min-width: 12px;
   margin: 0 0 0 7.5px;

default/hypr/bindings/utilities.conf

@@ -18,7 +18,7 @@ bindd = SUPER SHIFT, BACKSPACE, Toggle workspace gaps, exec, omarchy-hyprland-wo
 # Notifications
 bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
 bindd = SUPER SHIFT, COMMA, Dismiss all notifications, exec, makoctl dismiss --all
-bindd = SUPER CTRL, COMMA, Toggle silencing notifications, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
+bindd = SUPER CTRL, COMMA, Toggle silencing notifications, exec, omarchy-toggle-notification-silencing
 bindd = SUPER ALT, COMMA, Invoke last notification, exec, makoctl invoke
 bindd = SUPER SHIFT ALT, COMMA, Restore last notification, exec, makoctl restore
 

default/waybar/indicators/idle.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if pgrep -x hypridle >/dev/null; then
+  echo '{"text": ""}'
+else
+  echo '{"text": "󱫖", "tooltip": "Idle lock disabled", "class": "active"}'
+fi

default/waybar/indicators/notification-silencing.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if makoctl mode | grep -q 'do-not-disturb'; then
+  echo '{"text": "󰂛", "tooltip": "Notifications silenced", "class": "active"}'
+else
+  echo '{"text": ""}'
+fi

migrations/1771602477.sh

@@ -0,0 +1,39 @@
+echo "Add idle lock indicator to Waybar"
+
+STYLE_FILE=~/.config/waybar/style.css
+CONFIG_FILE=~/.config/waybar/config.jsonc
+
+# Add idle-indicator to modules-center if not present
+if ! grep -q "custom/idle-indicator" "$CONFIG_FILE"; then
+  sed -i 's/"custom\/screenrecording-indicator"]/"custom\/screenrecording-indicator", "custom\/idle-indicator"]/' "$CONFIG_FILE"
+
+  sed -i '/"tray": {/i\  "custom/idle-indicator": {\n    "on-click": "omarchy-toggle-idle",\n    "exec": "$OMARCHY_PATH/default/waybar/indicators/idle.sh",\n    "signal": 9,\n    "return-type": "json"\n  },' "$CONFIG_FILE"
+fi
+
+# Add idle-indicator CSS if not present
+if ! grep -q "#custom-idle-indicator" "$STYLE_FILE"; then
+  # Remove screenrecording-indicator from shared margin block and pair it with idle-indicator instead
+  sed -i 's/^#custom-screenrecording-indicator,$//' "$STYLE_FILE"
+
+  # Add shared rule for both indicators and idle-indicator active state
+  sed -i '/#custom-screenrecording-indicator.active {/i\#custom-screenrecording-indicator,\n#custom-idle-indicator {\n  min-width: 12px;\n  margin-left: 5px;\n  margin-right: 0;\n  font-size: 10px;\n  padding-bottom: 1px;\n}\n' "$STYLE_FILE"
+
+  # Remove the now-duplicated properties from the standalone screenrecording block
+  sed -i '/#custom-screenrecording-indicator {/,/^}/ {
+    /min-width:/d
+    /margin-left:/d
+    /font-size:/d
+    /padding-bottom:/d
+    /^#custom-screenrecording-indicator {/d
+    /^}$/d
+  }' "$STYLE_FILE"
+
+  cat >> "$STYLE_FILE" << 'EOF'
+
+#custom-idle-indicator.active {
+  color: #a55555;
+}
+EOF
+fi
+
+omarchy-restart-waybar

migrations/1771602647.sh

@@ -0,0 +1,22 @@
+echo "Add notification silencing indicator to Waybar"
+
+STYLE_FILE=~/.config/waybar/style.css
+CONFIG_FILE=~/.config/waybar/config.jsonc
+
+# Add notification-silencing-indicator to modules-center if not present
+if ! grep -q "custom/notification-silencing-indicator" "$CONFIG_FILE"; then
+  sed -i 's/"custom\/idle-indicator"]/"custom\/idle-indicator", "custom\/notification-silencing-indicator"]/' "$CONFIG_FILE"
+
+  sed -i '/"tray": {/i\  "custom/notification-silencing-indicator": {\n    "on-click": "omarchy-toggle-notification-silencing",\n    "exec": "$OMARCHY_PATH/default/waybar/indicators/notification-silencing.sh",\n    "signal": 10,\n    "return-type": "json"\n  },' "$CONFIG_FILE"
+fi
+
+# Add notification-silencing-indicator CSS if not present
+if ! grep -q "#custom-notification-silencing-indicator" "$STYLE_FILE"; then
+  # Add to the shared indicator rule
+  sed -i 's/#custom-idle-indicator {/#custom-idle-indicator,\n#custom-notification-silencing-indicator {/' "$STYLE_FILE"
+
+  # Add to the shared active color rule
+  sed -i 's/#custom-idle-indicator.active {/#custom-idle-indicator.active,\n#custom-notification-silencing-indicator.active {/' "$STYLE_FILE"
+fi
+
+omarchy-restart-waybar