Merge branch 'dev' into omarchy-shell

config/hypr/.luarc.json

@@ -6,6 +6,6 @@
     "checkThirdParty": false
   },
   "diagnostics": {
-    "globals": ["hl"]
+    "globals": ["hl", "o"]
   }
 }

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("my-service")

config/hypr/hyprland.lua

@@ -1,32 +1,14 @@
 -- Learn how to configure Hyprland: https://wiki.hypr.land/Configuring/Start/
 
-local home = os.getenv("HOME") or ""
+-- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
+package.path = os.getenv("HOME")
+  .. "/.config/?.lua;"
+  .. (os.getenv("OMARCHY_PATH") or (os.getenv("HOME") .. "/.local/share/omarchy"))
+  .. "/?.lua;"
+  .. package.path
 
--- Hyprland recommends require() for split Lua configs. These two roots let us
--- load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
-package.path = home .. "/.config/?.lua;" .. (os.getenv("OMARCHY_PATH") or (home .. "/.local/share/omarchy")) .. "/?.lua;" .. package.path
-
-local paths = require("default.hypr.paths")
-
--- Use Omarchy defaults, but don't edit these directly.
-require("default.hypr.autostart")
-require("default.hypr.bindings.media")
-require("default.hypr.bindings.clipboard")
-require("default.hypr.bindings.tiling-v2")
-require("default.hypr.bindings.utilities")
-require("default.hypr.envs")
-require("default.hypr.looknfeel")
-require("default.hypr.input")
-require("default.hypr.windows")
-
--- Current theme overrides.
-do
-  local theme = io.open(paths.config_home .. "/omarchy/current/theme/hyprland.lua", "r")
-  if theme then
-    theme:close()
-    require("omarchy.current.theme.hyprland")
-  end
-end
+-- All Omarchy default setups
+require("default.hypr.omarchy")
 
 -- Change your own setup in these files and override defaults.
 require("hypr.monitors")
@@ -39,4 +21,4 @@ require("hypr.autostart")
 require("default.hypr.toggles")
 
 -- Add any other personal Hyprland configuration below.
--- hl.window_rule({ match = { class = "qemu" }, workspace = "5" })
+-- o.window("qemu", { workspace = "5" })

config/hypr/input.lua

@@ -43,8 +43,8 @@ hl.config({
 })
 
 -- Scroll nicely in the terminal.
-hl.window_rule({ match = { class = "(Alacritty|kitty|foot)" }, scroll_touchpad = 1.5 })
-hl.window_rule({ match = { class = "com.mitchellh.ghostty" }, scroll_touchpad = 0.2 })
+o.window("(Alacritty|kitty|foot)", { scroll_touchpad = 1.5 })
+o.window("com.mitchellh.ghostty", { scroll_touchpad = 0.2 })
 
 -- Enable touchpad gestures for changing workspaces.
 -- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Gestures/