From 03053626e3e9f7009304be53169159fbfaa0bcc5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 18 Jul 2025 17:49:56 -0700 Subject: [PATCH 1/3] Make these executable --- boot.sh | 0 install.sh | 10 +++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 boot.sh mode change 100644 => 100755 install.sh diff --git a/boot.sh b/boot.sh old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index 381b778..0c5af8a --- a/install.sh +++ b/install.sh @@ -1,8 +1,16 @@ +#!/bin/bash + # Exit immediately if a command exits with a non-zero status set -e # Give people a chance to retry running the installation -trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR +catch_errors() { + echo -e "\n\e[31mOmarchy installation failed!\e[0m" + echo "You can retry by running: bash ~/.local/share/omarchy/install.sh" + echo "Get help from the community: https://discord.gg/tXFUdasqhY" +} + +trap catch_errors ERR # Install everything for f in ~/.local/share/omarchy/install/*.sh; do From 620b397859698cdc8e6207d33533c70e0e795171 Mon Sep 17 00:00:00 2001 From: Roeland Date: Sat, 19 Jul 2025 05:38:45 +0200 Subject: [PATCH 2/3] Replace pavucontrol with wiremix (#225) Add to install --- config/waybar/config.jsonc | 2 +- default/hypr/windows.conf | 6 +++--- install/desktop.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index ed56d8a..25f4818 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -96,7 +96,7 @@ }, "pulseaudio": { "format": "{icon}", - "on-click": "pavucontrol", + "on-click": "alacritty --class=Wiremix -e wiremix", "on-click-right": "pamixer -t", "tooltip-format": "Playing at {volume}%", "scroll-step": 5, diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf index d8f0f04..6f7520b 100644 --- a/default/hypr/windows.conf +++ b/default/hypr/windows.conf @@ -5,10 +5,10 @@ windowrule = suppressevent maximize, class:.* windowrule = tile, class:^(Chromium)$ # Float and center settings and previews -windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$ -windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$ +windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$ +windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer)$ windowrule = size 645 350, class:Omarchy -windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$ +windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$ # Float and center file pickers windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save) diff --git a/install/desktop.sh b/install/desktop.sh index 33dfd9d..a23c358 100644 --- a/install/desktop.sh +++ b/install/desktop.sh @@ -1,7 +1,7 @@ #!/bin/bash yay -S --noconfirm --needed \ - brightnessctl playerctl pamixer pavucontrol wireplumber \ + brightnessctl playerctl pamixer pavucontrol wiremix wireplumber \ fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \ nautilus sushi ffmpegthumbnailer \ mpv evince imv \ From da597ac567b299f3fd43f95b3cf55bf0ced812ca Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 18 Jul 2025 22:39:25 -0500 Subject: [PATCH 3/3] Revert "Replace pavucontrol with wiremix (#225)" This reverts commit 620b397859698cdc8e6207d33533c70e0e795171. --- config/waybar/config.jsonc | 2 +- default/hypr/windows.conf | 6 +++--- install/desktop.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 25f4818..ed56d8a 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -96,7 +96,7 @@ }, "pulseaudio": { "format": "{icon}", - "on-click": "alacritty --class=Wiremix -e wiremix", + "on-click": "pavucontrol", "on-click-right": "pamixer -t", "tooltip-format": "Playing at {volume}%", "scroll-step": 5, diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf index 6f7520b..d8f0f04 100644 --- a/default/hypr/windows.conf +++ b/default/hypr/windows.conf @@ -5,10 +5,10 @@ windowrule = suppressevent maximize, class:.* windowrule = tile, class:^(Chromium)$ # Float and center settings and previews -windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$ -windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer)$ +windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$ +windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$ windowrule = size 645 350, class:Omarchy -windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$ +windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$ # Float and center file pickers windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save) diff --git a/install/desktop.sh b/install/desktop.sh index a23c358..33dfd9d 100644 --- a/install/desktop.sh +++ b/install/desktop.sh @@ -1,7 +1,7 @@ #!/bin/bash yay -S --noconfirm --needed \ - brightnessctl playerctl pamixer pavucontrol wiremix wireplumber \ + brightnessctl playerctl pamixer pavucontrol wireplumber \ fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \ nautilus sushi ffmpegthumbnailer \ mpv evince imv \