Merge pull request #3683 from basecamp/dev

Omarchy 3.2.2
Bump for upcoming release
2026-08-02 20:28:19 +02:00 · 2025-11-28 20:13:08 -05:00 · 2025-11-28 16:50:09 -08:00 · 2025-11-28 16:45:36 -08:00 · 2025-11-28 07:15:24 -08:00 · 2025-11-28 07:14:51 -08:00
14 changed files with 44 additions and 13 deletions
@@ -1,7 +1,7 @@
 #!/bin/bash

 if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [master|dev]"
+  echo "Usage: omarchy-branch-set [master|dev]"
  exit 1
 else
  branch="$1"
@@ -9,7 +9,7 @@ fi

 case "$channel" in
 "stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
-"edge") omarchy-branch-set "edge" && omarchy-refresh-pacman "stable" ;;
+"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;
 esac
@@ -18,11 +18,10 @@ printf '\033]11;rgb:00/00/00\007'  # Set background color to black
 hyprctl keyword cursor:invisible true &>/dev/null

 while true; do
-  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | grep -Ev '^(dev_worm)$' | sort -u | shuf -n1)
-
  tte -i ~/.config/omarchy/branding/screensaver.txt \
    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
-    --no-eol --no-restore-cursor $effect &
+    --random-effect --exclude-effects dev_worm \
+    --no-eol --no-restore-cursor &

  while pgrep -x tte >/dev/null; do
    if read -n 1 -t 1 || ! screensaver_in_focus; then
@@ -3,6 +3,9 @@
 # Lock the screen
 pidof hyprlock || hyprlock &

+# Set keyboard layout to default (first layout)
+hyprctl switchxkblayout all 0 > /dev/null 2>&1
+
 # Ensure 1password is locked
 if pgrep -x "1password" >/dev/null; then
  1password --lock &
@@ -17,4 +17,6 @@ else
 fi

 echo
