Merge pull request #3683 from basecamp/dev

Omarchy 3.2.2
This commit is contained in:
Ryan Hughes
2025-11-28 20:13:08 -05:00
committed by GitHub
13 changed files with 30 additions and 11 deletions

View File

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

View File

@@ -9,7 +9,7 @@ fi
case "$channel" in case "$channel" in
"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;; "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" ;; "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
*) echo "Unknown channel: $channel"; exit 1; ;; *) echo "Unknown channel: $channel"; exit 1; ;;
esac esac

View File

@@ -18,11 +18,10 @@ printf '\033]11;rgb:00/00/00\007' # Set background color to black
hyprctl keyword cursor:invisible true &>/dev/null hyprctl keyword cursor:invisible true &>/dev/null
while true; do 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 \ tte -i ~/.config/omarchy/branding/screensaver.txt \
--frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\ --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 while pgrep -x tte >/dev/null; do
if read -n 1 -t 1 || ! screensaver_in_focus; then if read -n 1 -t 1 || ! screensaver_in_focus; then

View File

@@ -3,6 +3,9 @@
# Lock the screen # Lock the screen
pidof hyprlock || hyprlock & pidof hyprlock || hyprlock &
# Set keyboard layout to default (first layout)
hyprctl switchxkblayout all 0 > /dev/null 2>&1
# Ensure 1password is locked # Ensure 1password is locked
if pgrep -x "1password" >/dev/null; then if pgrep -x "1password" >/dev/null; then
1password --lock & 1password --lock &

View File

@@ -17,4 +17,6 @@ else
fi fi
echo echo
sudo pacman -Syu --noconfirm
# Reset all package DBs and then update
sudo pacman -Syyu --noconfirm

View File

@@ -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') 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 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 else
echo "No extra themes installed." echo "No extra themes installed."
exit 1 exit 1

View File

@@ -1,10 +1,14 @@
#!/bin/bash #!/bin/bash
gum style --border normal --border-foreground 6 --padding "1 2" \ 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!" \ "• 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 if ! gum confirm "Continue with update?"; then
echo "Update cancelled" echo "Update cancelled"

View File

@@ -10,12 +10,15 @@ hide_action_hints = true # gl
[keybinds] [keybinds]
quick_activate = [] quick_activate = []
[columns]
symbols = 1 # providers to be queried by default
[providers] [providers]
max_results = 256 # 256 should be enough for everyone max_results = 256 # 256 should be enough for everyone
default = [ default = [
"desktopapplications", "desktopapplications",
"websearch", "websearch",
] # providers to be queried by default ]
[[providers.prefixes]] [[providers.prefixes]]
prefix = "/" prefix = "/"

View File

@@ -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 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, 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 ALT, COMMA, Invoke last notification, exec, makoctl invoke
bindd = SUPER SHIFT ALT, COMMA, Invoke last notification, exec, makoctl restore
# Toggle idling # Toggle idling
bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle

3
migrations/1764332115.sh Normal file
View File

@@ -0,0 +1,3 @@
echo "Ensure emoji menu (Super + Ctrl + E) uses single column design"
omarchy-refresh-walker

3
migrations/1764333665.sh Normal file
View File

@@ -0,0 +1,3 @@
echo "Ensure you have package repository indexes matching your channel"
sudo pacman -Syyu --noconfirm

View File

@@ -1 +1,2 @@
theme = Monokai Pro Ristretto theme = Monokai Pro Ristretto
cursor-text = #000000

View File

@@ -1 +1 @@
3.2.1 3.2.2