From b72eb206cbc17842d64a7150e06db6a9454f7ee1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 14 May 2026 11:34:26 +0200
Subject: [PATCH] Extract launch_on_start helper

---
 config/hypr/autostart.lua  |  4 +---
 default/hypr/autostart.lua | 30 ++++++++++++++----------------
 default/hypr/helpers.lua   |  6 ++++++
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/config/hypr/autostart.lua b/config/hypr/autostart.lua
index 5f444bb1..4db21193 100644
--- a/config/hypr/autostart.lua
+++ b/config/hypr/autostart.lua
@@ -1,4 +1,2 @@
 -- Extra autostart processes.
--- hl.on("hyprland.start", function()
---   hl.exec_cmd("uwsm-app -- my-service")
--- end)
+-- o.launch_on_start(o.launch("my-service"))
diff --git a/default/hypr/autostart.lua b/default/hypr/autostart.lua
index 7eed5fbb..24af418f 100644
--- a/default/hypr/autostart.lua
+++ b/default/hypr/autostart.lua
@@ -1,18 +1,16 @@
-hl.on("hyprland.start", function()
-  hl.exec_cmd("uwsm-app -- hypridle")
-  hl.exec_cmd("uwsm-app -- mako")
-  hl.exec_cmd("! omarchy-toggle-enabled waybar-off && uwsm-app -- waybar")
-  hl.exec_cmd("uwsm-app -- fcitx5 --disable notificationitem")
-  hl.exec_cmd("uwsm-app -- swaybg -i ~/.config/omarchy/current/background -m fill")
-  hl.exec_cmd("/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1")
-  hl.exec_cmd("omarchy-first-run")
-  hl.exec_cmd("omarchy-powerprofiles-init")
-  hl.exec_cmd("uwsm-app -- omarchy-hyprland-monitor-watch")
+o.launch_on_start(o.launch("hypridle"))
+o.launch_on_start(o.launch("mako"))
+o.launch_on_start("! omarchy-toggle-enabled waybar-off && " .. o.launch("waybar"))
+o.launch_on_start(o.launch("fcitx5 --disable notificationitem"))
+o.launch_on_start(o.launch("swaybg -i ~/.config/omarchy/current/background -m fill"))
+o.launch_on_start("/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1")
+o.launch_on_start("omarchy-first-run")
+o.launch_on_start("omarchy-powerprofiles-init")
+o.launch_on_start(o.launch("omarchy-hyprland-monitor-watch"))
 
-  -- Slow app launch fix -- set systemd vars.
-  hl.exec_cmd("systemctl --user import-environment $(env | cut -d'=' -f 1)")
-  hl.exec_cmd("dbus-update-activation-environment --systemd --all")
+-- Slow app launch fix -- set systemd vars.
+o.launch_on_start("systemctl --user import-environment $(env | cut -d'=' -f 1)")
+o.launch_on_start("dbus-update-activation-environment --systemd --all")
 
-  -- Run post-boot hooks after startup config has loaded.
-  hl.exec_cmd("sleep 2 && omarchy-hook post-boot")
-end)
+-- Run post-boot hooks after startup config has loaded.
+o.launch_on_start("sleep 2 && omarchy-hook post-boot")
diff --git a/default/hypr/helpers.lua b/default/hypr/helpers.lua
index 5a212118..15c5c3e4 100644
--- a/default/hypr/helpers.lua
+++ b/default/hypr/helpers.lua
@@ -24,6 +24,12 @@ function o.launch(command)
   return "uwsm-app -- " .. command
 end
 
+function o.launch_on_start(command)
+  hl.on("hyprland.start", function()
+    hl.exec_cmd(command)
+  end)
+end
+
 function o.launch_webapp(url)
   return "omarchy-launch-webapp " .. shell_quote(url)
 end