-sudo pacman -Syu --noconfirm
+
+# Reset all package DBs and then update
+sudo pacman -Syyu --noconfirm
@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
  mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')

  if [[ ${#extra_themes[@]} -gt 0 ]]; then
-    THEME_NAME=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
+    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
  else
    echo "No extra themes installed."
    exit 1
@@ -1,10 +1,14 @@
 #!/bin/bash

 gum style --border normal --border-foreground 6 --padding "1 2" \
-  "Ready to update Omarchy?" \
+  "Ready to update?" \
  "" \
  "• You cannot stop the update once you start!" \
-  "• Make sure you're connected to power or have a full battery"
+  "• Make sure you're connected to power or have a full battery" \
+  "" \
+  "What's new: https://github.com/basecamp/omarchy/releases"
+
+echo

 if ! gum confirm "Continue with update?"; then
  echo "Update cancelled"
@@ -10,12 +10,15 @@ hide_action_hints = true                                                    # gl
 [keybinds]
 quick_activate = []

+[columns]
+symbols = 1 # providers to be queried by default
+
 [providers]
 max_results = 256 # 256 should be enough for everyone
 default = [
  "desktopapplications",
  "websearch",
-] # providers to be queried by default
+]

 [[providers.prefixes]]
 prefix = "/"
@@ -17,7 +17,7 @@ bindd = SUPER, RIGHT, Move window focus right, movefocus, r
 bindd = SUPER, UP, Move window focus up, movefocus, u
 bindd = SUPER, DOWN, Move window focus down, movefocus, d

-# Switch workspaces with SUPER + [1-9]
+# Switch workspaces with SUPER + [1-9; 0]
 bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
 bindd = SUPER, code:11, Switch to workspace 2, workspace, 2
 bindd = SUPER, code:12, Switch to workspace 3, workspace, 3
@@ -29,7 +29,7 @@ bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
 bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
 bindd = SUPER, code:19, Switch to workspace 10, workspace, 10

-# Move active window to a workspace with SUPER + SHIFT + [1-9]
+# Move active window to a workspace with SUPER + SHIFT + [1-9; 0]
 bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
 bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2
 bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3
@@ -41,6 +41,18 @@ bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
 bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
 bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10

+# Move active window silently to a workspace with SUPER + SHIFT + ALT + [1-9; 0]
+bindd = SUPER SHIFT ALT, code:10, Move window silently to workspace 1, movetoworkspacesilent, 1
+bindd = SUPER SHIFT ALT, code:11, Move window silently to workspace 2, movetoworkspacesilent, 2
+bindd = SUPER SHIFT ALT, code:12, Move window silently to workspace 3, movetoworkspacesilent, 3
+bindd = SUPER SHIFT ALT, code:13, Move window silently to workspace 4, movetoworkspacesilent, 4
+bindd = SUPER SHIFT ALT, code:14, Move window silently to workspace 5, movetoworkspacesilent, 5
+bindd = SUPER SHIFT ALT, code:15, Move window silently to workspace 6, movetoworkspacesilent, 6
+bindd = SUPER SHIFT ALT, code:16, Move window silently to workspace 7, movetoworkspacesilent, 7
+bindd = SUPER SHIFT ALT, code:17, Move window silently to workspace 8, movetoworkspacesilent, 8
+bindd = SUPER SHIFT ALT, code:18, Move window silently to workspace 9, movetoworkspacesilent, 9
+bindd = SUPER SHIFT ALT, code:19, Move window silently to workspace 10, movetoworkspacesilent, 10
+
 # Control scratchpad
 bindd = SUPER, S, Toggle scratchpad, togglespecialworkspace, scratchpad
 bindd = SUPER ALT, S, Move window to scratchpad, movetoworkspacesilent, special:scratchpad
@@ -19,6 +19,7 @@ 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 ALT, COMMA, Invoke last notification, exec, makoctl invoke
+bindd = SUPER SHIFT ALT, COMMA, Invoke last notification, exec, makoctl restore

 # Toggle idling
 bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
@@ -0,0 +1,3 @@
+echo "Ensure emoji menu (Super + Ctrl + E) uses single column design"
+
+omarchy-refresh-walker
@@ -0,0 +1,3 @@
+echo "Ensure you have package repository indexes matching your channel"
+
+sudo pacman -Syyu --noconfirm
@@ -1 +1,2 @@
 theme = Monokai Pro Ristretto
+cursor-text = #000000
@@ -1 +1 @@
-3.2.1
+3.2.2
Author	SHA1	Message	Date
Ryan HughesandGitHub	8a37f3dce7	Merge pull request #3683 from basecamp/dev Omarchy 3.2.2	2025-11-28 20:13:08 -05:00
David Heinemeier Hansson	03be87b42c	Bump for upcoming release	2025-11-28 16:50:09 -08:00
David Heinemeier Hansson	d6aa65d03c	Rely on new TTE 0.14.1 settings	2025-11-28 16:45:36 -08:00
David Heinemeier Hansson	1514e4e501	Merge branch 'master' into dev	2025-11-28 07:15:24 -08:00
Gary Allan Howard GitHub David Heinemeier Hansson	91cf593b76	feat: Silently move active workspace to another workspace. (#3546 ) * feat: silently move active window to target workspace Adds a quality-of-life keybind: SUPER + ALT + SHIFT + [1-9, 0] This silently moves the active window from the active workspace to the chosen destination workspace. The destination workspace re-tiles correctly upon receiving the window. The currently active workspace remains active, and the moved window retains focus throughout the operation (no workspace switch, no animation, no extra UI noise). Why: - Provides fast, silent window reshuffling during multitasking. - Avoids disruptive workspace switching. - Matches Omarchy’s focus on efficient Hyprland ergonomics. - Keeps the user anchored to their current workflow while reorganizing. Testing: 1. Open multiple windows across several workspaces. 2. Focus a window on the active workspace. 3. Press SUPER + ALT + [1–9, 0]. 4. Verify the window appears on the target workspace and re-tiles. 5. Confirm the source workspace stays active. 6. Confirm focus remains on the moved window. 7. Repeat with multiple applications and workspace combinations. * We've frozen this old tiling config * Put on Super + Shift + Alt This is an alternative version of an existing move * Fix description --------- Co-authored-by: David Heinemeier Hansson <david@hey.com>	2025-11-28 07:14:51 -08:00
Raymond46 GitHub David Heinemeier Hansson	7327f95aa1	feat: restore the last notification keybinding (#3580 ) * feat: restore the last notification. * Stick with comma --------- Co-authored-by: David Heinemeier Hansson <david@hey.com>	2025-11-28 07:09:04 -08:00
AlexanderandGitHub	a8b8eb6f5e	Reset keyboard layout to default first one on the lock screen (#3541 )	2025-11-28 07:06:54 -08:00
Jeff NunnandGitHub	16d0133037	Remove theme menu now sorts themes alphabetically (like list themes does) (#3635 )	2025-11-28 07:05:08 -08:00
Patrick LenzandGitHub	68c3917386	Fix usage message in omarchy-branch-set script (#3634 )	2025-11-28 06:58:18 -08:00
Jeff NunnandGitHub	2cfc3b0f9e	Fixes Ristretto cursor visibility in Ghostty/neovim (#3620 )	2025-11-28 06:57:44 -08:00
David Heinemeier Hansson	96f140b93f	Do the update too	2025-11-28 05:03:44 -08:00
David Heinemeier Hansson	c97995b9ea	Can just do it in one go	2025-11-28 05:03:04 -08:00
David Heinemeier Hansson	8d61c73465	Fix channel updating for edge	2025-11-28 05:00:34 -08:00
David Heinemeier Hansson	2b3c48b725	Fix issue with package DBs being wrong when switching to stable channel	2025-11-28 04:59:25 -08:00
David Heinemeier Hansson	e15b2ae78c	Fix emoji picker would use a 3-column design and that it would bleed into other menus Closes #3604	2025-11-28 13:41:05 +01:00
David Heinemeier Hansson	30a5f5846c	Tweaks	2025-11-28 13:15:15 +01:00
Nathan Willson GitHub Ryan Hughes David Heinemeier Hansson	7e44ab33ac	feat: show link to changelog in update confirm window (#3651 ) * Update version * feat: show link to changelog in update confirm window * Link to scrollable changelog You may be updating more than one version at the time. --------- Co-authored-by: Ryan Hughes <ryan@heyoodle.com> Co-authored-by: David Heinemeier Hansson <david@hey.com>	2025-11-28 13:13:16 +01:00
David Heinemeier Hansson	6a181adf0d	Reset all package DBs when changing channel	2025-11-28 13:03:55 +01:00
@@ -1 +1 @@
 .2.1
 .2.2