From c3f35c57fbe32a3f72374d713dbf863e08948bff Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 24 May 2026 12:53:51 +0200 Subject: [PATCH] Omarchy 3.8.2 (#5960) * Fix logs uploading * Fail hard if we don't get the right branch * Fix HL 0.55 compatible unified clipboard hotkeys * Bump version --------- Co-authored-by: Ryan Hughes --- bin/omarchy-debug | 6 ++--- bin/omarchy-upload-log | 36 ++++++++++++++++++---------- boot.sh | 10 ++++---- config/elephant/symbols.toml | 2 +- default/hypr/bindings/clipboard.conf | 6 ++--- migrations/1779516254.sh | 11 +++++++++ version | 2 +- 7 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 migrations/1779516254.sh diff --git a/bin/omarchy-debug b/bin/omarchy-debug index 830caa1b..c163e171 100755 --- a/bin/omarchy-debug +++ b/bin/omarchy-debug @@ -74,15 +74,13 @@ ACTION=$(gum choose "${OPTIONS[@]}") case "$ACTION" in "Upload log") - echo "Uploading debug log to 0x0.st..." - URL=$(curl -sF "file=@$LOG_FILE" -Fexpires=24 https://0x0.st) + echo "Uploading debug log to logs.omarchy.org..." + URL=$(curl -sf -F "file=@$LOG_FILE" https://logs.omarchy.org/) if (( $? == 0 )) && [[ -n $URL ]]; then echo "✓ Log uploaded successfully!" echo "Share this URL:" echo "" echo " $URL" - echo "" - echo "This link will expire in 24 hours." else echo "Error: Failed to upload log file" exit 1 diff --git a/bin/omarchy-upload-log b/bin/omarchy-upload-log index 7d06ac3b..c4aa8cf4 100755 --- a/bin/omarchy-upload-log +++ b/bin/omarchy-upload-log @@ -1,6 +1,6 @@ #!/bin/bash -# omarchy:summary=Upload logs to 0x0.st +# omarchy:summary=Upload logs to logs.omarchy.org # omarchy:args= # omarchy:hidden=true @@ -28,7 +28,7 @@ else echo "=========================================" echo "SYSTEM INFORMATION" echo "=========================================" - echo "Hostname: $(hostname)" + echo "Hostname: $(uname -n)" echo "Kernel: $(uname -r)" echo "Date: $(date)" echo "" @@ -41,19 +41,33 @@ fi case "$LOG_TYPE" in install) + # In the live ISO before reboot, the target system is mounted at /mnt so the + # omarchy install log lives at /mnt/var/log/omarchy-install.log. On the + # installed system it's at /var/log/omarchy-install.log. Prefer whichever + # exists, with /mnt taking precedence (only present in the ISO context, and + # there it's the right one). ARCHINSTALL_LOG="/var/log/archinstall/install.log" - OMARCHY_LOG="/var/log/omarchy-install.log" + if [[ -s /mnt/var/log/omarchy-install.log ]]; then + OMARCHY_LOG="/mnt/var/log/omarchy-install.log" + else + OMARCHY_LOG="/var/log/omarchy-install.log" + fi - # Combine system info with logs cat "$SYSTEM_INFO" >"$TEMP_LOG" - cat $ARCHINSTALL_LOG $OMARCHY_LOG >>"$TEMP_LOG" 2>/dev/null + [[ -s $ARCHINSTALL_LOG ]] && cat "$ARCHINSTALL_LOG" >>"$TEMP_LOG" + if [[ -s $OMARCHY_LOG ]]; then + printf '\n========================================\nOMARCHY INSTALL LOG (%s)\n========================================\n\n' "$OMARCHY_LOG" >>"$TEMP_LOG" + cat "$OMARCHY_LOG" >>"$TEMP_LOG" + else + echo "Warning: omarchy install log not found (looked at /mnt/var/log/ and /var/log/)" >&2 + fi if [[ ! -s $TEMP_LOG ]]; then echo "Error: No install logs found" exit 1 fi - echo "Uploading installation log to 0x0.st..." + echo "Uploading installation log to logs.omarchy.org..." ;; this-boot) @@ -66,7 +80,7 @@ this-boot) exit 1 fi - echo "Uploading current boot logs to 0x0.st..." + echo "Uploading current boot logs to logs.omarchy.org..." ;; last-boot) @@ -79,7 +93,7 @@ last-boot) exit 1 fi - echo "Uploading previous boot logs to 0x0.st..." + echo "Uploading previous boot logs to logs.omarchy.org..." ;; installed|system-info) @@ -98,7 +112,7 @@ installed|system-info) exit 1 fi - echo "Uploading system information to 0x0.st..." + echo "Uploading system information to logs.omarchy.org..." ;; *) @@ -113,15 +127,13 @@ esac echo "" -URL=$(curl -sF "file=@$TEMP_LOG" -Fexpires=24 https://0x0.st) +URL=$(curl -sf -F "file=@$TEMP_LOG" https://logs.omarchy.org/) if (( $? == 0 )) && [[ -n $URL ]]; then echo "✓ Log uploaded successfully!" echo "Share this URL:" echo "" echo " $URL" - echo "" - echo "This link will expire in 24 hours." else echo "Error: Failed to upload log file" exit 1 diff --git a/boot.sh b/boot.sh index e17c7af2..e01a52fc 100755 --- a/boot.sh +++ b/boot.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # Set install mode to online since boot.sh is used for curl installations export OMARCHY_ONLINE_INSTALL=true @@ -38,13 +40,9 @@ sudo pacman -Syu --noconfirm --needed git OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}" echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git" -rm -rf ~/.local/share/omarchy/ -git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null - echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m" -cd ~/.local/share/omarchy -git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}" -cd - +rm -rf ~/.local/share/omarchy/ +git clone --branch "$OMARCHY_REF" "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null echo -e "\nInstallation starting..." source ~/.local/share/omarchy/install.sh diff --git a/config/elephant/symbols.toml b/config/elephant/symbols.toml index 3144c152..fc7926ff 100644 --- a/config/elephant/symbols.toml +++ b/config/elephant/symbols.toml @@ -1 +1 @@ -command = 'wl-copy && hyprctl dispatch sendshortcut "SHIFT, Insert,"' +command = 'wl-copy && hyprctl dispatch sendshortcut "SHIFT,Insert,activewindow"' diff --git a/default/hypr/bindings/clipboard.conf b/default/hypr/bindings/clipboard.conf index ffaede7a..214d2586 100644 --- a/default/hypr/bindings/clipboard.conf +++ b/default/hypr/bindings/clipboard.conf @@ -1,5 +1,5 @@ # Copy / Paste -bindd = SUPER, C, Universal copy, sendshortcut, CTRL, Insert, -bindd = SUPER, V, Universal paste, sendshortcut, SHIFT, Insert, -bindd = SUPER, X, Universal cut, sendshortcut, CTRL, X, +bindd = SUPER, C, Universal copy, sendshortcut, CTRL, Insert, activewindow +bindd = SUPER, V, Universal paste, sendshortcut, SHIFT, Insert, activewindow +bindd = SUPER, X, Universal cut, sendshortcut, CTRL, X, activewindow bindd = SUPER CTRL, V, Clipboard manager, exec, omarchy-launch-walker -m clipboard diff --git a/migrations/1779516254.sh b/migrations/1779516254.sh new file mode 100644 index 00000000..3fef7150 --- /dev/null +++ b/migrations/1779516254.sh @@ -0,0 +1,11 @@ +echo "Update elephant symbols paste shortcut for Hyprland 0.55" + +symbols_config=~/.config/elephant/symbols.toml + +if [[ -f $symbols_config ]]; then + sed -i 's/hyprctl dispatch sendshortcut "SHIFT, Insert,"/hyprctl dispatch sendshortcut "SHIFT,Insert,activewindow"/' "$symbols_config" +else + omarchy-refresh-config elephant/symbols.toml +fi + +omarchy-restart-walker diff --git a/version b/version index f2807196..a08ffae0 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.8.1 +3.8.2