Merge pull request #1869 from bdbch/enhancement/add-lutris-to-gaming-menu

Add missing icon to Lutris installation

bin/omarchy-cmd-screenrecord

@@ -15,7 +15,7 @@ SCOPE="$1"
 AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
 
 start_screenrecording() {
-  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  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,8 +47,7 @@ screenrecording_active() {
 if screenrecording_active; then
   stop_screenrecording
 elif [[ "$SCOPE" == "output" ]]; then
-  output=$(slurp -o) || exit 1
-  start_screenrecording -g "$output"
+  start_screenrecording
 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* | helium-browser*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

bin/omarchy-menu

@@ -299,10 +299,13 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
+  case $(menu "Install" "Omarchy Gaming Helper\n  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n Heroic Launcher\n󰮂 Lutris") in
+  *Omarchy*) present_terminal omarchy-setup-gaming ;;
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) aur_install_and_launch "Minecraft [AUR]" "minecraft-launcher" "minecraft-launcher" ;;
+  *Heroic*) aur_install_and_launch "Heroic Launcher" "heroic-games-launcher-bin" "heroic" ;;
+  *Lutris*) aur_install_and_launch "Lutris" "lutris" "lutris" ;;
   *) show_install_menu ;;
   esac
 }

bin/omarchy-restart-pipewire

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-echo -e "Restarting pipewire audio service...\n"
+echo -e "Restarting pirewire audio service...\n"
 systemctl --user restart pipewire.service

bin/omarchy-setup-gaming

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+yay -S --noconfirm gamescope proton-ge-custom-bin
+
+mkdir -p ~/.config/systemd/user/
+
+cat > ~/.config/systemd/user/omarchy-gaming-helper.service << EOF
+[Unit]
+Description=Omarchy Gaming Helper
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=$OMARCHY_PATH/default/hypr/scripts/omarchy-gaming-helper.sh
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=default.target
+EOF
+
+systemctl --user daemon-reload
+
+systemctl --user enable omarchy-gaming-helper.service
+systemctl --user start omarchy-gaming-helper.service
+
+echo "Omarchy Gaming Helper service has been installed and started."

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,9 +15,3 @@ 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
-}

default/hypr/apps.conf

@@ -7,8 +7,6 @@ source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
 source = ~/.local/share/omarchy/default/hypr/apps/localsend.conf
 source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
 source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
-source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
-source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
 source = ~/.local/share/omarchy/default/hypr/apps/system.conf
 source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf
 source = ~/.local/share/omarchy/default/hypr/apps/walker.conf

default/hypr/gaming.conf

@@ -0,0 +1,5 @@
+# Gaming-specific tweaks
+source = ~/.local/share/omarchy/default/hypr/gaming/general-gaming.conf
+source = ~/.local/share/omarchy/default/hypr/gaming/blizzard.conf
+source = ~/.local/share/omarchy/default/hypr/gaming/retroarch.conf
+source = ~/.local/share/omarchy/default/hypr/gaming/steam.conf

default/hypr/gaming/blizzard.conf

@@ -0,0 +1,6 @@
+windowrule = tag +game, title:Hearthstone
+windowrule = tag +game, title:Overwatch
+windowrule = tag +game, title:.*Warcraft.*
+
+windowrule = tag -game, title:Battle.net.*
+windowrule = tag +game-launcher, title:Battle.net.*

default/hypr/gaming/general-gaming.conf

@@ -0,0 +1,20 @@
+windowrule = float, tag:game-launcher
+windowrule = center, tag:game-launcher
+windowrule = size 60% 60%, tag:game-launcher
+
+windowrule = immediate, tag:game
+windowrule = idleinhibit fullscreen, tag:game
+windowrule = opacity 1 1, tag:game
+windowrule = noshadow, tag:game
+windowrule = noborder, tag:game
+windowrule = noblur, tag:game
+
+windowrule = noborder, class:Xdg-desktop-portal-gtk
+windowrule = noblur, class:Xdg-desktop-portal-gtk
+windowrule = noshadow, class:Xdg-desktop-portal-gtk
+
+windowrule = tag +game, class:(steam_app.*|lutris|heroic|gamescope)
+
+# Fix positioning for steam games
+# windowrule = center, class:steam_app.*
+# windowrule = stayfocused, class:steam_app.*

default/hypr/gaming/steam.conf

@@ -1,6 +1,6 @@
 # Float Steam, fullscreen RetroArch
-windowrule = float, class:steam
-windowrule = center, class:steam, title:Steam
+# windowrule = float, class:steam
+# windowrule = center, class:steam, title:Steam
 windowrule = opacity 1 1, class:steam
 windowrule = size 1100 700, class:steam, title:Steam
 windowrule = size 460 800, class:steam, title:Friends List

default/hypr/scripts/omarchy-gaming-helper.sh

