From 8914d30be72d59ef7278fa96d5935047ff8f6e07 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 May 2026 11:15:21 +0200 Subject: [PATCH] Use hyphenated gaming command routes --- bin/omarchy-install-gaming-geforce-now | 2 ++ bin/omarchy-install-gaming-gpu-lib32 | 2 ++ bin/omarchy-install-gaming-xbox-cloud | 2 ++ bin/omarchy-install-gaming-xbox-controllers | 2 ++ bin/omarchy-remove-gaming-geforce-now | 2 ++ bin/omarchy-remove-gaming-xbox-controllers | 2 ++ default/omarchy/omarchy-menu.jsonc | 4 ++-- test/cli | 18 ++++++++++++++++++ 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/bin/omarchy-install-gaming-geforce-now b/bin/omarchy-install-gaming-geforce-now index 195c01ef..f740c344 100755 --- a/bin/omarchy-install-gaming-geforce-now +++ b/bin/omarchy-install-gaming-geforce-now @@ -1,6 +1,8 @@ #!/bin/bash # omarchy:summary=Install and launch Geforce Now. +# omarchy:group=install +# omarchy:name=gaming geforce-now set -e diff --git a/bin/omarchy-install-gaming-gpu-lib32 b/bin/omarchy-install-gaming-gpu-lib32 index fadfa7dc..2e4e3533 100755 --- a/bin/omarchy-install-gaming-gpu-lib32 +++ b/bin/omarchy-install-gaming-gpu-lib32 @@ -1,6 +1,8 @@ #!/bin/bash # omarchy:summary=Install lib32 graphics drivers (Vulkan + NVIDIA) for any detected GPUs. +# omarchy:group=install +# omarchy:name=gaming gpu-lib32 # omarchy:requires-sudo=true set -e diff --git a/bin/omarchy-install-gaming-xbox-cloud b/bin/omarchy-install-gaming-xbox-cloud index 8622949d..2367328f 100755 --- a/bin/omarchy-install-gaming-xbox-cloud +++ b/bin/omarchy-install-gaming-xbox-cloud @@ -1,6 +1,8 @@ #!/bin/bash # omarchy:summary=Install Xbox Cloud Gaming as a web app and launch it. +# omarchy:group=install +# omarchy:name=gaming xbox-cloud set -e diff --git a/bin/omarchy-install-gaming-xbox-controllers b/bin/omarchy-install-gaming-xbox-controllers index 539d0297..f4134f76 100755 --- a/bin/omarchy-install-gaming-xbox-controllers +++ b/bin/omarchy-install-gaming-xbox-controllers @@ -1,6 +1,8 @@ #!/bin/bash # omarchy:summary=Install support for using Xbox controllers with Steam/RetroArch/etc. +# omarchy:group=install +# omarchy:name=gaming xbox-controllers # omarchy:requires-sudo=true set -e diff --git a/bin/omarchy-remove-gaming-geforce-now b/bin/omarchy-remove-gaming-geforce-now index 9947ee10..c7d37444 100755 --- a/bin/omarchy-remove-gaming-geforce-now +++ b/bin/omarchy-remove-gaming-geforce-now @@ -1,6 +1,8 @@ #!/bin/bash # omarchy:summary=Remove the GeForce NOW Flatpak app and its data. +# omarchy:group=remove +# omarchy:name=gaming geforce-now set -e diff --git a/bin/omarchy-remove-gaming-xbox-controllers b/bin/omarchy-remove-gaming-xbox-controllers index d20af7e6..d841b128 100755 --- a/bin/omarchy-remove-gaming-xbox-controllers +++ b/bin/omarchy-remove-gaming-xbox-controllers @@ -1,6 +1,8 @@ #!/bin/bash # omarchy:summary=Remove the xpadneo Xbox controller driver and undo its module/blacklist config. +# omarchy:group=remove +# omarchy:name=gaming xbox-controllers # omarchy:requires-sudo=true set -e diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc index f73112f7..478c3792 100644 --- a/default/omarchy/omarchy-menu.jsonc +++ b/default/omarchy/omarchy-menu.jsonc @@ -199,7 +199,7 @@ "install.gaming.minecraft": {"icon":"󰍳","label":"Minecraft","action":"omarchy-install-and-launch Minecraft minecraft-launcher minecraft-launcher"}, "install.gaming.geforce-now": {"icon":"󰢹","label":"NVIDIA GeForce NOW","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-geforce-now"}, "install.gaming.xbox-cloud": {"icon":"","label":"Xbox Cloud Gaming","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-xbox-cloud"}, - "install.gaming.xbox-controller": {"icon":"󰂯","label":"Xbox Controller","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-xbox-controllers"}, + "install.gaming.xbox-controllers": {"icon":"󰂯","label":"Xbox Controllers","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-xbox-controllers"}, "install.gaming.battlenet": {"icon":"","label":"Battle.net","keywords":"blizzard wow overwatch diablo","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-battlenet"}, "install.gaming.lutris": {"icon":"","label":"Lutris","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-lutris"}, "install.gaming.heroic": {"icon":"󱓟","label":"Heroic (Epic Games)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-heroic"}, @@ -255,7 +255,7 @@ "remove.gaming.minecraft": {"icon":"󰍳","label":"Minecraft","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-minecraft"}, "remove.gaming.geforce-now": {"icon":"󰢹","label":"NVIDIA GeForce NOW","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-geforce-now"}, "remove.gaming.xbox-cloud": {"icon":"","label":"Xbox Cloud Gaming","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-xbox-cloud"}, - "remove.gaming.xbox-controller": {"icon":"󰖺","label":"Xbox Controller (󰂯)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-xbox-controllers"}, + "remove.gaming.xbox-controllers": {"icon":"󰖺","label":"Xbox Controllers (󰂯)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-xbox-controllers"}, "remove.gaming.moonlight": {"icon":"󰍹","label":"Moonlight (GameStream)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-moonlight"}, "remove.gaming.battlenet": {"icon":"","label":"Battle.net","when":"[[ -d $HOME/Games/battlenet ]]","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-battlenet"}, "remove.gaming.lutris": {"icon":"","label":"Lutris","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-lutris"}, diff --git a/test/cli b/test/cli index 82b3851b..0c875615 100755 --- a/test/cli +++ b/test/cli @@ -74,6 +74,24 @@ pass "benchmark command is discoverable in all commands" "$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-pkg-add" and .route == "omarchy pkg add" and .filename_route == "omarchy pkg add" and (.routes | index("omarchy pkg add")))' >/dev/null pass "JSON exposes direct pkg add route" +"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-xbox-cloud" and .route == "omarchy install gaming xbox-cloud" and .filename_route == "omarchy install gaming xbox cloud" and (.routes | index("omarchy install gaming xbox cloud")))' >/dev/null +pass "Xbox Cloud installer keeps hyphenated canonical route" + +"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-xbox-controllers" and .route == "omarchy install gaming xbox-controllers" and .filename_route == "omarchy install gaming xbox controllers" and (.routes | index("omarchy install gaming xbox controllers")))' >/dev/null +pass "Xbox controller installer keeps hyphenated canonical route" + +"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-remove-gaming-xbox-controllers" and .route == "omarchy remove gaming xbox-controllers" and .filename_route == "omarchy remove gaming xbox controllers" and (.routes | index("omarchy remove gaming xbox controllers")))' >/dev/null +pass "Xbox controller remover keeps hyphenated canonical route" + +"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-geforce-now" and .route == "omarchy install gaming geforce-now" and .filename_route == "omarchy install gaming geforce now" and (.routes | index("omarchy install gaming geforce now")))' >/dev/null +pass "GeForce NOW installer keeps hyphenated canonical route" + +"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-remove-gaming-geforce-now" and .route == "omarchy remove gaming geforce-now" and .filename_route == "omarchy remove gaming geforce now" and (.routes | index("omarchy remove gaming geforce now")))' >/dev/null +pass "GeForce NOW remover keeps hyphenated canonical route" + +"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-gpu-lib32" and .route == "omarchy install gaming gpu-lib32" and .filename_route == "omarchy install gaming gpu lib32" and (.routes | index("omarchy install gaming gpu lib32")))' >/dev/null +pass "GPU lib32 installer keeps hyphenated canonical route" + "$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-refresh-pacman" and .requires_sudo == true)' >/dev/null pass "sudo metadata marks sudo commands"