Merge upstream quattro for the Qt 6.12 palette fix (#14553)

Qt 6.12 shadows the bare Color singleton, so the bar and every Color role read undefined on fresh installs. Keep our I18n text in the four conflicting files, qualify #14433's notification button color, give the new dictation menu rows and notifications Chinese, and drop table entries for the removed Voxtype and FIDO2 texts.
2026-10-09 01:24:30 -04:00
commit fcd681c099
@@ -6,12 +6,16 @@ hl.layer_rule({ match = { namespace = "omarchy-bar" }, no_anim = true, animation

 -- Launcher, image selector, emojis, clipboard overlays, the OSD, reminders, the
 -- Wi-Fi QR code and keyboard-driven panels should pop without compositor layer
-- animations. The overlays stay mapped between opens and grow from a parked
-- 1x1 when shown, which Hyprland would otherwise animate as a slide in from
-- the corner. Panels keep their own QML opacity transition for normal
-- open/close, and skip it for panel handoff.
+-- animations. Overlays open as soon as their scale is ready, without a
+-- compositor fade or slide. Panels keep their own QML opacity transition
+-- for normal open/close, and skip it for panel handoff.
 hl.layer_rule({ match = { namespace = "^(omarchy-menu|omarchy-image-selector|omarchy-emojis|omarchy-clipboard|omarchy-keyboard-panel|omarchy-osd|omarchy-reminders|omarchy-network-qr)$" }, no_anim = true, animation = "none" })

+-- A boot intro hands the desktop between OWE's video layer and the shell's
+-- background layer. The media fades itself, so a compositor fade on either
+-- layer only dips the screen toward the empty desktop during the handoff.
+hl.layer_rule({ match = { namespace = "^(omarchy-background|owe-background)$" }, no_anim = true, animation = "none" })
+
 -- Dev gallery is the main shell workbench; open it maximized like
 -- SUPER+ALT+F so component previews have the whole workspace.
 o.window({ class = "^org.quickshell$", title = "^Omarchy shell – dev gallery$" }, { maximize = true })
@@ -1,4 +1,12 @@
+require("default.hypr.startup-cursor")
+
 hl.on("hyprland.start", function()
+  -- Applications inherit the user's cursor; only the compositor starts blank.
+  if omarchy_startup_cursor_pending then
+    hl.env("XCURSOR_PATH", omarchy_startup_cursor.path)
+    hl.env("XCURSOR_THEME", omarchy_startup_cursor.xcursor)
+  end
+
  -- Slow app launch fix -- set systemd vars before starting session services.
  hl.exec_cmd("systemctl --user import-environment $(env | cut -d'=' -f 1)")
  hl.exec_cmd("dbus-update-activation-environment --systemd --all")
@@ -0,0 +1,9 @@
+if o.shell_succeeds("omarchy-default-dictation") then
+  o.bind("SUPER + CTRL + X", "Toggle dictation", "omarchy-dictation toggle")
+  o.bind("F9", "Start dictation (push-to-talk)", "omarchy-dictation start")
+  o.bind("F9", "Stop dictation (push-to-talk)", "omarchy-dictation stop", { release = true })
+  -- A modifier's mask changes between its press and release. Match the keysym
+  -- independently of that mask; AltGr layouts use a different keysym.
+  o.bind("ALT + Alt_R", "Start dictation (push-to-talk)", "omarchy-dictation start", { ignore_mods = true })
+  o.bind("ALT + Alt_R", "Stop dictation (push-to-talk)", "omarchy-dictation stop", { release = true, ignore_mods = true })
+end
@@ -1,5 +0,0 @@
-if o.cmd_present("voxtype") then
-  o.bind("SUPER + CTRL + X", "Toggle dictation", "voxtype record toggle")
-  o.bind("F9", "Start dictation (push-to-talk)", "voxtype record start")
-  o.bind("F9", "Stop dictation (push-to-talk)", "voxtype record stop", { release = true })
-end
@@ -0,0 +1,24 @@
+-- Backends may supply their own desktop integration without editing the
+-- user's Hyprland config. Recording bindings remain owned by Omarchy.
+local paths = require("default.hypr.paths")
+local pipe = io.popen("omarchy-default-dictation 2>/dev/null", "r")
+if not pipe then
+  return
+end
+
+local backend = pipe:read("*l")
+pipe:close()
+
+if not backend or not backend:match("^[%w%-]+$") or o.cmd_missing("omarchy-dictation-" .. backend) then
+  return
+end
+
+local integration = paths.config_home .. "/" .. backend .. "/shortcuts.lua"
+local file = io.open(integration, "r")
+if file then
+  file:close()
+  local ok, error = pcall(dofile, integration)
+  if not ok then
+    print("Could not load dictation backend " .. backend .. ": " .. tostring(error))
+  end
+end
@@ -104,6 +104,7 @@ hl.config({
  misc = {
    disable_hyprland_logo = true,
    disable_splash_rendering = true,
+    background_color = "rgb(000000)",
    disable_scale_notification = true,
    focus_on_activate = true,
    anr_missed_pings = 3,
@@ -12,7 +12,7 @@ if _G.omarchy_default_bindings ~= false then
  require("default.hypr.bindings.jis")
  require("default.hypr.bindings.tiling")
  require("default.hypr.bindings.utilities")
-  require("default.hypr.bindings.voxtype")
+  require("default.hypr.bindings.dictation")
  require_optional.module("default.hypr.bindings.applications")
 end
 require("default.hypr.envs")
@@ -20,6 +20,7 @@ require("default.hypr.looknfeel")
 require("default.hypr.qconsole")
 require("default.hypr.input")
 require("default.hypr.windows")
+require("default.hypr.dictation-backend")

 -- Current theme overrides.
 require_optional.module("omarchy.current.theme.hyprland")
@@ -0,0 +1,46 @@
+-- Hyprland polls cursor.invisible, so its first frames need a blank cursor too.
+function omarchy_startup_cursor_restore(loaded)
+  if not omarchy_startup_cursor_pending then return end
+  local cursor = omarchy_startup_cursor
+  if loaded then
+    omarchy_startup_cursor_pending = false
+    hl.config({ cursor = cursor.config })
+    if cursor.config.enable_hyprcursor and cursor.hyprcursor then
+      hl.exec_cmd("hyprctl setcursor " .. o.shell_quote(cursor.hyprcursor) .. " " .. cursor.size)
+    end
+  elseif not cursor.restoring then
+    -- Reload the normal Xcursor fallback before enabling Hyprcursor or GSettings.
+    cursor.restoring = true
+    hl.exec_cmd("hyprctl setcursor " .. o.shell_quote(cursor.xcursor) .. " " .. cursor.size
+      .. " && hyprctl eval 'omarchy_startup_cursor_restore(true)'")
+  end
+end
+
+hl.on("config.reloaded", function()
+  if omarchy_startup_cursor_pending == nil then
+    -- Config updates in an existing compositor must not hide its pointer.
+    omarchy_startup_cursor_pending = #hl.get_monitors() == 0
+    if omarchy_startup_cursor_pending then
+      local hyprcursor = hl.get_config("cursor.enable_hyprcursor")
+      omarchy_startup_cursor = {
+        config = {
+          invisible = hl.get_config("cursor.invisible"),
+          enable_hyprcursor = hyprcursor,
+          sync_gsettings_theme = hl.get_config("cursor.sync_gsettings_theme"),
+        },
+        hyprcursor = os.getenv("HYPRCURSOR_THEME"),
+        size = tonumber((hyprcursor and os.getenv("HYPRCURSOR_SIZE")) or os.getenv("XCURSOR_SIZE")) or 24,
+        path = os.getenv("XCURSOR_PATH") or "~/.local/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps",
+        xcursor = os.getenv("XCURSOR_THEME") or "default",
+      }
+      if omarchy_startup_cursor.size <= 0 then omarchy_startup_cursor.size = 24 end
+      hl.env("XCURSOR_PATH", os.getenv("OMARCHY_PATH") .. "/default/hypr/cursors:" .. omarchy_startup_cursor.path)
+      hl.env("XCURSOR_THEME", "omarchy-startup")
+    end
+  end
+  if omarchy_startup_cursor_pending then
+    -- Keep the temporary cursor private to the compositor, including GSettings.
+    hl.config({ cursor = { invisible = true, enable_hyprcursor = false, sync_gsettings_theme = false } })
+    hl.timer(function() omarchy_startup_cursor_restore() end, { timeout = 15000, type = "oneshot" })
+  end
+end)
@@ -163,6 +163,9 @@
  "setup.default.browser.edge": {"icon":"󰇩","label":"Edge","checked":"[[ \"$(omarchy-default-browser)\" == \"edge\" ]]","action":"omarchy-default-browser edge"},
  "setup.default.browser.firefox": {"icon":"","label":"Firefox","checked":"[[ \"$(omarchy-default-browser)\" == \"firefox\" ]]","action":"omarchy-default-browser firefox"},
  "setup.default.browser.zen": {"icon":"󰖟","label":"Zen","checked":"[[ \"$(omarchy-default-browser)\" == \"zen\" ]]","action":"omarchy-default-browser zen"},
+  "setup.default.dictation": {"icon":"","label":"Dictation","title":"Default Dictation"},
+  "setup.default.dictation.superwhisper": {"icon":"","label":"Superwhisper","checked":"[[ \"$(omarchy-default-dictation)\" == \"superwhisper\" ]]","action":"omarchy-default-dictation superwhisper"},
+  "setup.default.dictation.voxtype": {"icon":"","label":"Voxtype","checked":"[[ \"$(omarchy-default-dictation)\" == \"voxtype\" ]]","action":"omarchy-default-dictation voxtype"},
  "setup.default.terminal": {"icon":"","label":"Terminal","title":"Default Terminal"},
  "setup.default.terminal.alacritty": {"icon":"","label":"Alacritty","checked":"[[ \"$(omarchy-default-terminal)\" == \"alacritty\" ]]","action":"omarchy-default-terminal alacritty"},
  "setup.default.terminal.foot": {"icon":"","label":"Foot","checked":"[[ \"$(omarchy-default-terminal)\" == \"foot\" ]]","action":"omarchy-default-terminal foot"},
@@ -267,7 +270,6 @@
  "install.terminal.kitty": {"icon":"","label":"Kitty","disabled":"omarchy-pkg-present kitty","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-terminal kitty'"},
  "install.ai.chatgpt": {"icon":"","iconFont":"omarchy","label":"ChatGPT Desktop","disabled":"omarchy-pkg-present openai-codex-desktop","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-ai-chatgpt"},
  "install.ai.claude": {"icon":"","iconFont":"omarchy","label":"Claude Desktop","disabled":"omarchy-pkg-present claude-desktop","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-ai-claude"},
-  "install.ai.dictation": {"icon":"","label":"Dictation","disabled":"omarchy-pkg-present voxtype-bin","action":"omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-install"},
  "install.ai.grok-bot": {"icon":"","iconFont":"omarchy","label":"Grok Bot","disabled":"omarchy-pkg-present grok-bot","action":"omarchy-install-and-launch 'Grok Bot' grok-bot grok-bot"},
  "install.ai.hermes": {"icon":"","iconFont":"omarchy","label":"Hermes Desktop","disabled":"omarchy-pkg-present hermes-desktop","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-ai-hermes"},
  "install.ai.lm-studio": {"icon":"","iconFont":"omarchy","label":"LM Studio","disabled":"omarchy-pkg-present lmstudio-bin","action":"omarchy-install-app 'LM Studio' lmstudio-bin"},
@@ -311,6 +313,7 @@
  // Remove
  "remove.package": {"icon":"󰣇","label":"Package","action":"xdg-terminal-exec --app-id=org.omarchy.terminal omarchy-pkg-remove"},
  "remove.ai": {"icon":"󱚤","label":"AI","title":"Remove"},
+  "remove.dictation": {"icon":"","label":"Dictation","when":"omarchy-pkg-present voxtype-bin || omarchy-pkg-present superwhisper-bin"},
  "remove.service": {"icon":"","label":"Services","title":"Remove"},
  "remove.development": {"icon":"󰵮","label":"Development","title":"Remove"},
  "remove.theme": {"icon":"󰸌","label":"Theme","action":"omarchy-theme-remove"},
@@ -338,7 +341,8 @@
  "remove.service.ssh-agent": {"icon":"󰣀","label":"SSH Agent","when":"systemctl --user -q is-enabled gcr-ssh-agent.socket","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-service-ssh-agent"},
  "remove.ai.chatgpt": {"icon":"","iconFont":"omarchy","label":"ChatGPT Desktop","when":"omarchy-pkg-present openai-codex-desktop","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-chatgpt"},
  "remove.ai.claude": {"icon":"","iconFont":"omarchy","label":"Claude Desktop","when":"omarchy-pkg-present claude-desktop","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-claude"},
-  "remove.ai.dictation": {"icon":"","label":"Dictation","when":"omarchy-pkg-present voxtype-bin","action":"omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-remove"},
+  "remove.dictation.superwhisper": {"icon":"","label":"Superwhisper","when":"omarchy-pkg-present superwhisper-bin","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-dictation-superwhisper"},
+  "remove.dictation.voxtype": {"icon":"","label":"Voxtype","when":"omarchy-pkg-present voxtype-bin","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-dictation-voxtype"},
  "remove.ai.grok-bot": {"icon":"","iconFont":"omarchy","label":"Grok Bot","when":"omarchy-pkg-present grok-bot","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-grok-bot"},
  "remove.ai.lm-studio": {"icon":"","iconFont":"omarchy","label":"LM Studio","when":"omarchy-pkg-present lmstudio-bin","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-lm-studio"},
  "remove.ai.ollama": {"icon":"","iconFont":"omarchy","label":"Ollama","when":"omarchy-pkg-present ollama","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-ollama"},
@@ -95,6 +95,7 @@
  "setup.network.qr": {"label":"二维码"},
  "setup.default": {"label":"默认程序"},
  "setup.default.agent": {"title":"默认 Agent"},
+  "setup.default.dictation": {"label":"语音听写","title":"默认语音听写"},
  "setup.default.browser": {"label":"浏览器","title":"默认浏览器"},
  "setup.default.terminal": {"label":"终端","title":"默认终端"},
  "setup.default.editor": {"label":"编辑器","title":"默认编辑器"},
@@ -125,7 +126,6 @@
  "install.terminal": {"label":"终端"},
  "install.preinstalls": {"label":"预装应用"},
  "install.service.chromium-account": {"label":"Chromium 账号"},
-  "install.ai.dictation": {"label":"语音听写"},
  "install.gaming.xbox-cloud": {"label":"Xbox 云游戏"},
  "install.gaming.xbox-controllers": {"label":"Xbox 手柄"},
  "install.gaming.retro-launcher": {"label":"RetroArch 启动器"},
@@ -142,7 +142,7 @@
  "remove.security": {"label":"安全","title":"移除"},
  "remove.security.fingerprint": {"label":"指纹"},
  "remove.security.sudoless-docker": {"label":"免 sudo Docker"},
-  "remove.ai.dictation": {"label":"语音听写"},
+  "remove.dictation": {"label":"语音听写"},
  "remove.gaming.xbox-cloud": {"label":"Xbox 云游戏"},
  "remove.gaming.xbox-controllers": {"label":"Xbox 手柄 (󰂯)"},
  "remove.development.javascript": {"title":"移除"},
@@ -16,6 +16,9 @@ SigLevel = Required DatabaseOptional
 LocalFileSigLevel = Optional

 # pacman searches repositories in the order defined here
+[omarchy]
+Server = https://pkgs.omarchy.org/edge/$arch
+
 [core]
 Include = /etc/pacman.d/mirrorlist

@@ -25,9 +28,6 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist

-[omarchy]
-Server = https://pkgs.omarchy.org/edge/$arch
-
 # Repositories for debug symbol packages.
 #
 # These upstream debug packages will only match core/extra/multilib packages from the Omarchy edge
@@ -16,6 +16,9 @@ SigLevel = Required DatabaseOptional
 LocalFileSigLevel = Optional

 # pacman searches repositories in the order defined here
+[omarchy]
+Server = https://pkgs.omarchy.org/rc/$arch
+
 [core]
 Include = /etc/pacman.d/mirrorlist

@@ -24,6 +27,3 @@ Include = /etc/pacman.d/mirrorlist

 [multilib]
 Include = /etc/pacman.d/mirrorlist
-
-[omarchy]
-Server = https://pkgs.omarchy.org/rc/$arch
@@ -16,6 +16,9 @@ SigLevel = Required DatabaseOptional
 LocalFileSigLevel = Optional

 # pacman searches repositories in the order defined here
+[omarchy]
+Server = https://pkgs.omarchy.org/stable/$arch
+
 [core]
 Include = /etc/pacman.d/mirrorlist

@@ -24,6 +27,3 @@ Include = /etc/pacman.d/mirrorlist

 [multilib]
 Include = /etc/pacman.d/mirrorlist
-
-[omarchy]
-Server = https://pkgs.omarchy.org/stable/$arch
@@ -53,6 +53,7 @@ hl.config({
  misc = {
    disable_hyprland_logo = true,
    disable_splash_rendering = true,
+    background_color = "rgb(000000)",
    force_default_wallpaper = 0,
  },

@@ -11,7 +11,7 @@
 state_file = "auto"

 [hotkey]
-# Hotkey is configured in Hyprland. Default is Super + Ctrl + X
+# Hotkeys are configured in Hyprland: hold Right Alt or F9, or toggle with Super + Ctrl + X.
 enabled = false

 [audio]