@@ -0,0 +1,143 @@
+#!/bin/bash
+
+# Gaming Helper for Hyprland
+# Runs as a service in the background to perform tasks that can't be accomplished with only 
+# hyprland rules
+# Usage: omarchy-gaming-helper.sh [--debug]
+
+DEBUG_MODE=0
+[[ "$1" == "--debug" ]] && DEBUG_MODE=1
+
+# Track if we have active games
+GAMES_ACTIVE=0
+
+log_debug() {
+    [[ $DEBUG_MODE -eq 1 ]] && gum log --level debug "$@"
+}
+
+log_info() {
+    gum log --level info "$@"
+}
+
+# Monitor Management
+apply_gaming_scale() {
+    log_info "Applying integer scaling for gaming"
+
+    # Get all monitors and apply integer scaling
+    hyprctl monitors -j | jq -r '.[] | "\(.name) \(.width) \(.height) \(.refreshRate) \(.x) \(.y) \(.scale)"' | \
+    while read -r name width height refresh x y scale; do
+        # Round scale to nearest integer
+        integer_scale=$(awk "BEGIN {printf \"%.0f\", $scale}")
+
+        log_info "Setting $name from scale $scale to $integer_scale"
+        hyprctl keyword monitor "$name,${width}x${height}@${refresh},${x}x${y},$integer_scale"
+    done
+}
+
+restore_monitor_settings() {
+    log_info "Restoring monitor settings"
+    hyprctl reload
+}
+
+# Game Detection
+is_steam_game() {
+    local class="$1"
+    [[ "$class" == steam_app_* ]]
+}
+
+count_active_games() {
+    hyprctl clients -j | jq -r '[.[] | select(.class | startswith("steam_app_"))] | length'
+}
+
+# Event Handlers
+handle_window_open() {
+    local event="$1"
+
+    # Parse: openwindow>>address,workspace,class,title
+    IFS=',' read -r address workspace class title <<< "${event#openwindow>>}"
+
+    if is_steam_game "$class"; then
+        log_info "Steam game opened: $title ($class)"
+
+        # Apply scaling on first game
+        if [[ $GAMES_ACTIVE -eq 0 ]]; then
+            apply_gaming_scale
+        fi
+        GAMES_ACTIVE=$((GAMES_ACTIVE + 1))
+
+        # Apply fullscreen
+        hyprctl dispatch fullscreenstate 2 2 "address:$address"
+    fi
+}
+
+handle_title_change() {
+    local event="$1"
+
+    # Parse: windowtitlev2>>address,title
+    IFS=',' read -r address title <<< "${event#windowtitlev2>>}"
+    address="${address#0x}"
+
+    # Get window class and tags
+    local window_info=$(hyprctl clients -j | jq -r --arg addr "0x$address" \
+        '.[] | select(.address == $addr) | "\(.class) \(.tags)"')
+
+    if [[ -z "$window_info" ]]; then
+        return
+    fi
+
+    read -r class tags <<< "$window_info"
+
+    # Handle gamescope windows (Battle.net, etc)
+    if [[ "$class" == "gamescope" ]]; then
+        if [[ "$tags" == *"game"* ]] && [[ "$tags" != *"game-launcher"* ]]; then
+            log_info "Gamescope game detected: $title"
+            hyprctl dispatch fullscreenstate 2 2 "address:0x$address"
+        elif [[ "$tags" == *"game-launcher"* ]]; then
+            log_info "Gamescope launcher detected: $title"
+            hyprctl dispatch fullscreenstate 0 0 "address:0x$address"
+        fi
+    fi
+}
+
+handle_window_close() {
+    local event="$1"
+    local address="${event#closewindow>>}"
+
+    # Count remaining games
+    local remaining_games=$(count_active_games)
+    log_debug "Window closed, remaining games: $remaining_games"
+
+    # Restore settings when last game closes
+    if [[ "$remaining_games" -eq 0 ]] && [[ $GAMES_ACTIVE -gt 0 ]]; then
+        log_info "No games remain, restoring settings"
+        restore_monitor_settings
+        GAMES_ACTIVE=0
+    else
+        GAMES_ACTIVE="$remaining_games"
+    fi
+}
+
+# Main Event Loop
+main() {
+    log_info "Gaming helper started (debug=$DEBUG_MODE)"
+
+    socat -U - UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock | \
+    while read -r event; do
+        log_debug "Event: ${event:0:80}..."
+
+        case "$event" in
+            openwindow*)
+                handle_window_open "$event"
+                ;;
+            windowtitlev2*)
+                handle_title_change "$event"
+                ;;
+            closewindow*)
+                handle_window_close "$event"
+                ;;
+        esac
+    done
+}
+
+# Start
+main

default/hypr/windows.conf

@@ -9,3 +9,4 @@ windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned
 
 # App-specific tweaks
 source = ~/.local/share/omarchy/default/hypr/apps.conf
+source = ~/.local/share/omarchy/default/hypr/gaming.conf

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-bcm43xx.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh

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

@@ -0,0 +1,5 @@
+# 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

@@ -1,11 +0,0 @@
-# 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,12 +1,7 @@
 # Detect MacBook models that need SPI keyboard modules
-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
+if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
   echo "Detected MacBook with SPI keyboard"
 
   sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
-  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
+  echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
 fi

migrations/1758436991.sh

@@ -1,17 +0,0 @@
-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
-