Merge branch 'dev' into rc

config/alacritty/alacritty.toml

@@ -3,6 +3,9 @@ general.import = [ "~/.config/omarchy/current/theme/alacritty.toml" ]
 [env]
 TERM = "xterm-256color"
 
+[terminal]
+osc52 = "CopyPaste"
+
 [font]
 normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
 bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }

install/config/all.sh

@@ -7,6 +7,7 @@ run_logged $OMARCHY_INSTALL/config/timezones.sh
 run_logged $OMARCHY_INSTALL/config/increase-sudo-tries.sh
 run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh
 run_logged $OMARCHY_INSTALL/config/ssh-flakiness.sh
+run_logged $OMARCHY_INSTALL/config/increase-file-watchers.sh
 run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 run_logged $OMARCHY_INSTALL/config/xcompose.sh
 run_logged $OMARCHY_INSTALL/config/mise-work.sh

install/config/increase-file-watchers.sh

@@ -0,0 +1,3 @@
+# Increase inotify file watchers for VS Code, webpack, and other dev tools (default 8192 is too low)
+echo "fs.inotify.max_user_watches=524288" | sudo tee /etc/sysctl.d/90-omarchy-file-watchers.conf >/dev/null
+sudo sysctl --system >/dev/null 2>&1

migrations/1767138576.sh

@@ -1,9 +1,9 @@
 echo "Update terminal scrolltouchpad setting to Hyprland 0.53 style"
 
 if grep -q "scrolltouchpad" ~/.config/hypr/input.conf; then
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
+  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)\s*$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
+  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)\s*$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
+  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal\s*$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
 fi
 
 # Ensure we restart to pair new Hyprland settings with new version

migrations/1771002522.sh

@@ -0,0 +1,11 @@
+echo "Add full OSC 52 support to Alacritty"
+
+ALACRITTY_CONFIG=~/.config/alacritty/alacritty.toml
+
+if [[ -f $ALACRITTY_CONFIG ]] && ! grep -q 'osc52' "$ALACRITTY_CONFIG"; then
+  cat >> "$ALACRITTY_CONFIG" << 'EOF'
+
+[terminal]
+osc52 = "CopyPaste"
+EOF
+fi

migrations/1771602477.sh

@@ -35,5 +35,3 @@ if ! grep -q "#custom-idle-indicator" "$STYLE_FILE"; then
 }
 EOF
 fi
-
-omarchy-restart-waybar

migrations/1771606080.sh

@@ -0,0 +1,3 @@
+echo "Increase inotify file watchers for dev tools"
+
+bash $OMARCHY_PATH/install/config/increase-file-watchers.sh

migrations/1771606249.sh

@@ -0,0 +1,9 @@
+echo "Re-run scrolltouchpad migration for configs with trailing whitespace"
+
+if grep -q "scrolltouchpad" ~/.config/hypr/input.conf; then
+  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)\s*$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
+  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)\s*$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
+  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal\s*$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
+
+  omarchy-state set reboot-required
+fi