Merge pull request #2048 from basecamp/dev

Omarchy 3.0.2

bin/omarchy-cmd-screenrecord

@@ -15,7 +15,7 @@ SCOPE="$1"
 AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
 
 start_screenrecording() {
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
 
   if lspci | grep -qi 'nvidia'; then
     wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
@@ -47,7 +47,8 @@ screenrecording_active() {
 if screenrecording_active; then
   stop_screenrecording
 elif [[ "$SCOPE" == "output" ]]; then
-  start_screenrecording
+  output=$(slurp -o) || exit 1
+  start_screenrecording -g "$output"
 else
   region=$(slurp) || exit 1
   start_screenrecording -g "$region"

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*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

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

bin/omarchy-tui-install

@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=$TERMINAL --class $APP_CLASS -e $APP_EXEC
+Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

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
+}

install/config/all.sh

@@ -14,7 +14,6 @@ run_logged $OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh
 run_logged $OMARCHY_INSTALL/config/docker.sh
 run_logged $OMARCHY_INSTALL/config/mimetypes.sh
 run_logged $OMARCHY_INSTALL/config/localdb.sh
-run_logged $OMARCHY_INSTALL/config/fast-shutdown.sh
 run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
 run_logged $OMARCHY_INSTALL/config/hardware/network.sh
 run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
@@ -25,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

install/config/fast-shutdown.sh

@@ -1,7 +0,0 @@
-sudo mkdir -p /etc/systemd/system.conf.d
-
-cat <<EOF | sudo tee /etc/systemd/system.conf.d/10-faster-shutdown.conf
-[Manager]
-DefaultTimeoutStopSec=5s
-EOF
-sudo systemctl daemon-reload

install/config/hardware/fix-apple-bcm4360.sh

@@ -1,5 +0,0 @@
-# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip
-if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then
-  echo "Apple BCM4360 detected"
-  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
-fi

install/config/hardware/fix-apple-bcm43xx.sh

@@ -0,0 +1,11 @@
+# Install Wi-Fi drivers for Broadcom chips on MacBooks:
+# - BCM4360 (2013–2015)
+# - BCM4331 (2012, early 2013)
+
+pci_info=$(lspci -nnv)
+
+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

install/config/hardware/fix-apple-spi-keyboard.sh

@@ -1,7 +1,12 @@
 # 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
+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
-  echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
+  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

migrations/1758436991.sh

@@ -0,0 +1,17 @@
+echo "Fix Disk Usage and Docker TUIs"
+
+APP_DIR="$HOME/.local/share/applications"
+ICON_DIR="$APP_DIR/icons"
+
+# Don't use omarchy-tui-remove to preserve icons
+
+if [[ -f "$APP_DIR/Docker.desktop" ]]; then
+  rm "$APP_DIR/Docker.desktop"
+  omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
+fi
+
+if [[ -f "$APP_DIR/Disk Usage.desktop" ]]; then
+  rm "$APP_DIR/Disk Usage.desktop" 
+  omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
+fi
+

migrations/1758564460_enable_fast_shutdown.sh

@@ -1,2 +0,0 @@
-echo "Enable fast shutdown"
-source $OMARCHY_PATH/install/config/fast-shutdown.sh