From 28c4814f5a688f5271af1f733bc89a1318ab1609 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 17 Sep 2025 21:03:44 +0200 Subject: [PATCH 01/25] Fix osaka jade theme for ghostty --- themes/osaka-jade/ghostty.conf | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/themes/osaka-jade/ghostty.conf b/themes/osaka-jade/ghostty.conf index 845659fb..f26aa996 100644 --- a/themes/osaka-jade/ghostty.conf +++ b/themes/osaka-jade/ghostty.conf @@ -1 +1,25 @@ -theme = TokyoNight +# primary +background = #111c18 +foreground = #C1C497 +cursor-color = #D7C995 +cursor-text = #000000 + +# normal colors +palette = 0=#23372B +palette = 1=#FF5345 +palette = 2=#549e6a +palette = 3=#459451 +palette = 4=#509475 +palette = 5=#D2689C +palette = 6=#2DD5B7 +palette = 7=#F6F5DD + +# bright colors +palette = 8=#53685B +palette = 9=#db9f9c +palette = 10=#143614 +palette = 11=#E5C736 +palette = 12=#ACD4CF +palette = 13=#75bbb3 +palette = 14=#8CD3CB +palette = 15=#9eebb3 From 19d1ee2b00e009c13ed89f7a3b125a1b93ab1c22 Mon Sep 17 00:00:00 2001 From: Michael Larsen Date: Thu, 18 Sep 2025 13:01:26 +0200 Subject: [PATCH 02/25] Added fix for ealy 2013 macbook pro's using an older chipset, BCM4331 --- .../hardware/{fix-apple-bcm4360.sh => fix-apple-bcm43xx.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename install/config/hardware/{fix-apple-bcm4360.sh => fix-apple-bcm43xx.sh} (100%) diff --git a/install/config/hardware/fix-apple-bcm4360.sh b/install/config/hardware/fix-apple-bcm43xx.sh similarity index 100% rename from install/config/hardware/fix-apple-bcm4360.sh rename to install/config/hardware/fix-apple-bcm43xx.sh From ad30ef6339be16bc3c5d0824e140aa9741943af9 Mon Sep 17 00:00:00 2001 From: Michael Larsen Date: Thu, 18 Sep 2025 14:53:04 +0200 Subject: [PATCH 03/25] Tried with a different approach for cleaner code --- install/config/hardware/fix-apple-bcm43xx.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh index f7d6d324..17a57d87 100644 --- a/install/config/hardware/fix-apple-bcm43xx.sh +++ b/install/config/hardware/fix-apple-bcm43xx.sh @@ -1,5 +1,16 @@ -# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip -if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then +# Install Wi-Fi drivers for Broadcom chips on MacBooks: +# - BCM4360 (2013–2015) +# - BCM4331 (2012, early 2013) + +# Grab the PCI ID string once +pci_info=$(lspci -nnv) + +if echo "$pci_info" | grep -q "14e4:43a0" && echo "$pci_info" | grep -q "106b:"; then echo "Apple BCM4360 detected" - sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers +# sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers +elif echo "$pci_info" | grep -q "14e4:4331" && echo "$pci_info" | grep -q "106b:"; then + echo "Apple BCM4331 detected" +# sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers +else + echo "No supported Broadcom chip detected" fi From 4d50c8bd336b898efc2cf5f6fb4c194d05fb0bc8 Mon Sep 17 00:00:00 2001 From: Michael Larsen Date: Thu, 18 Sep 2025 15:16:24 +0200 Subject: [PATCH 04/25] Clean up Tested the logic on the MacBook. It worked and the install of the drivers are reenabled. --- install/config/hardware/fix-apple-bcm43xx.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh index 17a57d87..1a479991 100644 --- a/install/config/hardware/fix-apple-bcm43xx.sh +++ b/install/config/hardware/fix-apple-bcm43xx.sh @@ -7,10 +7,8 @@ pci_info=$(lspci -nnv) if echo "$pci_info" | grep -q "14e4:43a0" && echo "$pci_info" | grep -q "106b:"; then echo "Apple BCM4360 detected" -# sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers + sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers elif echo "$pci_info" | grep -q "14e4:4331" && echo "$pci_info" | grep -q "106b:"; then echo "Apple BCM4331 detected" -# sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers -else - echo "No supported Broadcom chip detected" + sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers fi From a965a333ea2c4081b27278fe5dd80f3538754f30 Mon Sep 17 00:00:00 2001 From: Che-Wei Lin Date: Thu, 18 Sep 2025 23:18:51 +0800 Subject: [PATCH 05/25] fix: ghostty config typos --- config/ghostty/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ghostty/config b/config/ghostty/config index ee46b1d6..e8420d1b 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -12,7 +12,7 @@ window-padding-y = 14 confirm-close-surface=false resize-overlay = never -# Cursor stlying +# Cursor styling cursor-style = "block" cursor-style-blink = false shell-integration-features = no-cursor From 206930def8fdbef06e322a0cc9d53e942c5ec069 Mon Sep 17 00:00:00 2001 From: Omar Skalli Date: Thu, 18 Sep 2025 14:43:01 -0700 Subject: [PATCH 06/25] Improve theme-set-vscode to support jsonc and respect symlinks (#1756) --- bin/omarchy-theme-set-vscode | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/bin/omarchy-theme-set-vscode b/bin/omarchy-theme-set-vscode index 635ea287..1fa975d1 100755 --- a/bin/omarchy-theme-set-vscode +++ b/bin/omarchy-theme-set-vscode @@ -1,5 +1,8 @@ #!/bin/bash +# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments), +# which jq doesn’t support. + VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json" VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json" VS_CODE_SKIP_FLAG="$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes" @@ -15,12 +18,29 @@ if omarchy-cmd-present code && [[ ! -f "$VS_CODE_SKIP_FLAG" ]]; then code --install-extension "$extension" >/dev/null fi - # Update theme in settings.json - jq -n --arg t "$theme_name" '(input? // {}) | .["workbench.colorTheme"] = $t' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new" + # Create config file if there isn't already one + mkdir -p "$(dirname "$VS_CODE_SETTINGS")" + if [[ ! -f "$VS_CODE_SETTINGS" ]]; then + printf '{\n}\n' > "$VS_CODE_SETTINGS" + fi + + # Create a `workbench.colorTheme` entry in settings. + if ! grep -q '"workbench.colorTheme"' "$VS_CODE_SETTINGS"; then + # Insert `"workbench.colorTheme": "",` immediately after the first `{` + # Use sed's first-match range (0,/{/) to only replace the first `{` + sed -i --follow-symlinks -E '0,/\{/{s/\{/{\ + "workbench.colorTheme": "",/}' "$VS_CODE_SETTINGS" + fi + + # Update theme + sed -i --follow-symlinks -E \ + "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \ + "$VS_CODE_SETTINGS" else # Remove theme from settings.json when the theme doesn't have vscode support - jq 'del(.["workbench.colorTheme"])' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new" - fi + if [[ -f "$VS_CODE_SETTINGS" ]]; then + sed -i --follow-symlinks -E '/"workbench\.colorTheme"[[:space:]]*:[^,}]*,?/d' "$VS_CODE_SETTINGS" - mv "${VS_CODE_SETTINGS}.new" "$VS_CODE_SETTINGS" + fi + fi fi From ad155b254567cfa2ea038c98aa0527cbf051cc83 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 19 Sep 2025 05:32:47 -0500 Subject: [PATCH 07/25] Ghostty needs a very different scrollfactor than Alacritty and Kitty cc @mitchellh --- config/hypr/input.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/hypr/input.conf b/config/hypr/input.conf index 2a2d25c9..ca5f1f5e 100644 --- a/config/hypr/input.conf +++ b/config/hypr/input.conf @@ -27,8 +27,9 @@ input { } } -# Scroll faster in the terminal -windowrule = scrolltouchpad 1.5, tag:terminal +# Scroll nicely in the terminal +windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty) +windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty # Enable touchpad gestures for changing workspaces # See https://wiki.hyprland.org/Configuring/Gestures/ From 70661d5d5b245cd0d2c5be8e26dddbb9f5bf842b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20S=C3=B8rensen?= Date: Fri, 19 Sep 2025 21:40:54 +0200 Subject: [PATCH 08/25] Hide hyperland cursor while typing (#1812) --- default/hypr/looknfeel.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/default/hypr/looknfeel.conf b/default/hypr/looknfeel.conf index 254051f4..9b8f3077 100644 --- a/default/hypr/looknfeel.conf +++ b/default/hypr/looknfeel.conf @@ -87,3 +87,8 @@ misc { disable_splash_rendering = true focus_on_activate = true } + +# https://wiki.hypr.land/Configuring/Variables/#cursor +cursor { + hide_on_key_press = true +} From f60b9d1cb4cfdb256df4824df60cb820f2131931 Mon Sep 17 00:00:00 2001 From: Taha Date: Fri, 19 Sep 2025 12:41:52 -0700 Subject: [PATCH 09/25] Fix Matte Black theme ghostty and vscode configs (#1801) * Update Matte Black ghostty.conf with more color settings * Rename theme from 'MatteBlack' to 'Matte Black' --- themes/matte-black/ghostty.conf | 9 +++++++++ themes/matte-black/vscode.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/themes/matte-black/ghostty.conf b/themes/matte-black/ghostty.conf index 574e6577..85c69b15 100644 --- a/themes/matte-black/ghostty.conf +++ b/themes/matte-black/ghostty.conf @@ -1,3 +1,12 @@ +background = #121212 +foreground = #BEBEBE + +cursor-color = #EAEAEA +cursor-text = #121212 + +selection-background = #333333 +selection-foreground = #EAEAEA + # normal colors palette = 0=#333333 palette = 1=#D35F5F diff --git a/themes/matte-black/vscode.json b/themes/matte-black/vscode.json index ac592f5f..7786fc79 100644 --- a/themes/matte-black/vscode.json +++ b/themes/matte-black/vscode.json @@ -1,4 +1,4 @@ { - "name": "MatteBlack", + "name": "Matte Black", "extension": "TahaYVR.matteblack" } From e4ab5bee1460f5c003a918a7ca4d6942bf0c6629 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 19 Sep 2025 17:27:02 -0400 Subject: [PATCH 10/25] Catch obsidian vault dialog too --- default/hypr/apps/system.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default/hypr/apps/system.conf b/default/hypr/apps/system.conf index a718c951..cfbfe5ee 100644 --- a/default/hypr/apps/system.conf +++ b/default/hypr/apps/system.conf @@ -4,7 +4,7 @@ windowrule = center, tag:floating-window windowrule = size 800 600, tag:floating-window windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float) -windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open Folder|Save.*Files?|Save.*As|Save|All Files) +windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files) # Fullscreen screensaver windowrule = fullscreen, class:Screensaver From 779c1b9ecc5139d10cbc4fa01a904bbc0a136772 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 19 Sep 2025 17:44:03 -0400 Subject: [PATCH 11/25] Add Update > Hardware > Audio for restarting pipewire service --- bin/omarchy-menu | 3 ++- bin/omarchy-restart-pipewire | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 bin/omarchy-restart-pipewire diff --git a/bin/omarchy-menu b/bin/omarchy-menu index b93a4987..0dd68ec1 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -430,7 +430,8 @@ show_update_config_menu() { } show_update_hardware_menu() { - case $(menu "Restart" "󱚾 Wi-Fi\n󰂯 Bluetooth") in + case $(menu "Restart" " Audio\n󱚾 Wi-Fi\n󰂯 Bluetooth") in + *Audio*) present_terminal omarchy-restart-pipewire ;; *Wi-Fi*) present_terminal omarchy-restart-wifi ;; *Bluetooth*) present_terminal omarchy-restart-bluetooth ;; *) show_update_menu ;; diff --git a/bin/omarchy-restart-pipewire b/bin/omarchy-restart-pipewire new file mode 100755 index 00000000..f6a7260b --- /dev/null +++ b/bin/omarchy-restart-pipewire @@ -0,0 +1,4 @@ +#!/bin/bash + +echo -e "Restarting pirewire audio service...\n" +systemctl --user restart pipewire.service From ba743c623dc638dd8885c5728812289cea829db3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 19 Sep 2025 17:44:13 -0400 Subject: [PATCH 12/25] Give output on what's intended to happen --- bin/omarchy-restart-bluetooth | 1 + bin/omarchy-restart-wifi | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/omarchy-restart-bluetooth b/bin/omarchy-restart-bluetooth index 432e0022..1d3c6c11 100755 --- a/bin/omarchy-restart-bluetooth +++ b/bin/omarchy-restart-bluetooth @@ -1,4 +1,5 @@ #!/bin/bash +echo -e "Unblocking bluetooth...\n" rfkill unblock bluetooth rfkill list bluetooth diff --git a/bin/omarchy-restart-wifi b/bin/omarchy-restart-wifi index b8496d96..b4d66a5a 100755 --- a/bin/omarchy-restart-wifi +++ b/bin/omarchy-restart-wifi @@ -1,4 +1,5 @@ #!/bin/bash +echo -e "Unblocking wifi...\n" rfkill unblock wifi rfkill list wifi From ad01082a866f1c4bb526eb810fb8f7fa8f9abaad Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 19 Sep 2025 18:44:36 -0400 Subject: [PATCH 13/25] Ensure libyaml is available for installs made before that was on the ISO --- migrations/1758318253.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 migrations/1758318253.sh diff --git a/migrations/1758318253.sh b/migrations/1758318253.sh new file mode 100644 index 00000000..8503154e --- /dev/null +++ b/migrations/1758318253.sh @@ -0,0 +1,3 @@ +echo "Ensure libyaml is available for installing Ruby" + +omarchy-pkg-add libyaml From a746812504de8b6f66b27d45444e114a4e9595ef Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Fri, 19 Sep 2025 20:38:53 -0400 Subject: [PATCH 14/25] Limit pattern to prevent incorrect matches --- bin/omarchy-launch-or-focus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-launch-or-focus b/bin/omarchy-launch-or-focus index af63f007..a0075632 100755 --- a/bin/omarchy-launch-or-focus +++ b/bin/omarchy-launch-or-focus @@ -7,7 +7,7 @@ fi WINDOW_PATTERN="$1" LAUNCH_COMMAND="${2:-"uwsm app -- $WINDOW_PATTERN"}" -WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class+" "+.title)|test($p;"i"))|.address' | head -n1) +WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1) if [[ -n $WINDOW_ADDRESS ]]; then hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS" From 39c27939f306f2db7252e294c3144850b7f8f791 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 21 Sep 2025 07:51:04 -0400 Subject: [PATCH 15/25] No longer used Closes #1815 --- install/iso.sh | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 install/iso.sh diff --git a/install/iso.sh b/install/iso.sh deleted file mode 100644 index 7676ccc0..00000000 --- a/install/iso.sh +++ /dev/null @@ -1,14 +0,0 @@ -# Called by Omarchy ISO setup before starting configurator and archinstall - -source "$OMARCHY_INSTALL/preflight/set-size-vars.sh" -source "$OMARCHY_INSTALL/helpers/logo.sh" -source "$OMARCHY_INSTALL/preflight/gum.sh" -source "$OMARCHY_INSTALL/helpers/tail-log-output.sh" -source "$OMARCHY_INSTALL/helpers/trap-errors.sh" - -source $OMARCHY_INSTALL/helpers/chroot.sh -source $OMARCHY_INSTALL/helpers/logo.sh -source $OMARCHY_INSTALL/helpers/gum.sh -source $OMARCHY_INSTALL/helpers/errors.sh -source $OMARCHY_INSTALL/helpers/logging.sh -source $OMARCHY_INSTALL/helpers/layout.sh From a820b72da996d22e43fa4d120ad93f7e8c43c711 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 21 Sep 2025 07:55:52 -0400 Subject: [PATCH 16/25] Revert "Ensure libyaml is available for installs made before that was on the ISO" This reverts commit ad01082a866f1c4bb526eb810fb8f7fa8f9abaad. --- migrations/1758318253.sh | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 migrations/1758318253.sh diff --git a/migrations/1758318253.sh b/migrations/1758318253.sh deleted file mode 100644 index 8503154e..00000000 --- a/migrations/1758318253.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Ensure libyaml is available for installing Ruby" - -omarchy-pkg-add libyaml From 607915a5d1338cf2118b75b4a704abb0d3bf68c6 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 21 Sep 2025 18:12:21 -0400 Subject: [PATCH 17/25] Combine ifs --- install/config/hardware/fix-apple-bcm43xx.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh index 1a479991..1311a491 100644 --- a/install/config/hardware/fix-apple-bcm43xx.sh +++ b/install/config/hardware/fix-apple-bcm43xx.sh @@ -2,13 +2,10 @@ # - BCM4360 (2013–2015) # - BCM4331 (2012, early 2013) -# Grab the PCI ID string once pci_info=$(lspci -nnv) -if echo "$pci_info" | grep -q "14e4:43a0" && echo "$pci_info" | grep -q "106b:"; then - echo "Apple BCM4360 detected" - sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers -elif echo "$pci_info" | grep -q "14e4:4331" && echo "$pci_info" | grep -q "106b:"; then - echo "Apple BCM4331 detected" +if echo "$pci_info" | grep -q "106b:" && + (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then + echo "Apple BCM4360 / BCM4331 detected" sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers fi From 0f3e6f51010bc60de279469c1fede45cec7b89a8 Mon Sep 17 00:00:00 2001 From: Patrick Byrne Date: Thu, 25 Sep 2025 21:54:07 +0200 Subject: [PATCH 18/25] Add Helium browser to supported browsers list in omarchy-launch-webapp --- bin/omarchy-launch-webapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-launch-webapp b/bin/omarchy-launch-webapp index 0276d966..eeb3ad77 100755 --- a/bin/omarchy-launch-webapp +++ b/bin/omarchy-launch-webapp @@ -3,7 +3,7 @@ browser=$(xdg-settings get default-web-browser) case $browser in -google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;; +google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*) ;; *) browser="chromium.desktop" ;; esac From 3376838dfb6252a01314706e3ad547c8291e7d85 Mon Sep 17 00:00:00 2001 From: Patrick Byrne Date: Thu, 25 Sep 2025 21:59:37 +0200 Subject: [PATCH 19/25] Fix Helium browser detection in launch script --- bin/omarchy-launch-webapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-launch-webapp b/bin/omarchy-launch-webapp index eeb3ad77..441748ea 100755 --- a/bin/omarchy-launch-webapp +++ b/bin/omarchy-launch-webapp @@ -3,7 +3,7 @@ browser=$(xdg-settings get default-web-browser) case $browser in -google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*) ;; +google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;; *) browser="chromium.desktop" ;; esac From 96b64189a6159dff5c6cfb28aba26ed09331bec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20M=C3=ADnguez?= Date: Thu, 25 Sep 2025 22:58:55 +0200 Subject: [PATCH 20/25] feat: Added MacBook10,1 to the fix-apple-spi-keyboard.sh --- install/config/hardware/fix-apple-spi-keyboard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/config/hardware/fix-apple-spi-keyboard.sh b/install/config/hardware/fix-apple-spi-keyboard.sh index f549669f..14756789 100644 --- a/install/config/hardware/fix-apple-spi-keyboard.sh +++ b/install/config/hardware/fix-apple-spi-keyboard.sh @@ -1,5 +1,5 @@ # Detect MacBook models that need SPI keyboard modules -if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then +if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then echo "Detected MacBook with SPI keyboard" sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms From 25df782e2f54ad3a4b0cfb9d3b61f05717ec7d4e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 26 Sep 2025 18:52:27 +0200 Subject: [PATCH 21/25] Suggest how to have a smaller-than-max-width single window aspect ratio --- config/hypr/looknfeel.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/hypr/looknfeel.conf b/config/hypr/looknfeel.conf index 1816d776..39022b89 100644 --- a/config/hypr/looknfeel.conf +++ b/config/hypr/looknfeel.conf @@ -15,3 +15,9 @@ decoration { # Use round window corners # rounding = 8 } + +# https://wiki.hypr.land/Configuring/Dwindle-Layout/ +dwindle { + # Avoid overly wide single-window layouts on wide screens + # single_window_aspect_ratio = 1 1 +} From fba17b7da4eac2b5da077b08876de8a02850ffb9 Mon Sep 17 00:00:00 2001 From: "Joel Gaff, Jr" Date: Thu, 25 Sep 2025 21:53:08 -0700 Subject: [PATCH 22/25] Add more Mac models to SPI keyboard support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added: MacBook 8,1 MacBook 9,1 MacBook 8,1 uses slightly different moduels from what I can tell, so I’ve added a case statment. Please tweak as needed. --- install/config/hardware/fix-apple-spi-keyboard.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/install/config/hardware/fix-apple-spi-keyboard.sh b/install/config/hardware/fix-apple-spi-keyboard.sh index 14756789..46d1fed3 100644 --- a/install/config/hardware/fix-apple-spi-keyboard.sh +++ b/install/config/hardware/fix-apple-spi-keyboard.sh @@ -1,7 +1,14 @@ # Detect MacBook models that need SPI keyboard modules -if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then +if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then echo "Detected MacBook with SPI keyboard" sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms - echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + case "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" in + MacBook8,1) + echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + ;; + MacBook9,1|MacBook1[02],1|MacBookPro13,1|MacBookPro13,2|MacBookPro13,3|MacBookPro14,1|MacBookPro14,2|MacBookPro14,3) + echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + ;; + esac fi From cd39bbf692d047e575a1be1e3bbe1131a5f6edd3 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 28 Sep 2025 14:52:24 -0400 Subject: [PATCH 23/25] Fix conflict + rearrange --- .../config/hardware/fix-apple-spi-keyboard.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/install/config/hardware/fix-apple-spi-keyboard.sh b/install/config/hardware/fix-apple-spi-keyboard.sh index 46d1fed3..19fd88f6 100644 --- a/install/config/hardware/fix-apple-spi-keyboard.sh +++ b/install/config/hardware/fix-apple-spi-keyboard.sh @@ -1,14 +1,12 @@ # Detect MacBook models that need SPI keyboard modules -if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then +product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)" +if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then echo "Detected MacBook with SPI keyboard" sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms - case "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" in - MacBook8,1) - echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null - ;; - MacBook9,1|MacBook1[02],1|MacBookPro13,1|MacBookPro13,2|MacBookPro13,3|MacBookPro14,1|MacBookPro14,2|MacBookPro14,3) - echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null - ;; - esac + if [[ "$product_name" == "MacBook8,1" ]]; then + echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + else + echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + fi fi From 971422b757d9a748e269b53f76cb63bacad26be8 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 28 Sep 2025 15:02:54 -0400 Subject: [PATCH 24/25] Update install script name --- install/config/all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/config/all.sh b/install/config/all.sh index 1336dee3..a9affb79 100644 --- a/install/config/all.sh +++ b/install/config/all.sh @@ -24,6 +24,6 @@ run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh -run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh +run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm43xx.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh From ea6b6c6b7f0d5f54979f8be408eacacc3d9e9a34 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 28 Sep 2025 17:08:08 -0400 Subject: [PATCH 25/25] Typo --- bin/omarchy-restart-pipewire | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-restart-pipewire b/bin/omarchy-restart-pipewire index f6a7260b..f26ee09e 100755 --- a/bin/omarchy-restart-pipewire +++ b/bin/omarchy-restart-pipewire @@ -1,4 +1,4 @@ #!/bin/bash -echo -e "Restarting pirewire audio service...\n" +echo -e "Restarting pipewire audio service...\n" systemctl --user restart pipewire.service