v1.0.2

.agents/settings.local.json

@@ -1,57 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(cat:*)",
-      "Bash(git -C /home/purian23/dms diff --stat .github/workflows/)",
-      "Bash(git -C /home/purian23/projects/danklinux diff --stat .github/workflows/)",
-      "Bash(git -C /home/purian23/dms diff .github/workflows/)",
-      "Bash(git -C /home/purian23/dms diff .github/workflows/run-ppa.yml)",
-      "Bash(osc cat:*)",
-      "Bash(ls:*)",
-      "Bash(find:*)",
-      "Bash(git show-ref:*)",
-      "Bash(git tag:*)",
-      "Bash(bash -c 'ALL_PATHS=$(grep -A 5 \"\"<service name=\\\"\"download_url\\\"\">\"\" distro/debian/dms/_service | grep \"\"<param name=\\\"\"path\\\"\">\"\" | sed \"\"s/.*<param name=\\\"\"path\\\"\">\\(.*\\)<\\/param>.*/\\1/\"\"); SOURCE_PATH=\"\"\"\"; for path in $ALL_PATHS; do if echo \"\"$path\"\" | grep -qE \"\"(source|archive|\\.tar\\.(gz|xz|bz2))\"\" && ! echo \"\"$path\"\" | grep -qE \"\"(distropkg|binary)\"\"; then SOURCE_PATH=\"\"$path\"\"; break; fi; done; echo \"\"Selected path: $SOURCE_PATH\"\"')",
-      "Bash(curl:*)",
-      "Bash(tar:*)",
-      "Bash(git -C /home/purian23/dms log:*)",
-      "Bash(osc status:*)",
-      "Bash(osc commit:*)",
-      "Bash(osc up:*)",
-      "Bash(osc results:*)",
-      "Bash(osc api:*)",
-      "Bash(systemctl:*)",
-      "Bash(dms version:*)",
-      "Bash(git describe:*)",
-      "Bash(qmlsc:*)",
-      "Bash(qmllint-qt6:*)",
-      "Bash(make fmt:*)",
-      "Bash(make test:*)",
-      "Bash(dms chroma list-styles:*)",
-      "Bash(python3:*)",
-      "Bash(time dms chroma:*)",
-      "Bash(dms chroma:*)",
-      "Bash(make build:*)",
-      "Bash(pgrep:*)",
-      "Bash(go build:*)",
-      "Bash(/tmp/dms-test chroma:*)",
-      "Bash(1)",
-      "Bash(go install:*)",
-      "Bash(grep:*)",
-      "Bash(journalctl:*)",
-      "Bash(qdbus:*)",
-      "Bash(TZ='Asia/Tokyo' date:*)",
-      "Bash(dms --help:*)",
-      "Bash(dms run:*)",
-      "Bash(dms status:*)",
-      "Bash(dms kill:*)",
-      "Bash(tee:*)",
-      "Bash(qmlscene:*)",
-      "Bash(quickshell --version:*)",
-      "WebFetch(domain:forum.qt.io)",
-      "Bash(gh api:*)",
-      "WebFetch(domain:github.com)",
-      "WebFetch(domain:raw.githubusercontent.com)"
-    ]
-  }
-}

.agents/skills/README.md

@@ -1,104 +0,0 @@
-# Agent Skills
-
-This directory contains agent skills following the [Agent Skills](https://agentskills.io) open standard - a portable, version-controlled format for giving AI agents specialized capabilities.
-
-Each skill is a directory with a `SKILL.md` entrypoint, optional reference docs, scripts, and templates. Agents load skills progressively: metadata at startup, full instructions on activation, and supporting files on demand.
-
-## Available Skills
-
-| Skill | Description |
-|-------|-------------|
-| [dms-plugin-dev](dms-plugin-dev/) | Develop plugins for DankMaterialShell - covers all 4 plugin types (widget, daemon, launcher, desktop), manifest creation, QML components, settings UI, data persistence, theme integration, and PopoutService usage. |
-
-## Installation
-
-The `.agents/skills/` directory at the project root is the standard location defined by the agentskills.io spec. Many agents discover skills from this path automatically. Some agents use their own directory conventions and need a symlink or copy.
-
-### Claude Code
-
-Claude Code discovers skills from `.claude/skills/` (project-level) or `~/.claude/skills/` (personal). To make skills from `.agents/skills/` available, symlink them into the Claude Code skills directory:
-
-**Project-level** (this repo only):
-
-```bash
-mkdir -p .claude/skills
-ln -s ../../.agents/skills/dms-plugin-dev .claude/skills/dms-plugin-dev
-```
-
-**Personal** (all your projects):
-
-```bash
-ln -s /path/to/DankMaterialShell/.agents/skills/dms-plugin-dev ~/.claude/skills/dms-plugin-dev
-```
-
-After linking, the skill appears in Claude Code's `/` menu as `/dms-plugin-dev`, and Claude loads it automatically when you ask about DMS plugin development.
-
-See the [Claude Code skills docs](https://code.claude.com/docs/en/skills) for more on skill configuration, invocation control, and frontmatter options.
-
-### Cursor
-
-Cursor discovers skills from `.cursor/skills/` in the project root:
-
-```bash
-mkdir -p .cursor/skills
-ln -s ../../.agents/skills/dms-plugin-dev .cursor/skills/dms-plugin-dev
-```
-
-See [Cursor skills docs](https://cursor.com/docs/context/skills) for details.
-
-### VS Code (Copilot)
-
-VS Code Copilot discovers skills from `.github/skills/` or `.vscode/skills/`:
-
-```bash
-mkdir -p .github/skills
-ln -s ../../.agents/skills/dms-plugin-dev .github/skills/dms-plugin-dev
-```
-
-See [VS Code skills docs](https://code.visualstudio.com/docs/copilot/customization/agent-skills) for details.
-
-### Gemini CLI
-
-Gemini CLI discovers skills from `.gemini/skills/` in the project root:
-
-```bash
-mkdir -p .gemini/skills
-ln -s ../../.agents/skills/dms-plugin-dev .gemini/skills/dms-plugin-dev
-```
-
-See [Gemini CLI skills docs](https://geminicli.com/docs/cli/skills/) for details.
-
-### OpenAI Codex
-
-Codex discovers skills from `.codex/skills/` in the project root:
-
-```bash
-mkdir -p .codex/skills
-ln -s ../../.agents/skills/dms-plugin-dev .codex/skills/dms-plugin-dev
-```
-
-See [Codex skills docs](https://developers.openai.com/codex/skills/) for details.
-
-### Other Agents
-
-The Agent Skills standard is supported by 30+ tools including Goose, Roo Code, JetBrains Junie, Amp, OpenCode, OpenHands, Kiro, and more. Most discover skills from a dot-directory at the project root (e.g., `.goose/skills/`, `.roo/skills/`). Some read `.agents/skills/` directly.
-
-Check the [Agent Skills client showcase](https://agentskills.io/clients) for setup instructions specific to your agent.
-
-The general pattern is:
-
-```bash
-mkdir -p .<agent>/skills
-ln -s ../../.agents/skills/dms-plugin-dev .<agent>/skills/dms-plugin-dev
-```
-
-## Adding New Skills
-
-To add a new skill to this directory:
-
-1. Create a subdirectory named with lowercase letters, numbers, and hyphens (e.g., `my-new-skill/`)
-2. Add a `SKILL.md` file with YAML frontmatter (`name`, `description`) and markdown instructions
-3. Optionally add `references/`, `scripts/`, and `assets/` subdirectories
-4. Keep `SKILL.md` under 500 lines - move detailed content to reference files
-
-See the [Agent Skills specification](https://agentskills.io/specification) for the full format.

.agents/skills/dms-plugin-dev/SKILL.md

@@ -1,497 +0,0 @@
----
-name: dms-plugin-dev
-description: >
-  Develop plugins for DankMaterialShell (DMS), a QML-based Linux desktop shell built on
-  Quickshell. Supports four plugin types: widget (bar + Control Center), daemon (background
-  service), launcher (search + actions), and desktop (draggable desktop widgets). Covers
-  manifest creation, QML component development, settings UI, data persistence, theme
-  integration, PopoutService usage, and external command execution. Use when the user wants
-  to create, modify, or debug a DMS plugin, or asks about the DMS plugin API.
-compatibility: Designed for Claude Code (or similar products)
-metadata:
-  author: DankMaterialShell
-  version: "1.0"
-  domain: qml-desktop-development
-  framework: DankMaterialShell
-  languages: qml, javascript
-allowed-tools: Bash Read Write Edit
----
-
-# DankMaterialShell Plugin Development
-
-## Overview
-
-DMS plugins extend the desktop shell with custom widgets, background services, launcher
-integrations, and desktop widgets. Plugins are QML components discovered from
-`~/.config/DankMaterialShell/plugins/`.
-
-**Minimum plugin structure:**
-
-```
-~/.config/DankMaterialShell/plugins/YourPlugin/
-  plugin.json        # Required: manifest with metadata
-  YourComponent.qml  # Required: main QML component
-  YourSettings.qml   # Optional: settings UI
-  *.js               # Optional: JavaScript utilities
-```
-
-**Plugin registry:** Community plugins are available at https://plugins.danklinux.com/
-
-**Four plugin types:**
-
-| Type       | Purpose                        | Base Component             | Bar pills | CC integration |
-|------------|--------------------------------|----------------------------|-----------|----------------|
-| `widget`   | Bar widget + popout            | `PluginComponent`          | Yes       | Yes            |
-| `daemon`   | Background service             | `PluginComponent` (no UI)  | No        | Optional       |
-| `launcher` | Searchable items in launcher   | `Item`                     | No        | No             |
-| `desktop`  | Draggable desktop widget       | `DesktopPluginComponent`   | No        | No             |
-
-## Step 1: Determine Plugin Type
-
-Choose the type based on what the plugin does:
-
-- **Shows in the bar?** - Use `widget`. Displays a pill in DankBar, optionally opens a popout,
-  optionally integrates with Control Center.
-- **Runs in background only?** - Use `daemon`. No visible UI, reacts to events (wallpaper
-  changes, notifications, battery level, etc.).
-- **Provides searchable/actionable items?** - Use `launcher`. Items appear in the DMS launcher
-  with trigger-based filtering (e.g., type `=` for calculator, `:` for emoji).
-- **Shows on the desktop background?** - Use `desktop`. Draggable, resizable widget on the
-  desktop layer.
-
-## Step 2: Create the Manifest
-
-Create `plugin.json` in your plugin directory. See [plugin-manifest-reference.md](references/plugin-manifest-reference.md) for the full schema.
-
-**Minimal manifest:**
-
-```json
-{
-    "id": "yourPlugin",
-    "name": "Your Plugin Name",
-    "description": "Brief description of what your plugin does",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "widget",
-    "capabilities": ["your-capability"],
-    "component": "./YourWidget.qml"
-}
-```
-
-**With settings and permissions:**
-
-```json
-{
-    "id": "yourPlugin",
-    "name": "Your Plugin Name",
-    "description": "Brief description",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "widget",
-    "capabilities": ["your-capability"],
-    "component": "./YourWidget.qml",
-    "icon": "extension",
-    "settings": "./Settings.qml",
-    "requires_dms": ">=0.1.0",
-    "permissions": ["settings_read", "settings_write"]
-}
-```
-
-**Key rules:**
-- `id` must be camelCase, matching pattern `^[a-zA-Z][a-zA-Z0-9]*$`
-- `version` must be semver (e.g., `1.0.0`)
-- `component` must start with `./` and end with `.qml`
-- `type: "launcher"` requires a `trigger` field
-- `settings_write` permission is **required** if the plugin has a settings component
-
-## Step 3: Create the Main Component
-
-### Widget
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    property var popoutService: null
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: "Hello"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    verticalBarPill: Component {
-        StyledRect {
-            width: parent.widgetThickness
-            height: label.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: "Hi"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeSmall
-                rotation: 90
-            }
-        }
-    }
-}
-```
-
-See [widget-plugin-guide.md](references/widget-plugin-guide.md) for popouts, CC integration, and advanced features.
-
-### Launcher
-
-```qml
-import QtQuick
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "#"
-
-    signal itemsChanged()
-
-    function getItems(query) {
-        const items = [
-            { name: "Item One", icon: "material:star", comment: "Description",
-              action: "toast:Hello!", categories: ["MyPlugin"] }
-        ]
-        if (!query) return items
-        const q = query.toLowerCase()
-        return items.filter(i => i.name.toLowerCase().includes(q))
-    }
-
-    function executeItem(item) {
-        const [type, ...rest] = item.action.split(":")
-        const data = rest.join(":")
-        if (type === "toast") ToastService?.showInfo(data)
-        else if (type === "copy") Quickshell.execDetached(["dms", "cl", "copy", data])
-    }
-}
-```
-
-See [launcher-plugin-guide.md](references/launcher-plugin-guide.md) for triggers, icon types, context menus, and image tiles.
-
-### Desktop
-
-```qml
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 200
-    property real widgetHeight: 200
-    property real minWidth: 150
-    property real minHeight: 150
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: 0.85
-        border.color: root.editMode ? Theme.primary : "transparent"
-        border.width: root.editMode ? 2 : 0
-
-        Text {
-            anchors.centerIn: parent
-            text: "Desktop Widget"
-            color: Theme.surfaceText
-        }
-    }
-}
-```
-
-See [desktop-plugin-guide.md](references/desktop-plugin-guide.md) for sizing, persistence, and edit mode.
-
-### Daemon
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    property var popoutService: null
-
-    Connections {
-        target: SessionData
-        function onSomeSignal() {
-            console.log("Event received")
-        }
-    }
-}
-```
-
-See [daemon-plugin-guide.md](references/daemon-plugin-guide.md) for event-driven patterns and process execution.
-
-## Step 4: Add Settings (Optional)
-
-Wrap settings in `PluginSettings` with your `pluginId`. All settings auto-save and auto-load.
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "yourPlugin"
-
-    StringSetting {
-        settingKey: "apiKey"
-        label: "API Key"
-        description: "Your API key"
-        placeholder: "sk-..."
-    }
-
-    ToggleSetting {
-        settingKey: "enabled"
-        label: "Enable Feature"
-        defaultValue: true
-    }
-
-    SelectionSetting {
-        settingKey: "interval"
-        label: "Refresh Interval"
-        options: [
-            { label: "1 min", value: "60" },
-            { label: "5 min", value: "300" }
-        ]
-        defaultValue: "300"
-    }
-}
-```
-
-**Available setting components:** StringSetting, ToggleSetting, SelectionSetting, SliderSetting, ColorSetting, ListSetting, ListSettingWithInput.
-
-See [settings-components-reference.md](references/settings-components-reference.md) for full property lists.
-
-**Important:** Your plugin must declare `"permissions": ["settings_write"]` in plugin.json, or the settings UI will show an error.
-
-## Step 5: Use Data Persistence
-
-Three tiers of persistence:
-
-| API | Persisted | Use case |
-|-----|-----------|----------|
-| `pluginService.savePluginData(id, key, val)` / `loadPluginData(id, key, default)` | Yes (settings.json) | User preferences, config |
-| `pluginService.savePluginState(id, key, val)` / `loadPluginState(id, key, default)` | Yes (separate state file) | Runtime state, history, cache |
-| `PluginGlobalVar { varName; defaultValue; value; set() }` | No (runtime only) | Cross-instance shared state |
-
-- `pluginData` is a reactive property on PluginComponent, auto-loaded from settings
-- React to settings changes with `Connections { target: pluginService; function onPluginDataChanged(id) { ... } }`
-- Global vars sync across all instances (multi-monitor, multiple bar sections)
-
-See [data-persistence-guide.md](references/data-persistence-guide.md) for details and examples.
-
-## Step 6: Theme Integration
-
-Always use `Theme.*` properties from `qs.Common` - never hardcode colors or sizes.
-
-**Essential properties:**
-- Colors: `Theme.surfaceContainerHigh`, `Theme.surfaceText`, `Theme.primary`, `Theme.onPrimary`
-- Fonts: `Theme.fontSizeSmall` (12), `Theme.fontSizeMedium` (14), `Theme.fontSizeLarge` (16), `Theme.fontSizeXLarge` (20)
-- Spacing: `Theme.spacingXS`, `Theme.spacingS`, `Theme.spacingM`, `Theme.spacingL`, `Theme.spacingXL`
-- Radius: `Theme.cornerRadius`, `Theme.cornerRadiusSmall`, `Theme.cornerRadiusLarge`
-- Icons: `Theme.iconSizeSmall` (16), `Theme.iconSize` (24), `Theme.iconSizeLarge` (32)
-
-**Common widgets from `qs.Widgets`:** `StyledText`, `StyledRect`, `DankIcon`, `DankButton`, `DankToggle`, `DankTextField`, `DankSlider`, `DankGridView`, `CachingImage`.
-
-See [theme-reference.md](references/theme-reference.md) for the complete property list.
-
-## Step 7: Add Popout Content (Widgets Only)
-
-Add a popout that opens when the bar pill is clicked:
-
-```qml
-PluginComponent {
-    popoutWidth: 400
-    popoutHeight: 300
-
-    popoutContent: Component {
-        PopoutComponent {
-            headerText: "My Plugin"
-            detailsText: "Optional subtitle"
-            showCloseButton: true
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingM
-
-                StyledText {
-                    text: "Content here"
-                    color: Theme.surfaceText
-                }
-            }
-        }
-    }
-
-    horizontalBarPill: Component { /* ... */ }
-    verticalBarPill: Component { /* ... */ }
-}
-```
-
-**PopoutComponent properties:** `headerText`, `detailsText`, `showCloseButton`, `closePopout()` (auto-injected), `headerHeight` (readonly), `detailsHeight` (readonly).
-
-Calculate available content height: `popoutHeight - headerHeight - detailsHeight - spacing`
-
-## Step 8: Control Center Integration (Widgets Only)
-
-Add your widget to the Control Center grid:
-
-```qml
-PluginComponent {
-    ccWidgetIcon: "toggle_on"
-    ccWidgetPrimaryText: "My Feature"
-    ccWidgetSecondaryText: isActive ? "On" : "Off"
-    ccWidgetIsActive: isActive
-
-    onCcWidgetToggled: {
-        isActive = !isActive
-        pluginService?.savePluginData(pluginId, "active", isActive)
-    }
-
-    // Optional: expandable detail panel (for CompoundPill)
-    ccDetailContent: Component {
-        Rectangle {
-            implicitHeight: 200
-            color: Theme.surfaceContainerHigh
-            radius: Theme.cornerRadius
-        }
-    }
-}
-```
-
-**CC sizing:** 25% width = SmallToggleButton (icon only), 50% width = ToggleButton or CompoundPill (if ccDetailContent is defined).
-
-## Step 9: External Commands and Clipboard
-
-**Run commands and capture output:**
-
-```qml
-import qs.Common
-
-Proc.runCommand(
-    "myPlugin.fetch",
-    ["curl", "-s", "https://api.example.com/data"],
-    (stdout, exitCode) => {
-        if (exitCode === 0) processData(stdout)
-    },
-    500  // debounce ms
-)
-```
-
-**Fire-and-forget (clipboard, notifications):**
-
-```qml
-import Quickshell
-
-Quickshell.execDetached(["dms", "cl", "copy", textToCopy])
-```
-
-**Long-running processes:** Use the `Process` QML component from `Quickshell.Io` with `StdioCollector`.
-
-**Shell commands with pipes:** `["sh", "-c", "ps aux | grep foo"]`
-
-**Do NOT use** `globalThis.clipboard` or browser JavaScript APIs - they don't exist in the QML runtime.
-
-## Step 10: Validate and Test
-
-1. Validate `plugin.json` against the schema at [assets/plugin-schema.json](assets/plugin-schema.json)
-2. Run the shell with verbose output: `qs -v -p $CONFIGPATH/quickshell/dms/shell.qml`
-3. Open Settings > Plugins > Scan for Plugins
-4. Enable your plugin and add it to the DankBar layout
-
-**Common issues:**
-- Plugin not detected: check plugin.json syntax with `jq . plugin.json`
-- Widget not showing: ensure it's enabled AND added to a DankBar section
-- Settings error: verify `settings_write` permission is declared
-- Data not persisting: check pluginService injection and permissions
-
-## Common Mistakes
-
-1. **Missing `settings_write` permission** - Settings UI shows error without it
-2. **Missing `property var popoutService: null`** - Must declare for injection to work
-3. **Missing vertical bar pill** - Widget disappears when bar is on left/right edge
-4. **Hardcoded colors** - Use `Theme.*` properties, not hex values
-5. **Using `globalThis.clipboard`** - Does not exist; use `Quickshell.execDetached(["dms", "cl", "copy", text])`
-6. **Wrong Theme property names** - `Theme.fontSizeS` does not exist, use `Theme.fontSizeSmall`
-7. **Wrong import for Quickshell** - Use `import Quickshell` (not `import QtQuick` for execDetached)
-8. **Forgetting `categories` in launcher items** - Items won't display without it
-9. **Not handling null pluginService** - Always use optional chaining or null checks
-10. **Using `PluginComponent` for launchers** - Launchers use plain `Item`, not `PluginComponent`
-
-## Quick Reference: Imports
-
-**Widget / Daemon:**
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-```
-
-**Launcher:**
-```qml
-import QtQuick
-import qs.Services
-```
-
-**Desktop:**
-```qml
-import QtQuick
-import qs.Common
-```
-
-**For clipboard/exec:** `import Quickshell`
-**For processes:** `import Quickshell.Io`
-**For networking:** `import Quickshell.Networking`
-**For toast notifications:** access `ToastService` from `qs.Services`
-
-## Quick Reference: File Naming
-
-- **Directory name:** PascalCase (e.g., `MyAwesomePlugin/`)
-- **Plugin ID:** camelCase (e.g., `myAwesomePlugin`)
-- **QML files:** PascalCase (e.g., `MyWidget.qml`, `Settings.qml`)
-- **Component paths in manifest:** relative with `./` prefix (e.g., `"./MyWidget.qml"`)
-- **JS utility files:** camelCase (e.g., `utils.js`, `apiAdapter.js`)
-
-## Reference Files
-
-Load these on demand for detailed API documentation:
-
-- [plugin-manifest-reference.md](references/plugin-manifest-reference.md) - Complete plugin.json field reference and JSON schema
-- [widget-plugin-guide.md](references/widget-plugin-guide.md) - PluginComponent, bar pills, popouts, click actions, CC integration
-- [launcher-plugin-guide.md](references/launcher-plugin-guide.md) - getItems/executeItem, triggers, icon types, context menus, tile view
-- [desktop-plugin-guide.md](references/desktop-plugin-guide.md) - DesktopPluginComponent, sizing, edit mode, position persistence
-- [daemon-plugin-guide.md](references/daemon-plugin-guide.md) - Event-driven background services, process execution
-- [settings-components-reference.md](references/settings-components-reference.md) - All 7 setting components with complete property lists
-- [theme-reference.md](references/theme-reference.md) - Theme colors, spacing, fonts, radii, common patterns
-- [data-persistence-guide.md](references/data-persistence-guide.md) - pluginData, state API, global variables
-- [popout-service-reference.md](references/popout-service-reference.md) - PopoutService API for controlling shell popouts and modals
-- [advanced-patterns.md](references/advanced-patterns.md) - Variants, JS utilities, qmldir, IPC, multi-file plugins

.agents/skills/dms-plugin-dev/assets/plugin-schema.json

@@ -1,115 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://danklinux.com/schemas/plugin.json",
-  "title": "DankMaterialShell Plugin Manifest",
-  "description": "Schema for DankMaterialShell plugin.json manifest files",
-  "type": "object",
-  "required": [
-    "id",
-    "name",
-    "description",
-    "version",
-    "author",
-    "type",
-    "capabilities",
-    "component"
-  ],
-  "properties": {
-    "id": {
-      "type": "string",
-      "description": "Unique plugin identifier (camelCase, no spaces)",
-      "pattern": "^[a-zA-Z][a-zA-Z0-9]*$"
-    },
-    "name": {
-      "type": "string",
-      "description": "Human-readable plugin name",
-      "minLength": 1
-    },
-    "description": {
-      "type": "string",
-      "description": "Short description of plugin functionality",
-      "minLength": 1
-    },
-    "version": {
-      "type": "string",
-      "description": "Semantic version string (e.g., '1.0.0')",
-      "pattern": "^\\d+\\.\\d+\\.\\d+(-[a-zA-Z0-9.-]+)?(\\+[a-zA-Z0-9.-]+)?$"
-    },
-    "author": {
-      "type": "string",
-      "description": "Plugin creator name or email",
-      "minLength": 1
-    },
-    "type": {
-      "type": "string",
-      "description": "Plugin type",
-      "enum": ["widget", "daemon", "launcher", "desktop"]
-    },
-    "capabilities": {
-      "type": "array",
-      "description": "Array of plugin capabilities",
-      "items": {
-        "type": "string"
-      },
-      "minItems": 1
-    },
-    "component": {
-      "type": "string",
-      "description": "Relative path to main QML component file",
-      "pattern": "^\\./.*\\.qml$"
-    },
-    "trigger": {
-      "type": "string",
-      "description": "Trigger string for launcher activation (required for launcher type)"
-    },
-    "icon": {
-      "type": "string",
-      "description": "Material Design icon name"
-    },
-    "settings": {
-      "type": "string",
-      "description": "Path to settings component QML file",
-      "pattern": "^\\./.*\\.qml$"
-    },
-    "requires_dms": {
-      "type": "string",
-      "description": "Minimum DMS version requirement (e.g., '>=0.1.18', '>0.1.0')",
-      "pattern": "^(>=?|<=?|=|>|<)\\d+\\.\\d+\\.\\d+$"
-    },
-    "requires": {
-      "type": "array",
-      "description": "Array of required system tools/dependencies",
-      "items": {
-        "type": "string"
-      }
-    },
-    "permissions": {
-      "type": "array",
-      "description": "Required capabilities",
-      "items": {
-        "type": "string",
-        "enum": [
-          "settings_read",
-          "settings_write",
-          "process",
-          "network"
-        ]
-      }
-    }
-  },
-  "allOf": [
-    {
-      "if": {
-        "properties": {
-          "type": {
-            "const": "launcher"
-          }
-        }
-      },
-      "then": {
-        "required": ["trigger"]
-      }
-    }
-  ],
-  "additionalProperties": true
-}

.agents/skills/dms-plugin-dev/assets/templates/daemon/Daemon.qml

@@ -1,48 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    // TODO: Read configuration from settings
-    property string configValue: pluginData?.configValue || ""
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            configValue = pluginService.loadPluginData(pluginId, "configValue", "")
-        }
-    }
-
-    // TODO: Connect to the service events you need
-    // Connections {
-    //     target: SessionData
-    //     function onWallpaperPathChanged() {
-    //         console.log("[MyDaemon] Wallpaper changed:", SessionData.wallpaperPath)
-    //         handleEvent(SessionData.wallpaperPath)
-    //     }
-    // }
-
-    function handleEvent(data) {
-        Proc.runCommand(
-            "myDaemon.handle",
-            ["echo", "Event received:", data],
-            (stdout, exitCode) => {
-                if (exitCode === 0) {
-                    console.log("[MyDaemon] Output:", stdout)
-                } else {
-                    console.error("[MyDaemon] Failed:", exitCode)
-                    ToastService?.showInfo("Daemon action failed")
-                }
-            }
-        )
-    }
-
-    Component.onCompleted: {
-        console.log("[MyDaemon] Started")
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/daemon/Settings.qml

@@ -1,16 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myDaemon"
-
-    StringSetting {
-        settingKey: "configValue"
-        label: "Configuration"
-        description: "Value used by the daemon"
-        placeholder: "Enter value..."
-        defaultValue: ""
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/daemon/plugin.json

@@ -1,13 +0,0 @@
-{
-    "id": "myDaemon",
-    "name": "My Daemon",
-    "description": "A background service that reacts to events",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "daemon",
-    "capabilities": ["background-service"],
-    "component": "./Daemon.qml",
-    "icon": "settings",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write", "process"]
-}

.agents/skills/dms-plugin-dev/assets/templates/desktop/Settings.qml

@@ -1,18 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myDesktopWidget"
-
-    SliderSetting {
-        settingKey: "opacity"
-        label: "Opacity"
-        description: "Widget background opacity"
-        defaultValue: 85
-        minimum: 10
-        maximum: 100
-        unit: "%"
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/desktop/Widget.qml

@@ -1,47 +0,0 @@
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 200
-    property real widgetHeight: 200
-    property real minWidth: 150
-    property real minHeight: 150
-
-    // TODO: Load settings reactively
-    property real bgOpacity: {
-        if (!pluginService) return 0.85
-        var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-        return val / 100
-    }
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-            bgOpacity = val / 100
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: root.bgOpacity
-        border.color: root.editMode ? Theme.primary : "transparent"
-        border.width: root.editMode ? 2 : 0
-
-        // TODO: Add your widget content here
-        Text {
-            anchors.centerIn: parent
-            text: "Desktop Widget"
-            color: Theme.surfaceText
-            font.pixelSize: Theme.fontSizeLarge
-        }
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/desktop/plugin.json

@@ -1,13 +0,0 @@
-{
-    "id": "myDesktopWidget",
-    "name": "My Desktop Widget",
-    "description": "A custom desktop widget",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "desktop",
-    "capabilities": ["desktop-widget"],
-    "component": "./Widget.qml",
-    "icon": "widgets",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}

.agents/skills/dms-plugin-dev/assets/templates/launcher/Launcher.qml

@@ -1,59 +0,0 @@
-import QtQuick
-import Quickshell
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "#"
-
-    signal itemsChanged()
-
-    // TODO: Define your items
-    property var allItems: [
-        {
-            name: "Example Item",
-            icon: "material:star",
-            comment: "An example launcher item",
-            action: "toast:Hello from my launcher!",
-            categories: ["MyLauncher"]
-        }
-    ]
-
-    function getItems(query) {
-        if (!query || query.length === 0) return allItems
-
-        var q = query.toLowerCase()
-        return allItems.filter(function(item) {
-            return item.name.toLowerCase().includes(q) ||
-                   item.comment.toLowerCase().includes(q)
-        })
-    }
-
-    function executeItem(item) {
-        var actionParts = item.action.split(":")
-        var actionType = actionParts[0]
-        var actionData = actionParts.slice(1).join(":")
-
-        switch (actionType) {
-            case "toast":
-                if (typeof ToastService !== "undefined")
-                    ToastService.showInfo(actionData)
-                break
-            case "copy":
-                Quickshell.execDetached(["dms", "cl", "copy", actionData])
-                if (typeof ToastService !== "undefined")
-                    ToastService.showInfo("Copied to clipboard")
-                break
-            default:
-                console.warn("Unknown action type:", actionType)
-        }
-    }
-
-    Component.onCompleted: {
-        if (pluginService) {
-            trigger = pluginService.loadPluginData("myLauncher", "trigger", "#")
-        }
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/launcher/Settings.qml

@@ -1,23 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myLauncher"
-
-    StringSetting {
-        settingKey: "trigger"
-        label: "Trigger"
-        description: "Type this prefix in the launcher to activate the plugin"
-        placeholder: "#"
-        defaultValue: "#"
-    }
-
-    ToggleSetting {
-        settingKey: "noTrigger"
-        label: "Always Visible"
-        description: "Show items alongside regular apps without needing a trigger"
-        defaultValue: false
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/launcher/plugin.json

@@ -1,14 +0,0 @@
-{
-    "id": "myLauncher",
-    "name": "My Launcher",
-    "description": "Custom launcher plugin with searchable items",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "launcher",
-    "capabilities": ["launcher"],
-    "component": "./Launcher.qml",
-    "trigger": "#",
-    "icon": "search",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}

.agents/skills/dms-plugin-dev/assets/templates/widget/Settings.qml

@@ -1,23 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myWidget"
-
-    StringSetting {
-        settingKey: "text"
-        label: "Display Text"
-        description: "Text shown in the bar widget"
-        placeholder: "Hello"
-        defaultValue: "Hello"
-    }
-
-    ToggleSetting {
-        settingKey: "showIcon"
-        label: "Show Icon"
-        description: "Display an icon next to the text"
-        defaultValue: true
-    }
-}

.agents/skills/dms-plugin-dev/assets/templates/widget/Widget.qml

@@ -1,75 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    // TODO: Read settings reactively
-    property string displayText: pluginData?.text || "Hello"
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            displayText = pluginService.loadPluginData(pluginId, "text", "Hello")
-        }
-    }
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.displayText
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    verticalBarPill: Component {
-        StyledRect {
-            width: parent.widgetThickness
-            height: label.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.displayText
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeSmall
-                rotation: 90
-            }
-        }
-    }
-
-    // TODO: Uncomment and customize popout content
-    // popoutWidth: 350
-    // popoutHeight: 300
-    // popoutContent: Component {
-    //     PopoutComponent {
-    //         headerText: "My Widget"
-    //         showCloseButton: true
-    //
-    //         Column {
-    //             width: parent.width
-    //             spacing: Theme.spacingM
-    //
-    //             StyledText {
-    //                 text: "Popout content here"
-    //                 color: Theme.surfaceText
-    //             }
-    //         }
-    //     }
-    // }
-}

.agents/skills/dms-plugin-dev/assets/templates/widget/plugin.json

@@ -1,13 +0,0 @@
-{
-    "id": "myWidget",
-    "name": "My Widget",
-    "description": "A custom bar widget",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "widget",
-    "capabilities": ["dankbar-widget"],
-    "component": "./Widget.qml",
-    "icon": "extension",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}

.agents/skills/dms-plugin-dev/references/advanced-patterns.md

@@ -1,320 +0,0 @@
-# Advanced Patterns
-
-Patterns observed in production DMS plugins that go beyond the basics.
-
-## Plugin Variants
-
-Create multiple widget instances from a single plugin definition. Each variant has its own configuration.
-
-### Manifest
-
-No special manifest changes needed - the variant system is built into PluginComponent.
-
-### Widget with Variant Support
-
-```qml
-PluginComponent {
-    property string variantId: ""
-    property var variantData: ({})
-
-    property string displayText: variantData?.text || "Default"
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.displayText
-            }
-        }
-    }
-}
-```
-
-Widget format in bar config: `pluginId:variantId` (e.g., `exampleVariants:variant_1234567890`)
-
-### Settings with Variant Management
-
-```qml
-PluginSettings {
-    pluginId: "exampleVariants"
-
-    // Variant creation UI
-    DankButton {
-        text: "Add New Instance"
-        onClicked: {
-            var id = "variant_" + Date.now()
-            root.createVariant(id, { name: "New Instance", text: "Hello" })
-        }
-    }
-
-    // Per-variant configuration
-    Repeater {
-        model: root.variants
-        delegate: Column {
-            StringSetting {
-                settingKey: modelData.id + "_text"
-                label: modelData.name || modelData.id
-            }
-        }
-    }
-}
-```
-
-## JavaScript Utility Files
-
-For complex logic, split into `.js` files:
-
-### utils.js
-
-```javascript
-.pragma library
-
-function formatDuration(ms) {
-    if (ms < 60000) return "just now"
-    if (ms < 3600000) return Math.floor(ms / 60000) + "m ago"
-    return Math.floor(ms / 3600000) + "h ago"
-}
-
-function parseResponse(json) {
-    try {
-        return JSON.parse(json)
-    } catch (e) {
-        return null
-    }
-}
-```
-
-### Using in QML
-
-```qml
-import "utils.js" as Utils
-
-Item {
-    StyledText {
-        text: Utils.formatDuration(Date.now() - timestamp)
-    }
-}
-```
-
-The `.pragma library` directive makes the JS file a shared singleton - it is loaded once and shared across all QML instances that import it.
-
-## qmldir for Singleton Services
-
-For plugins with internal singleton services:
-
-### qmldir
-
-```
-singleton MyService 1.0 MyService.qml
-```
-
-### MyService.qml
-
-```qml
-pragma Singleton
-import QtQuick
-
-QtObject {
-    property var cache: ({})
-
-    function getData(key) {
-        return cache[key] || null
-    }
-
-    function setData(key, value) {
-        cache[key] = value
-    }
-}
-```
-
-### Using the singleton
-
-```qml
-import "." as Local
-
-Item {
-    Component.onCompleted: {
-        Local.MyService.setData("key", "value")
-    }
-}
-```
-
-## Inline Component Declarations
-
-Reusable sub-components defined inline:
-
-```qml
-Item {
-    component StatusBadge: Rectangle {
-        property string label: ""
-        property color badgeColor: Theme.primary
-
-        width: badgeText.implicitWidth + Theme.spacingM * 2
-        height: 24
-        radius: 12
-        color: badgeColor
-
-        StyledText {
-            id: badgeText
-            anchors.centerIn: parent
-            text: label
-            color: Theme.onPrimary
-            font.pixelSize: Theme.fontSizeSmall
-        }
-    }
-
-    Row {
-        spacing: Theme.spacingS
-        StatusBadge { label: "Running"; badgeColor: Theme.success }
-        StatusBadge { label: "Stopped"; badgeColor: Theme.error }
-    }
-}
-```
-
-## Multi-Provider Adapter Pattern
-
-For plugins supporting multiple backends (AI providers, API services):
-
-### apiAdapters.js
-
-```javascript
-.pragma library
-
-function createAdapter(provider) {
-    switch (provider) {
-        case "openai": return {
-            url: "https://api.openai.com/v1/chat/completions",
-            headers: (key) => ({ "Authorization": "Bearer " + key }),
-            formatRequest: (messages) => JSON.stringify({ model: "gpt-4", messages: messages }),
-            parseResponse: (text) => JSON.parse(text).choices[0].message.content
-        }
-        case "anthropic": return {
-            url: "https://api.anthropic.com/v1/messages",
-            headers: (key) => ({ "x-api-key": key, "anthropic-version": "2023-06-01" }),
-            formatRequest: (messages) => JSON.stringify({ model: "claude-sonnet-4-20250514", messages: messages }),
-            parseResponse: (text) => JSON.parse(text).content[0].text
-        }
-        default: return null
-    }
-}
-```
-
-## IPC Integration
-
-For plugins that respond to keyboard shortcuts or external commands:
-
-```qml
-PluginComponent {
-    Connections {
-        target: DMSIpc
-        function onCommandReceived(command, args) {
-            if (command === "myPlugin.toggle") {
-                doToggle()
-            } else if (command === "myPlugin.next") {
-                goNext()
-            }
-        }
-    }
-}
-```
-
-External trigger: `dms ipc call myPlugin.toggle`
-
-## Networking with Quickshell.Networking
-
-For API calls using the built-in networking module:
-
-```qml
-import Quickshell.Networking
-
-Item {
-    NetworkRequest {
-        id: request
-        url: "https://api.example.com/data"
-        method: "GET"
-
-        onResponseReceived: (response) => {
-            const data = JSON.parse(response.body)
-            processData(data)
-        }
-
-        onErrorOccurred: (error) => {
-            console.error("Network error:", error)
-        }
-    }
-
-    function fetchData() {
-        request.send()
-    }
-}
-```
-
-## Toast Notifications
-
-Show user feedback:
-
-```qml
-import qs.Services
-
-// Info toast
-ToastService?.showInfo("Operation completed")
-
-// With title
-ToastService?.showInfo("Plugin Name", "Data refreshed successfully")
-```
-
-Always use optional chaining since ToastService may not be available in all contexts.
-
-## Clipboard Operations
-
-```qml
-import Quickshell
-
-function copyToClipboard(text) {
-    Quickshell.execDetached(["dms", "cl", "copy", text])
-    ToastService?.showInfo("Copied to clipboard")
-}
-```
-
-Do NOT use `globalThis.clipboard`, `navigator.clipboard`, or any browser API - they do not exist in the QML runtime.
-
-## Multi-File Plugin Architecture
-
-Large plugins can be split across multiple files:
-
-```
-MyPlugin/
-  plugin.json
-  Main.qml           # Main widget component
-  Settings.qml       # Settings UI
-  DetailView.qml     # Popout detail view
-  utils.js            # Utility functions
-  apiAdapter.js       # API adapter layer
-  qmldir              # Optional: singleton registrations
-```
-
-Import sibling files:
-
-```qml
-// In Main.qml
-import "." as Local
-
-Item {
-    Loader {
-        source: "DetailView.qml"
-    }
-}
-```
-
-## Performance Tips
-
-1. Use `Proc.runCommand` with appropriate debounce for external commands
-2. Pre-cache images and thumbnails for image-heavy plugins
-3. Limit concurrent network requests
-4. Use `Timer` with reasonable intervals (don't poll faster than needed)
-5. Lazy-load heavy content (use `Loader` for complex popout content)
-6. Avoid blocking the UI thread with synchronous operations

.agents/skills/dms-plugin-dev/references/daemon-plugin-guide.md

@@ -1,272 +0,0 @@
-# Daemon Plugin Guide
-
-Daemon plugins are invisible background services that react to events and execute actions. They have no bar pills or desktop presence.
-
-## Base Component
-
-Daemons use `PluginComponent` with no bar pills:
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    // Event-driven logic goes here
-}
-```
-
-## When to Use Daemons
-
-- Monitor system events (wallpaper changes, battery level, notifications)
-- Run periodic background tasks (polling APIs, checking system state)
-- Execute scripts in response to events
-- Control shell UI via PopoutService based on conditions
-
-## Event-Driven Pattern
-
-Use `Connections` to react to service signals:
-
-```qml
-PluginComponent {
-    property var popoutService: null
-
-    Connections {
-        target: SessionData
-        function onWallpaperPathChanged() {
-            console.log("Wallpaper changed to:", SessionData.wallpaperPath)
-            runScript(SessionData.wallpaperPath)
-        }
-    }
-
-    Connections {
-        target: BatteryService
-        function onPercentageChanged() {
-            if (BatteryService.percentage < 10 && !BatteryService.isCharging) {
-                popoutService?.openBattery()
-            }
-        }
-    }
-}
-```
-
-## Available Services
-
-Common services daemons can connect to:
-
-| Service | Signals/Properties | Description |
-|---------|-------------------|-------------|
-| `SessionData` | `wallpaperPath`, `onWallpaperPathChanged` | Desktop session state |
-| `BatteryService` | `percentage`, `isCharging`, `batteryAvailable` | Battery status |
-| `NotificationService` | `onNotificationReceived(notification)` | Desktop notifications |
-| `PluginService` | `onPluginLoaded`, `onGlobalVarChanged` | Plugin lifecycle |
-
-Import services from `qs.Services`.
-
-## Process Execution
-
-### Simple command with Proc
-
-```qml
-import qs.Common
-
-PluginComponent {
-    function runScript(arg) {
-        Proc.runCommand(
-            "myDaemon.script",
-            ["bash", "-c", "echo 'Processing: " + arg + "'"],
-            (stdout, exitCode) => {
-                if (exitCode === 0) {
-                    console.log("Script output:", stdout)
-                } else {
-                    ToastService?.showInfo("Script failed: exit " + exitCode)
-                }
-            }
-        )
-    }
-}
-```
-
-### Long-running process with Process component
-
-```qml
-import Quickshell.Io
-
-PluginComponent {
-    property string scriptPath: ""
-
-    Process {
-        id: proc
-        command: ["bash", scriptPath]
-        running: false
-
-        stdout: StdioCollector {
-            onTextReceived: (text) => {
-                console.log("stdout:", text)
-            }
-        }
-
-        stderr: StdioCollector {
-            onTextReceived: (text) => {
-                console.error("stderr:", text)
-            }
-        }
-
-        onExited: (exitCode) => {
-            if (exitCode !== 0) {
-                ToastService?.showInfo("Process failed: exit " + exitCode)
-            }
-        }
-    }
-
-    function startProcess() {
-        if (scriptPath && !proc.running) {
-            proc.running = true
-        }
-    }
-}
-```
-
-## Timer-Based Polling
-
-```qml
-PluginComponent {
-    Timer {
-        interval: 60000  // every minute
-        running: true
-        repeat: true
-        onTriggered: checkStatus()
-    }
-
-    function checkStatus() {
-        Proc.runCommand(
-            "myDaemon.check",
-            ["sh", "-c", "systemctl is-active myservice"],
-            (stdout, exitCode) => {
-                const active = stdout.trim() === "active"
-                PluginService.setGlobalVar("myDaemon", "serviceActive", active)
-            }
-        )
-    }
-}
-```
-
-## Data Persistence
-
-Daemons access PluginService directly (it's injected via PluginComponent):
-
-```qml
-PluginComponent {
-    property string configuredScript: pluginData?.scriptPath || ""
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId === pluginId) {
-                configuredScript = pluginService.loadPluginData(pluginId, "scriptPath", "")
-            }
-        }
-    }
-}
-```
-
-## PopoutService Usage
-
-Daemons can control shell UI via the injected popoutService:
-
-```qml
-PluginComponent {
-    property var popoutService: null
-
-    function showAlert() {
-        popoutService?.openNotificationCenter()
-    }
-
-    function openSettings() {
-        popoutService?.openSettings()
-    }
-}
-```
-
-See [popout-service-reference.md](popout-service-reference.md) for the full API.
-
-## Complete Example
-
-Based on the WallpaperWatcherDaemon:
-
-```qml
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    property string scriptPath: pluginData?.scriptPath || ""
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId === pluginId) {
-                scriptPath = pluginService.loadPluginData(pluginId, "scriptPath", "")
-            }
-        }
-    }
-
-    Connections {
-        target: SessionData
-        function onWallpaperPathChanged() {
-            if (scriptPath) {
-                runWallpaperScript(SessionData.wallpaperPath)
-            }
-        }
-    }
-
-    function runWallpaperScript(wallpaperPath) {
-        console.log("[WallpaperWatcher] Running script:", scriptPath, wallpaperPath)
-
-        Proc.runCommand(
-            "wallpaperWatcher.run",
-            ["bash", scriptPath, wallpaperPath],
-            (stdout, exitCode) => {
-                if (exitCode === 0) {
-                    console.log("[WallpaperWatcher] Script output:", stdout)
-                } else {
-                    console.error("[WallpaperWatcher] Script failed:", exitCode)
-                    ToastService?.showInfo("Wallpaper script failed")
-                }
-            }
-        )
-    }
-
-    Component.onCompleted: {
-        console.log("[WallpaperWatcher] Daemon started")
-    }
-}
-```
-
-## Manifest Example
-
-```json
-{
-    "id": "wallpaperWatcher",
-    "name": "Wallpaper Watcher",
-    "description": "Runs a script when the wallpaper changes",
-    "version": "1.0.0",
-    "author": "Developer",
-    "type": "daemon",
-    "capabilities": ["wallpaper-automation"],
-    "component": "./WallpaperWatcher.qml",
-    "icon": "wallpaper",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write", "process"]
-}
-```

.agents/skills/dms-plugin-dev/references/data-persistence-guide.md

@@ -1,176 +0,0 @@
-# Data Persistence Guide
-
-DMS plugins have three tiers of data persistence, each suited for different use cases.
-
-## Tier 1: Plugin Data (Settings)
-
-Persisted to `settings.json`. Use for user preferences and configuration.
-
-### Saving
-
-```qml
-pluginService.savePluginData(pluginId, "key", value)
-```
-
-### Loading
-
-```qml
-var value = pluginService.loadPluginData(pluginId, "key", defaultValue)
-```
-
-### Reactive Access via pluginData
-
-`PluginComponent` has a reactive `pluginData` property that auto-loads from settings:
-
-```qml
-PluginComponent {
-    property string displayText: pluginData?.text || "Default"
-    property bool showIcon: pluginData?.showIcon !== undefined ? pluginData.showIcon : true
-}
-```
-
-### Reacting to Settings Changes
-
-When settings are changed (e.g., from the settings UI), react with `Connections`:
-
-```qml
-Connections {
-    target: pluginService
-    function onPluginDataChanged(changedId) {
-        if (changedId !== pluginId) return
-        displayText = pluginService.loadPluginData(pluginId, "text", "Default")
-        showIcon = pluginService.loadPluginData(pluginId, "showIcon", true)
-    }
-}
-```
-
-## Tier 2: Plugin State
-
-Persisted to a separate state file. Use for runtime state that should survive restarts but is not user-configurable (history, cache, counters).
-
-### Saving
-
-```qml
-pluginService.savePluginState(pluginId, "key", value)
-```
-
-### Loading
-
-```qml
-var state = pluginService.loadPluginState(pluginId, "key", defaultValue)
-```
-
-### Additional Methods
-
-```qml
-pluginService.clearPluginState(pluginId)
-pluginService.removePluginStateKey(pluginId, "key")
-```
-
-### Example: Persistent History
-
-```qml
-Item {
-    property var history: []
-
-    Component.onCompleted: {
-        history = pluginService?.loadPluginState(pluginId, "history", []) || []
-    }
-
-    function addToHistory(entry) {
-        history.unshift({
-            text: entry,
-            timestamp: Date.now()
-        })
-        if (history.length > 100) history = history.slice(0, 100)
-        pluginService?.savePluginState(pluginId, "history", history)
-    }
-
-    function clearHistory() {
-        history = []
-        pluginService?.removePluginStateKey(pluginId, "history")
-    }
-}
-```
-
-## Tier 3: Global Variables (Runtime Only)
-
-NOT persisted. Shared across all instances of a plugin. Use for cross-instance state synchronization (multi-monitor consistency, multi-instance widgets).
-
-### Using PluginGlobalVar Component
-
-```qml
-import qs.Modules.Plugins
-
-PluginComponent {
-    PluginGlobalVar {
-        id: globalCounter
-        varName: "counter"
-        defaultValue: 0
-    }
-
-    horizontalBarPill: Component {
-        StyledRect {
-            // ...
-            StyledText {
-                text: "Count: " + globalCounter.value
-            }
-
-            MouseArea {
-                onClicked: globalCounter.set(globalCounter.value + 1)
-            }
-        }
-    }
-}
-```
-
-**PluginGlobalVar properties:**
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `varName` | string | Required: name of the global variable |
-| `defaultValue` | any | Optional: default if not set |
-| `value` | any | Readonly: current value |
-
-**Methods:**
-- `set(newValue)` - update the value (triggers reactivity across all instances)
-
-### Using PluginService API Directly
-
-```qml
-import qs.Services
-
-property int counter: PluginService.getGlobalVar("myPlugin", "counter", 0)
-
-Connections {
-    target: PluginService
-    function onGlobalVarChanged(pluginId, varName) {
-        if (pluginId === "myPlugin" && varName === "counter") {
-            counter = PluginService.getGlobalVar("myPlugin", "counter", 0)
-        }
-    }
-}
-
-function increment() {
-    var current = PluginService.getGlobalVar("myPlugin", "counter", 0)
-    PluginService.setGlobalVar("myPlugin", "counter", current + 1)
-}
-```
-
-## Decision Matrix
-
-| Need | API | Persisted | Scope |
-|------|-----|-----------|-------|
-| User preferences (API keys, themes, intervals) | `savePluginData` / `loadPluginData` | Yes (settings.json) | Per plugin |
-| Runtime state (history, cache, counters) | `savePluginState` / `loadPluginState` | Yes (state file) | Per plugin |
-| Cross-instance sync (multi-monitor data) | `PluginGlobalVar` or `getGlobalVar`/`setGlobalVar` | No (runtime only) | All instances |
-| Quick reactive reads from settings | `pluginData` property | N/A (read-only) | Per instance |
-
-## Important Notes
-
-1. **pluginData is reactive** - bindings update automatically when data changes
-2. **Global vars are NOT persistent** - they reset when the shell restarts
-3. **State vs Data** - data is for user-facing settings, state is for internal runtime data
-4. **Null safety** - always check `pluginService` is not null before calling methods
-5. **Signal namespacing** - global var signals include `pluginId` to filter for your plugin
-6. **Performance** - global vars are efficient for frequent updates; settings writes are batched

.agents/skills/dms-plugin-dev/references/desktop-plugin-guide.md

@@ -1,240 +0,0 @@
-# Desktop Plugin Guide
-
-Desktop plugins are widgets that appear on the desktop background layer. They support drag-and-drop positioning and resize via corner handles.
-
-## Base Component
-
-Desktop widgets use a plain `Item` with injected properties:
-
-```qml
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 200
-    property real widgetHeight: 200
-    property real minWidth: 150
-    property real minHeight: 150
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: 0.85
-
-        // Your content here
-    }
-}
-```
-
-## Injected Properties
-
-These are set automatically by the DesktopPluginWrapper:
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `pluginService` | object | PluginService reference for data persistence |
-| `pluginId` | string | Plugin's unique identifier |
-| `editMode` | bool | `true` when user is dragging/resizing |
-| `widgetWidth` | real | Current widget container width |
-| `widgetHeight` | real | Current widget container height |
-
-## Optional Properties
-
-Define these on your root item to customize behavior:
-
-| Property | Type | Default | Description |
-|----------|------|---------|-------------|
-| `minWidth` | real | 100 | Minimum allowed width during resize |
-| `minHeight` | real | 100 | Minimum allowed height during resize |
-
-## Position and Size Persistence
-
-Position (`desktopX`, `desktopY`) and size (`desktopWidth`, `desktopHeight`) are automatically managed by the DesktopPluginWrapper. You do not need to handle persistence for positioning.
-
-## Edit Mode
-
-When `editMode` is true, the user is repositioning or resizing. Use this to:
-- Show visual indicators (borders, handles)
-- Disable interactive elements to prevent accidental actions
-- Display additional controls
-
-```qml
-Rectangle {
-    anchors.fill: parent
-    border.color: root.editMode ? Theme.primary : "transparent"
-    border.width: root.editMode ? 2 : 0
-
-    MouseArea {
-        anchors.fill: parent
-        enabled: !root.editMode
-        onClicked: doSomething()
-    }
-}
-```
-
-## Loading and Saving Data
-
-Use the injected `pluginService` for data persistence:
-
-```qml
-property string displayMode: {
-    if (!pluginService) return "default"
-    return pluginService.loadPluginData(pluginId, "displayMode", "default")
-}
-
-Connections {
-    target: pluginService
-    function onPluginDataChanged(changedId) {
-        if (changedId !== pluginId) return
-        root.displayMode = pluginService.loadPluginData(pluginId, "displayMode", "default")
-    }
-}
-
-function saveMode(mode) {
-    pluginService?.savePluginData(pluginId, "displayMode", mode)
-}
-```
-
-## Settings Component
-
-Desktop plugin settings use the same `PluginSettings` wrapper as other types:
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myDesktopWidget"
-
-    SliderSetting {
-        settingKey: "opacity"
-        label: "Opacity"
-        description: "Widget background opacity"
-        defaultValue: 85
-        minimum: 10
-        maximum: 100
-        unit: "%"
-    }
-
-    SelectionSetting {
-        settingKey: "style"
-        label: "Display Style"
-        options: [
-            { label: "Compact", value: "compact" },
-            { label: "Expanded", value: "expanded" }
-        ]
-        defaultValue: "compact"
-    }
-}
-```
-
-## User Interaction
-
-Desktop widgets support:
-1. **Drag** - click and drag anywhere (in edit mode)
-2. **Resize** - drag bottom-right corner handle (in edit mode)
-3. **Edit mode toggle** - via the desktop edit button
-
-## Complete Example
-
-Based on the ExampleDesktopClock pattern:
-
-```qml
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 250
-    property real widgetHeight: 250
-    property real minWidth: 150
-    property real minHeight: 150
-
-    property string clockStyle: {
-        if (!pluginService) return "digital"
-        return pluginService.loadPluginData(pluginId, "clockStyle", "digital")
-    }
-
-    property real bgOpacity: {
-        if (!pluginService) return 0.85
-        var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-        return val / 100
-    }
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            clockStyle = pluginService.loadPluginData(pluginId, "clockStyle", "digital")
-            var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-            bgOpacity = val / 100
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: root.bgOpacity
-        border.color: root.editMode ? Theme.primary : "transparent"
-        border.width: root.editMode ? 2 : 0
-
-        Column {
-            anchors.centerIn: parent
-            spacing: Theme.spacingS
-
-            Text {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: Qt.formatTime(new Date(), "hh:mm:ss")
-                color: Theme.surfaceText
-                font.pixelSize: root.widgetWidth * 0.15
-                font.weight: Font.Bold
-            }
-
-            Text {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: Qt.formatDate(new Date(), "ddd, MMM d")
-                color: Theme.onSurfaceVariant
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    Timer {
-        interval: 1000
-        running: true
-        repeat: true
-        onTriggered: root.widgetWidth = root.widgetWidth // force update
-    }
-}
-```
-
-## Manifest Example
-
-```json
-{
-    "id": "myDesktopClock",
-    "name": "Desktop Clock",
-    "description": "Analog and digital clock for the desktop",
-    "version": "1.0.0",
-    "author": "Developer",
-    "type": "desktop",
-    "capabilities": ["desktop-widget"],
-    "component": "./ClockWidget.qml",
-    "icon": "schedule",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}
-```

.agents/skills/dms-plugin-dev/references/launcher-plugin-guide.md

@@ -1,308 +0,0 @@
-# Launcher Plugin Guide
-
-Launcher plugins extend the DMS launcher with custom searchable items and actions. They use trigger-based filtering and integrate directly into the app drawer.
-
-## Base Component
-
-Launchers use a plain `Item` (not PluginComponent):
-
-```qml
-import QtQuick
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "#"
-
-    signal itemsChanged()
-
-    function getItems(query) {
-        // Return array of items
-        return []
-    }
-
-    function executeItem(item) {
-        // Handle item selection
-    }
-}
-```
-
-## Required Interface
-
-| Member | Type | Description |
-|--------|------|-------------|
-| `pluginService` | property | Injected PluginService reference (declare as `null`) |
-| `trigger` | property | Trigger string for activation |
-| `itemsChanged` | signal | Emit when item list changes (triggers UI refresh) |
-| `getItems(query)` | function | Return array of items matching query |
-| `executeItem(item)` | function | Handle item selection |
-
-## Item Structure
-
-Each item returned by `getItems()`:
-
-```javascript
-{
-    name: "Item Display Name",       // Required: shown in launcher
-    icon: "material:star",           // Optional: icon specification
-    comment: "Description text",     // Required: subtitle text
-    action: "type:data",             // Required: action identifier
-    categories: ["MyPlugin"],        // Required: array with plugin category
-    imageUrl: "https://..."          // Optional: image for tile view
-}
-```
-
-## Icon Types
-
-### 1. Material Design Icons
-
-```javascript
-{ icon: "material:lightbulb" }
-{ icon: "material:terminal" }
-{ icon: "material:translate" }
-```
-
-Uses the Material Symbols Rounded font.
-
-### 2. Unicode / Emoji Icons
-
-```javascript
-{ icon: "unicode:smile_face" }
-```
-
-Rendered at 70-80% of icon size with theming.
-
-### 3. Desktop Theme Icons
-
-```javascript
-{ icon: "firefox" }
-{ icon: "folder" }
-```
-
-Uses the user's installed icon theme.
-
-### 4. No Icon
-
-Omit the `icon` field entirely. The launcher hides the icon area and gives full width to the item name.
-
-## Trigger System
-
-**Custom trigger** (items only appear when trigger is typed):
-
-```json
-{ "trigger": "#" }
-```
-
-- Type `#` alone: shows all plugin items
-- Type `# query`: filters plugin items by query
-- The query string (without trigger) is passed to `getItems(query)`
-
-**No trigger** (items always visible alongside regular apps):
-
-```json
-{ "trigger": "" }
-```
-
-Save empty trigger at runtime:
-```qml
-Component.onCompleted: {
-    trigger = pluginService?.loadPluginData(pluginId, "trigger", "#") ?? "#"
-}
-```
-
-## Action Execution
-
-Parse action strings in `executeItem()`:
-
-```qml
-function executeItem(item) {
-    const actionParts = item.action.split(":")
-    const actionType = actionParts[0]
-    const actionData = actionParts.slice(1).join(":")
-
-    switch (actionType) {
-        case "toast":
-            ToastService?.showInfo(actionData)
-            break
-        case "copy":
-            Quickshell.execDetached(["dms", "cl", "copy", actionData])
-            ToastService?.showInfo("Copied to clipboard")
-            break
-        case "exec":
-            Quickshell.execDetached(actionData.split(" "))
-            break
-        case "url":
-            Quickshell.execDetached(["xdg-open", actionData])
-            break
-        default:
-            console.warn("Unknown action type:", actionType)
-    }
-}
-```
-
-## Search / Filtering
-
-The `query` parameter in `getItems()` contains the user's search text (without the trigger prefix).
-
-```qml
-function getItems(query) {
-    const allItems = [
-        { name: "Calculator", icon: "material:calculate",
-          comment: "Open calculator", action: "exec:gnome-calculator",
-          categories: ["Tools"] },
-        { name: "Terminal", icon: "material:terminal",
-          comment: "Open terminal", action: "exec:alacritty",
-          categories: ["Tools"] }
-    ]
-
-    if (!query || query.length === 0) return allItems
-
-    const q = query.toLowerCase()
-    return allItems.filter(item =>
-        item.name.toLowerCase().includes(q) ||
-        item.comment.toLowerCase().includes(q)
-    )
-}
-```
-
-## Context Menu Actions
-
-Add right-click actions to launcher items:
-
-```qml
-function getContextMenuActions(item) {
-    return [
-        { name: "Copy", icon: "material:content_copy",
-          action: "copy:" + item.name },
-        { name: "Open in Browser", icon: "material:open_in_new",
-          action: "url:" + item.url }
-    ]
-}
-```
-
-Context menu actions use the same `executeItem()` handler.
-
-## Image Tile View
-
-For image-heavy launchers (GIF search, sticker pickers), use tile view:
-
-In `plugin.json`:
-```json
-{
-    "viewMode": "tile",
-    "viewModeEnforced": true
-}
-```
-
-In items:
-```javascript
-{
-    name: "Image Title",
-    imageUrl: "https://example.com/image.png",
-    comment: "Description",
-    action: "copy:https://example.com/image.png",
-    categories: ["MyPlugin"]
-}
-```
-
-## State Persistence
-
-For plugins with persistent state (notes, history, favorites):
-
-```qml
-property var notes: []
-
-Component.onCompleted: {
-    const saved = pluginService?.loadPluginState(pluginId, "notes", [])
-    if (saved) notes = saved
-}
-
-function addNote(text) {
-    notes.push({ text: text, timestamp: Date.now() })
-    pluginService?.savePluginState(pluginId, "notes", notes)
-    itemsChanged()
-}
-```
-
-Use `savePluginState/loadPluginState` for runtime data and `savePluginData/loadPluginData` for user preferences.
-
-## Settings for Trigger Configuration
-
-Provide a PluginSettings component for trigger customization:
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myLauncher"
-
-    StringSetting {
-        settingKey: "trigger"
-        label: "Trigger"
-        description: "Type this prefix to activate the launcher plugin"
-        placeholder: "#"
-        defaultValue: "#"
-    }
-
-    ToggleSetting {
-        settingKey: "noTrigger"
-        label: "Always Visible"
-        description: "Show items alongside regular apps (no trigger needed)"
-        defaultValue: false
-    }
-}
-```
-
-## Complete Example
-
-```qml
-import QtQuick
-import Quickshell
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "!"
-
-    signal itemsChanged()
-
-    property var commands: [
-        { name: "Lock Screen", icon: "material:lock",
-          comment: "Lock the session", action: "exec:loginctl lock-session" },
-        { name: "Screenshot", icon: "material:screenshot_monitor",
-          comment: "Take a screenshot", action: "exec:grim" },
-        { name: "File Manager", icon: "material:folder",
-          comment: "Open file manager", action: "exec:nautilus" }
-    ]
-
-    function getItems(query) {
-        if (!query) return commands
-        const q = query.toLowerCase()
-        return commands.filter(c =>
-            c.name.toLowerCase().includes(q) ||
-            c.comment.toLowerCase().includes(q)
-        )
-    }
-
-    function executeItem(item) {
-        const [type, ...rest] = item.action.split(":")
-        const data = rest.join(":")
-        if (type === "exec") {
-            Quickshell.execDetached(data.split(" "))
-        }
-    }
-
-    Component.onCompleted: {
-        if (pluginService) {
-            trigger = pluginService.loadPluginData("quickCommands", "trigger", "!")
-        }
-    }
-}
-```

.agents/skills/dms-plugin-dev/references/plugin-manifest-reference.md

@@ -1,119 +0,0 @@
-# Plugin Manifest Reference (plugin.json)
-
-## Required Fields
-
-| Field | Type | Description | Validation |
-|-------|------|-------------|------------|
-| `id` | string | Unique plugin identifier | camelCase, pattern `^[a-zA-Z][a-zA-Z0-9]*$` |
-| `name` | string | Human-readable name | Non-empty |
-| `description` | string | Short description (shown in UI) | Non-empty |
-| `version` | string | Semantic version | Pattern `^\d+\.\d+\.\d+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$` |
-| `author` | string | Creator name or email | Non-empty |
-| `type` | string | Plugin type | One of: `widget`, `daemon`, `launcher`, `desktop` |
-| `capabilities` | array | Plugin capabilities | At least 1 string item |
-| `component` | string | Path to main QML file | Must start with `./`, end with `.qml` |
-
-## Conditional Requirements
-
-| Condition | Required Field | Description |
-|-----------|---------------|-------------|
-| `type: "launcher"` | `trigger` | Trigger string for launcher activation (e.g., `=`, `#`, `!`) |
-
-## Optional Fields
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `icon` | string | Material Design icon name (displayed in plugin list UI) |
-| `settings` | string | Path to settings QML file (must start with `./`, end with `.qml`) |
-| `requires_dms` | string | Minimum DMS version (e.g., `>=0.1.18`), pattern `^(>=?\|<=?\|=\|>\|<)\d+\.\d+\.\d+$` |
-| `requires` | array | System tool dependencies (e.g., `["curl", "jq"]`) |
-| `permissions` | array | Required permissions |
-| `trigger` | string | Launcher trigger string (required for launcher type) |
-
-## Permissions
-
-| Permission | Description | Enforced |
-|------------|-------------|----------|
-| `settings_read` | Read plugin configuration | No (not currently enforced) |
-| `settings_write` | Write plugin configuration / use PluginSettings | **Yes** |
-| `process` | Execute system commands | No (not currently enforced) |
-| `network` | Network access | No (not currently enforced) |
-
-If your plugin has a `settings` component but does not declare `settings_write`, users will see an error instead of the settings UI.
-
-## Capabilities
-
-Capabilities are free-form strings that describe what the plugin does. Common values:
-
-- `dankbar-widget` - general bar widget
-- `control-center` - integrates with Control Center
-- `monitoring` - system/service monitoring
-- `launcher` - launcher search provider
-- `desktop-widget` - desktop background widget
-- `ai` - AI/LLM integration
-- `slideout` - uses slideout panel
-
-## Complete Example
-
-```json
-{
-    "id": "myPlugin",
-    "name": "My Plugin",
-    "description": "A sample plugin demonstrating all fields",
-    "version": "1.0.0",
-    "author": "Developer Name",
-    "type": "widget",
-    "capabilities": ["dankbar-widget", "control-center"],
-    "component": "./MyWidget.qml",
-    "icon": "extension",
-    "settings": "./Settings.qml",
-    "requires_dms": ">=0.1.18",
-    "requires": ["curl", "jq"],
-    "permissions": ["settings_read", "settings_write", "process", "network"]
-}
-```
-
-## Launcher Example
-
-```json
-{
-    "id": "myLauncher",
-    "name": "My Launcher",
-    "description": "Search and execute custom actions",
-    "version": "1.0.0",
-    "author": "Developer Name",
-    "type": "launcher",
-    "capabilities": ["launcher"],
-    "component": "./MyLauncher.qml",
-    "trigger": "#",
-    "icon": "search",
-    "settings": "./Settings.qml",
-    "requires_dms": ">=0.1.18",
-    "permissions": ["settings_read", "settings_write"]
-}
-```
-
-## JSON Schema
-
-The complete JSON schema is available at `assets/plugin-schema.json` in this skill. Validate with:
-
-```bash
-# Using python
-python3 -c "
-import json, jsonschema
-schema = json.load(open('path/to/plugin-schema.json'))
-manifest = json.load(open('plugin.json'))
-jsonschema.validate(manifest, schema)
-print('Valid!')
-"
-
-# Using jq (syntax check only)
-jq . plugin.json
-```
-
-## Additional Properties
-
-The schema allows additional properties (`"additionalProperties": true`), so plugins can include custom fields. Common custom fields seen in production plugins:
-
-- `viewMode` - launcher display mode (`"tile"` for image grids)
-- `viewModeEnforced` - lock launcher to specific view mode (`true`/`false`)

.agents/skills/dms-plugin-dev/references/popout-service-reference.md

@@ -1,120 +0,0 @@
-# PopoutService Reference
-
-The `PopoutService` singleton lets plugins control all DMS popouts and modals. It is automatically injected into widget, daemon, and settings components.
-
-## Setup
-
-Declare the property in your component for injection to work:
-
-```qml
-property var popoutService: null
-```
-
-Without this declaration, injection fails with: `Cannot assign to non-existent property "popoutService"`
-
-## Popouts (DankPopout-based)
-
-| Component | Open | Close | Toggle |
-|-----------|------|-------|--------|
-| Control Center | `openControlCenter()` | `closeControlCenter()` | `toggleControlCenter()` |
-| Notification Center | `openNotificationCenter()` | `closeNotificationCenter()` | `toggleNotificationCenter()` |
-| App Drawer | `openAppDrawer()` | `closeAppDrawer()` | `toggleAppDrawer()` |
-| Process List | `openProcessList()` | `closeProcessList()` | `toggleProcessList()` |
-| DankDash | `openDankDash(tab)` | `closeDankDash()` | `toggleDankDash(tab)` |
-| Battery | `openBattery()` | `closeBattery()` | `toggleBattery()` |
-| VPN | `openVpn()` | `closeVpn()` | `toggleVpn()` |
-| System Update | `openSystemUpdate()` | `closeSystemUpdate()` | `toggleSystemUpdate()` |
-
-## Modals (DankModal-based)
-
-| Modal | Show | Hide | Notes |
-|-------|------|------|-------|
-| Settings | `openSettings()` | `closeSettings()` | Full settings interface |
-| Clipboard History | `openClipboardHistory()` | `closeClipboardHistory()` | Clipboard integration |
-| Launcher | `openDankLauncherV2()` | `closeDankLauncherV2()` | Also has `toggleDankLauncherV2()` |
-| Power Menu | `openPowerMenu()` | `closePowerMenu()` | Also has `togglePowerMenu()` |
-| Process List Modal | `showProcessListModal()` | `hideProcessListModal()` | Has `toggleProcessListModal()` |
-| Color Picker | `showColorPicker()` | `hideColorPicker()` | Theme color selection |
-| Notification | `showNotificationModal()` | `hideNotificationModal()` | Notification details |
-| WiFi Password | `showWifiPasswordModal()` | `hideWifiPasswordModal()` | Network auth |
-| Network Info | `showNetworkInfoModal()` | `hideNetworkInfoModal()` | Network details |
-
-## Slideouts
-
-| Component | Open | Close | Toggle |
-|-----------|------|-------|--------|
-| Notepad | `openNotepad()` | `closeNotepad()` | `toggleNotepad()` |
-
-## Usage Examples
-
-### Simple toggle
-
-```qml
-MouseArea {
-    onClicked: popoutService?.toggleControlCenter()
-}
-```
-
-### Conditional popout
-
-```qml
-Connections {
-    target: BatteryService
-    function onPercentageChanged() {
-        if (BatteryService.percentage < 10 && !BatteryService.isCharging) {
-            popoutService?.openBattery()
-        }
-    }
-}
-```
-
-### Context menu with multiple actions
-
-```qml
-MouseArea {
-    acceptedButtons: Qt.LeftButton | Qt.RightButton
-    onClicked: (mouse) => {
-        if (mouse.button === Qt.RightButton) contextMenu.popup()
-        else popoutService?.toggleControlCenter()
-    }
-}
-
-Menu {
-    id: contextMenu
-    MenuItem { text: "Settings"; onClicked: popoutService?.openSettings() }
-    MenuItem { text: "Notifications"; onClicked: popoutService?.toggleNotificationCenter() }
-    MenuItem { text: "Power"; onClicked: popoutService?.openPowerMenu() }
-}
-```
-
-### Position-aware toggle (from bar pill)
-
-Some toggle functions accept position parameters for proper popout placement:
-
-```qml
-pillClickAction: (x, y, width, section, screen) => {
-    popoutService?.toggleControlCenter(x, y, width, section, screen)
-}
-```
-
-## Best Practices
-
-1. **Always use optional chaining** (`?.`) - the service may not be injected yet
-2. **Check feature availability** before opening feature-specific popouts:
-   ```qml
-   if (BatteryService.batteryAvailable) {
-       popoutService?.openBattery()
-   }
-   ```
-3. **Lazy loading** - first access may activate lazy loaders; this is normal
-4. **Popouts are shared** - avoid opening conflicting popouts simultaneously
-5. **User intent** - only trigger popouts from user actions or critical system events
-6. **Multi-monitor** - positioned popouts are screen-aware when using position parameters
-
-## Injection Locations
-
-The service is injected at these points:
-- `DMSShell.qml` - daemon plugins
-- `WidgetHost.qml` - widget plugins in left/right bar sections
-- `CenterSection.qml` - center bar widgets
-- `PluginsTab.qml` - settings components

.agents/skills/dms-plugin-dev/references/settings-components-reference.md

@@ -1,273 +0,0 @@
-# Settings Components Reference
-
-All plugin settings use the `PluginSettings` wrapper. Setting components auto-save on change and auto-load on creation.
-
-## PluginSettings Wrapper
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "yourPlugin"  // Required: must match plugin.json id
-
-    // Setting components go here
-}
-```
-
-**Important:** The plugin must declare `"permissions": ["settings_write"]` in plugin.json for the settings UI to render. Without it, users see an error.
-
-**PluginSettings provides to children:**
-- `saveValue(key, value)` - save a setting value
-- `loadValue(key, defaultValue)` - load a setting value
-- `saveState(key, value)` - save plugin state (separate file)
-- `loadState(key, defaultValue)` - load plugin state
-- `clearState()` - clear all plugin state
-- Variant management functions (for variant plugins)
-
-## StringSetting
-
-Text input field.
-
-```qml
-StringSetting {
-    settingKey: "apiKey"        // Required: storage key
-    label: "API Key"            // Required: display label
-    description: "Your API key" // Optional: help text
-    placeholder: "sk-..."      // Optional: input placeholder
-    defaultValue: ""            // Optional: default (default: "")
-}
-```
-
-**Layout:** Vertical stack - label, description, input field.
-
-## ToggleSetting
-
-Boolean toggle switch.
-
-```qml
-ToggleSetting {
-    settingKey: "notifications"    // Required: storage key
-    label: "Enable Notifications"  // Required: display label
-    description: "Show alerts"     // Optional: help text
-    defaultValue: true             // Optional: default (default: false)
-}
-```
-
-**Layout:** Horizontal - label/description on left, toggle on right.
-
-## SelectionSetting
-
-Dropdown menu.
-
-```qml
-SelectionSetting {
-    settingKey: "theme"           // Required: storage key
-    label: "Theme"                // Required: display label
-    description: "Color scheme"   // Optional: help text
-    options: [                    // Required: array of options
-        { label: "Dark", value: "dark" },
-        { label: "Light", value: "light" },
-        { label: "Auto", value: "auto" }
-    ]
-    defaultValue: "dark"          // Optional: default value
-}
-```
-
-Options can be `{ label, value }` objects or simple strings. Stores the `value` field, displays the `label` field.
-
-**Layout:** Horizontal - label/description on left, dropdown on right.
-
-**Reacting to changes:**
-```qml
-SelectionSetting {
-    settingKey: "updateInterval"
-    label: "Update Interval"
-    options: [
-        { label: "1 minute", value: "60" },
-        { label: "5 minutes", value: "300" }
-    ]
-    defaultValue: "300"
-    onValueChanged: (newValue) => {
-        console.log("Interval changed to:", newValue)
-    }
-}
-```
-
-## SliderSetting
-
-Numeric slider with min/max.
-
-```qml
-SliderSetting {
-    settingKey: "opacity"      // Required: storage key
-    label: "Opacity"           // Required: display label
-    description: "Background"  // Optional: help text
-    defaultValue: 85           // Optional: default value
-    minimum: 0                 // Required: min value
-    maximum: 100               // Required: max value
-    unit: "%"                  // Optional: unit label shown after value
-    leftIcon: "dark_mode"      // Optional: Material icon on left
-    rightIcon: "light_mode"    // Optional: Material icon on right
-}
-```
-
-## ColorSetting
-
-Color picker.
-
-```qml
-ColorSetting {
-    settingKey: "accentColor"      // Required: storage key
-    label: "Accent Color"          // Required: display label
-    description: "Custom accent"   // Optional: help text
-    defaultValue: "#ff5722"        // Optional: default hex color
-}
-```
-
-Displays a color swatch that opens a color picker dialog.
-
-## ListSetting
-
-Manage a list of items with manual add/remove. Use when you need custom UI for adding items.
-
-```qml
-ListSetting {
-    id: itemList
-    settingKey: "items"           // Required: storage key
-    label: "Saved Items"          // Required: display label
-    description: "Your items"     // Optional: help text
-    defaultValue: []              // Optional: default array
-    delegate: Component {         // Optional: custom item display
-        StyledRect {
-            width: parent.width
-            height: 40
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                anchors.left: parent.left
-                anchors.leftMargin: Theme.spacingM
-                anchors.verticalCenter: parent.verticalCenter
-                text: modelData.name
-                color: Theme.surfaceText
-            }
-
-            Rectangle {
-                anchors.right: parent.right
-                anchors.rightMargin: Theme.spacingM
-                anchors.verticalCenter: parent.verticalCenter
-                width: 60
-                height: 28
-                color: removeArea.containsMouse ? Theme.errorHover : Theme.error
-                radius: Theme.cornerRadius
-
-                StyledText {
-                    anchors.centerIn: parent
-                    text: "Remove"
-                    color: Theme.errorText
-                    font.pixelSize: Theme.fontSizeSmall
-                    font.weight: Font.Medium
-                }
-
-                MouseArea {
-                    id: removeArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: itemList.removeItem(index)
-                }
-            }
-        }
-    }
-}
-```
-
-**Methods:**
-- `addItem(item)` - add an item to the list
-- `removeItem(index)` - remove item at index
-
-## ListSettingWithInput
-
-Complete list management with built-in form. Best for collecting structured data.
-
-```qml
-ListSettingWithInput {
-    settingKey: "locations"        // Required: storage key
-    label: "Locations"             // Required: display label
-    description: "Track zones"     // Optional: help text
-    defaultValue: []               // Optional: default array
-    fields: [                      // Required: field definitions
-        {
-            id: "name",            // Required: key in saved object
-            label: "Name",         // Required: column header
-            placeholder: "Home",   // Optional: input placeholder
-            width: 150,            // Optional: column width (default: 200)
-            required: true         // Optional: must have value to add
-        },
-        {
-            id: "timezone",
-            label: "Timezone",
-            placeholder: "America/New_York",
-            width: 200,
-            required: true
-        }
-    ]
-}
-```
-
-Automatically generates: column headers, input fields, add button with validation, list display, remove buttons.
-
-## Mixing Custom UI with Settings
-
-You can interleave regular QML elements with setting components:
-
-```qml
-PluginSettings {
-    pluginId: "myPlugin"
-
-    StyledText {
-        width: parent.width
-        text: "General Settings"
-        font.pixelSize: Theme.fontSizeLarge
-        font.weight: Font.Bold
-        color: Theme.surfaceText
-    }
-
-    StringSetting {
-        settingKey: "name"
-        label: "Display Name"
-    }
-
-    StyledText {
-        width: parent.width
-        text: "Advanced Settings"
-        font.pixelSize: Theme.fontSizeLarge
-        font.weight: Font.Bold
-        color: Theme.surfaceText
-        topPadding: Theme.spacingL
-    }
-
-    ToggleSetting {
-        settingKey: "debug"
-        label: "Debug Mode"
-        defaultValue: false
-    }
-}
-```
-
-## Default Values
-
-Define sensible defaults in every setting component. The default is used when no saved value exists:
-
-```qml
-StringSetting { settingKey: "text"; defaultValue: "Hello" }
-ToggleSetting { settingKey: "enabled"; defaultValue: true }
-SelectionSetting { settingKey: "mode"; defaultValue: "auto" }
-SliderSetting { settingKey: "opacity"; defaultValue: 85 }
-ColorSetting { settingKey: "color"; defaultValue: "#ff5722" }
-ListSetting { settingKey: "items"; defaultValue: [] }
-ListSettingWithInput { settingKey: "data"; defaultValue: [] }
-```

.agents/skills/dms-plugin-dev/references/theme-reference.md

@@ -1,216 +0,0 @@
-# Theme Property Reference
-
-All theme properties are accessed via the `Theme` singleton from `qs.Common`. Always use these instead of hardcoded values.
-
-## Font Sizes
-
-```qml
-Theme.fontSizeSmall     // 12px (scaled by SettingsData.fontScale)
-Theme.fontSizeMedium    // 14px (scaled)
-Theme.fontSizeLarge     // 16px (scaled)
-Theme.fontSizeXLarge    // 20px (scaled)
-```
-
-## Icon Sizes
-
-```qml
-Theme.iconSizeSmall     // 16px
-Theme.iconSize          // 24px (default)
-Theme.iconSizeLarge     // 32px
-```
-
-## Spacing
-
-```qml
-Theme.spacingXS         // Extra small
-Theme.spacingS          // Small
-Theme.spacingM          // Medium
-Theme.spacingL          // Large
-Theme.spacingXL         // Extra large
-```
-
-## Border Radius
-
-```qml
-Theme.cornerRadius      // Standard
-Theme.cornerRadiusSmall // Smaller
-Theme.cornerRadiusLarge // Larger
-```
-
-## Surface Colors
-
-```qml
-Theme.surface
-Theme.surfaceContainerLow
-Theme.surfaceContainer
-Theme.surfaceContainerHigh
-Theme.surfaceContainerHighest
-```
-
-## Text Colors
-
-```qml
-Theme.onSurface          // Primary text on surface
-Theme.onSurfaceVariant   // Secondary text on surface
-Theme.surfaceText        // Alias for primary surface text
-Theme.surfaceVariantText // Alias for secondary surface text
-Theme.outline            // Border/divider color
-```
-
-## Semantic Colors
-
-```qml
-Theme.primary
-Theme.onPrimary
-Theme.secondary
-Theme.onSecondary
-Theme.error
-Theme.errorHover
-Theme.errorText
-Theme.warning
-Theme.success
-```
-
-## Special Functions
-
-```qml
-Theme.popupBackground()  // Popup background with proper opacity
-```
-
-## Common Widget Patterns
-
-### Icon with Text
-
-```qml
-import qs.Widgets
-
-Row {
-    spacing: Theme.spacingS
-
-    DankIcon {
-        name: "icon_name"
-        color: Theme.onSurface
-        font.pixelSize: Theme.iconSize
-    }
-
-    StyledText {
-        text: "Label"
-        color: Theme.onSurface
-        font.pixelSize: Theme.fontSizeMedium
-    }
-}
-```
-
-### Container with Border
-
-```qml
-Rectangle {
-    color: Theme.surfaceContainerHigh
-    radius: Theme.cornerRadius
-    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 1
-}
-```
-
-### Hover Effect
-
-```qml
-Rectangle {
-    id: container
-    color: Theme.surfaceContainerHigh
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        onEntered: container.color = Qt.lighter(Theme.surfaceContainerHigh, 1.1)
-        onExited: container.color = Theme.surfaceContainerHigh
-    }
-}
-```
-
-### Clickable Pill
-
-```qml
-StyledRect {
-    width: content.implicitWidth + Theme.spacingM * 2
-    height: parent.widgetThickness
-    radius: Theme.cornerRadius
-    color: mouseArea.containsMouse
-        ? Qt.lighter(Theme.surfaceContainerHigh, 1.1)
-        : Theme.surfaceContainerHigh
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-    }
-
-    Row {
-        id: content
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-
-        DankIcon {
-            name: "star"
-            color: Theme.surfaceText
-            font.pixelSize: Theme.iconSize
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: "Label"
-            color: Theme.surfaceText
-            font.pixelSize: Theme.fontSizeMedium
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-}
-```
-
-## Common Mistakes
-
-**Wrong property names** (these do NOT exist):
-```qml
-Theme.fontSizeS        // Use Theme.fontSizeSmall
-Theme.iconSizeS        // Use Theme.iconSizeSmall
-Theme.spacingSmall     // Use Theme.spacingS
-Theme.borderRadius     // Use Theme.cornerRadius
-```
-
-**Hardcoded values** (do NOT do this):
-```qml
-color: "#1e1e1e"       // Use Theme.surfaceContainerHigh
-color: "white"         // Use Theme.surfaceText
-font.pixelSize: 14     // Use Theme.fontSizeMedium
-```
-
-## Available Widgets from qs.Widgets
-
-| Widget | Description |
-|--------|-------------|
-| `StyledText` | Themed text with proper color defaults |
-| `StyledRect` | Themed rectangle |
-| `DankIcon` | Material Symbols icon renderer |
-| `DankNFIcon` | Nerd Font icon renderer |
-| `DankButton` | Themed button |
-| `DankToggle` | Toggle switch |
-| `DankTextField` | Text input field |
-| `DankSlider` | Slider control |
-| `DankDropdown` | Dropdown menu |
-| `DankGridView` | Grid layout view |
-| `DankListView` | List layout view |
-| `DankFlickable` | Scrollable container |
-| `DankTabBar` | Tab bar navigation |
-| `DankCollapsibleSection` | Collapsible content section |
-| `DankTooltip` | Hover tooltip |
-| `DankNumberStepper` | Number +/- control |
-| `DankFilterChips` | Filter chip row |
-| `CachingImage` | Image with disk cache |
-| `NumericText` | Fixed-width numeric display |
-
-## Checking All Properties
-
-```bash
-grep "property" Common/Theme.qml
-```

.agents/skills/dms-plugin-dev/references/widget-plugin-guide.md

@@ -1,369 +0,0 @@
-# Widget Plugin Guide
-
-Widgets are bar plugins that display pills in DankBar, optionally open popouts, and can integrate with the Control Center.
-
-## Base Component
-
-Widgets use `PluginComponent` from `qs.Modules.Plugins`.
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    property var popoutService: null
-
-    horizontalBarPill: Component { /* ... */ }
-    verticalBarPill: Component { /* ... */ }
-    popoutContent: Component { /* ... */ }
-    popoutWidth: 400
-    popoutHeight: 300
-}
-```
-
-## Injected Properties
-
-These are automatically set by the plugin host:
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `axis` | object | Bar axis info (horizontal/vertical) |
-| `section` | string | Bar section: `"left"`, `"center"`, or `"right"` |
-| `parentScreen` | object | Screen reference for multi-monitor |
-| `widgetThickness` | real | Widget size perpendicular to bar edge |
-| `barThickness` | real | Bar thickness parallel to edge |
-| `pluginId` | string | This plugin's ID |
-| `pluginService` | object | PluginService reference |
-| `pluginData` | object | Reactive plugin settings data |
-
-## Bar Pills
-
-Define `horizontalBarPill` (for top/bottom bars) and `verticalBarPill` (for left/right bars).
-
-### Horizontal Bar Pill
-
-```qml
-horizontalBarPill: Component {
-    StyledRect {
-        width: content.implicitWidth + Theme.spacingM * 2
-        height: parent.widgetThickness
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainerHigh
-
-        Row {
-            id: content
-            anchors.centerIn: parent
-            spacing: Theme.spacingS
-
-            DankIcon {
-                name: "star"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.iconSize
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            StyledText {
-                text: "Label"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-                anchors.verticalCenter: parent.verticalCenter
-            }
-        }
-    }
-}
-```
-
-### Vertical Bar Pill
-
-```qml
-verticalBarPill: Component {
-    StyledRect {
-        width: parent.widgetThickness
-        height: content.implicitHeight + Theme.spacingM * 2
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainerHigh
-
-        Column {
-            id: content
-            anchors.centerIn: parent
-            spacing: Theme.spacingS
-
-            DankIcon {
-                name: "star"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.iconSizeSmall
-            }
-        }
-    }
-}
-```
-
-**Important:** Always define both pills. If a pill is missing, the widget disappears when the bar is on that orientation's edge.
-
-## Popout Content
-
-Open a popout window when the bar pill is clicked:
-
-```qml
-PluginComponent {
-    popoutWidth: 400
-    popoutHeight: 300
-
-    popoutContent: Component {
-        PopoutComponent {
-            headerText: "My Plugin"
-            detailsText: "Optional subtitle"
-            showCloseButton: true
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingM
-
-                StyledText {
-                    text: "Content here"
-                    color: Theme.surfaceText
-                    font.pixelSize: Theme.fontSizeMedium
-                }
-            }
-        }
-    }
-}
-```
-
-**PopoutComponent properties:**
-
-| Property | Type | Default | Description |
-|----------|------|---------|-------------|
-| `headerText` | string | `""` | Main header (bold, large). Hidden if empty. |
-| `detailsText` | string | `""` | Subtitle below header. Hidden if empty. |
-| `showCloseButton` | bool | `false` | Show X button in top-right corner. |
-| `closePopout` | function | (injected) | Call to close the popout programmatically. |
-| `headerHeight` | int | (readonly) | Height of header area (0 if hidden). |
-| `detailsHeight` | int | (readonly) | Height of details area (0 if hidden). |
-
-**Content sizing:** Content children render below the header/details. Calculate available height: `popoutHeight - headerHeight - detailsHeight - spacing`
-
-## Custom Click Actions
-
-Override the default popout behavior:
-
-```qml
-PluginComponent {
-    // Simple no-args handler
-    pillClickAction: () => {
-        popoutService?.toggleControlCenter()
-    }
-
-    // With position params (x, y, width, section, screen)
-    pillClickAction: (x, y, width, section, screen) => {
-        popoutService?.toggleControlCenter(x, y, width, section, screen)
-    }
-
-    pillRightClickAction: () => {
-        popoutService?.openSettings()
-    }
-}
-```
-
-## Control Center Integration
-
-Add CC properties to show your widget in the Control Center grid:
-
-```qml
-PluginComponent {
-    ccWidgetIcon: "toggle_on"
-    ccWidgetPrimaryText: "Feature Name"
-    ccWidgetSecondaryText: isActive ? "Active" : "Off"
-    ccWidgetIsActive: isActive
-
-    onCcWidgetToggled: {
-        isActive = !isActive
-        pluginService?.savePluginData(pluginId, "active", isActive)
-    }
-}
-```
-
-**CC properties:**
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `ccWidgetIcon` | string | Material icon name |
-| `ccWidgetPrimaryText` | string | Main label |
-| `ccWidgetSecondaryText` | string | Subtitle / status text |
-| `ccWidgetIsActive` | bool | Active state (changes styling) |
-
-**CC signals:**
-
-| Signal | When fired |
-|--------|-----------|
-| `ccWidgetToggled()` | Icon area clicked |
-| `ccWidgetExpanded()` | Expand area clicked (CompoundPill only) |
-
-**CC sizing rules:**
-- 25% width - SmallToggleButton (icon only)
-- 50% width - ToggleButton (no detail) or CompoundPill (with ccDetailContent)
-- Users can resize in CC edit mode
-
-### Detail Content (CompoundPill)
-
-Add an expandable panel below the CC widget:
-
-```qml
-ccDetailContent: Component {
-    Rectangle {
-        implicitHeight: 200
-        color: Theme.surfaceContainerHigh
-        radius: Theme.cornerRadius
-
-        Column {
-            anchors.fill: parent
-            anchors.margins: Theme.spacingM
-            spacing: Theme.spacingS
-
-            // Detail UI here
-        }
-    }
-}
-```
-
-## Visibility Control
-
-Conditionally show/hide the bar pill:
-
-```qml
-PluginComponent {
-    visibilityCommand: "pgrep -x myapp"
-    visibilityInterval: 5000  // check every 5 seconds
-}
-```
-
-## Popout Namespace
-
-For plugins with multiple popout instances, use `layerNamespacePlugin` to isolate popout state:
-
-```qml
-PluginComponent {
-    layerNamespacePlugin: true
-}
-```
-
-## Reading Plugin Data
-
-Access saved settings reactively via the injected `pluginData`:
-
-```qml
-PluginComponent {
-    property string displayText: pluginData?.text || "Default"
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId === pluginId)
-                displayText = pluginService.loadPluginData(pluginId, "text", "Default")
-        }
-    }
-}
-```
-
-## Complete Example
-
-Based on the ExampleEmojiPlugin pattern:
-
-```qml
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Widgets
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    property var emojis: ["star", "heart", "smile"]
-    property int currentIndex: 0
-
-    Timer {
-        interval: 2000
-        running: true
-        repeat: true
-        onTriggered: currentIndex = (currentIndex + 1) % emojis.length
-    }
-
-    popoutWidth: 350
-    popoutHeight: 400
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.emojis[root.currentIndex]
-                font.pixelSize: Theme.fontSizeLarge
-            }
-        }
-    }
-
-    verticalBarPill: Component {
-        StyledRect {
-            width: parent.widgetThickness
-            height: label.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.emojis[root.currentIndex]
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    popoutContent: Component {
-        PopoutComponent {
-            headerText: "Emoji Picker"
-            showCloseButton: true
-
-            DankGridView {
-                width: parent.width
-                height: 300
-                cellWidth: 50
-                cellHeight: 50
-                model: root.emojis
-
-                delegate: Rectangle {
-                    width: 48
-                    height: 48
-                    radius: Theme.cornerRadius
-                    color: mouseArea.containsMouse ? Theme.surfaceContainerHighest : "transparent"
-
-                    Text {
-                        anchors.centerIn: parent
-                        text: modelData
-                        font.pixelSize: 24
-                    }
-
-                    MouseArea {
-                        id: mouseArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        onClicked: {
-                            Quickshell.execDetached(["dms", "cl", "copy", modelData])
-                            ToastService?.showInfo("Copied " + modelData)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-```

.editorconfig

@@ -1,8 +0,0 @@
-[*.sh]
-# like -i=4
-indent_style = space
-indent_size = 4
-[*.nix]
-# like -i=4
-indent_style = space
-indent_size = 4

.githooks/pre-commit

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$HOOK_DIR/.." && pwd)"
+
+cd "$REPO_ROOT"
+
+# =============================================================================
+# Go CI checks (when core/ files are staged)
+# =============================================================================
+STAGED_CORE_FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep '^core/' || true)
+
+if [[ -n "$STAGED_CORE_FILES" ]]; then
+  echo "Go files staged in core/, running CI checks..."
+  cd "$REPO_ROOT/core"
+
+  # Format check
+  echo "  Checking gofmt..."
+  UNFORMATTED=$(gofmt -s -l . 2>/dev/null || true)
+  if [[ -n "$UNFORMATTED" ]]; then
+    echo "The following files are not formatted:"
+    echo "$UNFORMATTED"
+    echo ""
+    echo "Run: cd core && gofmt -s -w ."
+    exit 1
+  fi
+
+  # golangci-lint
+  if command -v golangci-lint &>/dev/null; then
+    echo "  Running golangci-lint..."
+    golangci-lint run ./...
+  else
+    echo "  Warning: golangci-lint not installed, skipping lint"
+    echo "  Install: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest"
+  fi
+
+  # Tests
+  echo "  Running tests..."
+  if ! go test ./... >/dev/null 2>&1; then
+    echo "Tests failed! Run 'go test ./...' for details."
+    exit 1
+  fi
+
+  # Build checks
+  echo "  Building..."
+  mkdir -p bin
+  go build -buildvcs=false -o bin/dms ./cmd/dms
+  go build -buildvcs=false -o bin/dms-distro -tags distro_binary ./cmd/dms
+  go build -buildvcs=false -o bin/dankinstall ./cmd/dankinstall
+
+  echo "All Go CI checks passed!"
+  cd "$REPO_ROOT"
+fi
+
+# =============================================================================
+# i18n sync check (DISABLED for now)
+# =============================================================================
+# if [[ -n "${POEDITOR_API_TOKEN:-}" ]] && [[ -n "${POEDITOR_PROJECT_ID:-}" ]]; then
+#     if command -v python3 &>/dev/null; then
+#         if ! python3 scripts/i18nsync.py check &>/dev/null; then
+#             echo "Translations out of sync"
+#             echo "Run: python3 scripts/i18nsync.py sync"
+#             exit 1
+#         fi
+#     fi
+# fi
+
+exit 0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,65 @@
+---
+name: Bug Report
+about: Crashes or unexpected behaviors
+title: ""
+labels: "bug"
+assignees: ""
+---
+
+<!-- If your issue is related to ICONS 
+- Purple and black checkerboards are QT's way of signalling an icon doesn't exist
+  - FIX: Configure a QT6 or Icon Pack in DMS Settings that has the icon you want
+  - Follow the [THEMING](https://danklinux.com/docs/dankmaterialshell/icon-theming) section to ensure your QT environment variable is configured correctly for themes.
+  - Once done, configure an icon theme - either however you normally do with gtk3 or qt6ct, or through the built-in settings modal. -->
+
+## Compositor
+
+- [ ] niri
+- [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
+- [ ] Other (specify)
+
+## Distribution
+
+<!-- Arch, Fedora, Debian, etc. -->
+
+## dms version
+
+<!-- Output of dms version command -->
+
+## Description
+
+<!-- Brief description of the issue -->
+
+## Expected Behavior
+
+<!-- Describe what you expected to happen -->
+
+## Steps to Reproduce
+
+<!-- Please provide detailed steps to reproduce the issue -->
+
+1.
+2.
+3.
+
+## Error Messages/Logs
+
+<!-- Please include any error messages, stack traces, or relevant logs -->
+<!-- you can get a log file with the following steps:
+dms kill
+mkdir ~/dms_logs
+nohup dms run > ~/dms_logs/dms-$(date +%s).txt 2>&1 &
+
+Then trigger your issue, and share the contents of ~/dms_logs/dms-<timestamp>.txt
+
+-->
+
+```
+Paste error messages or logs here
+```
+
+## Screenshots/Recordings
+
+<!-- If applicable, add screenshots or screen recordings -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,129 +0,0 @@
-name: Bug Report
-description: Crashes or unexpected behaviors
-labels:
-  - bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## DankMaterialShell Bug Report
-        Limit your report to one issue per submission unless similarly related
-  - type: dropdown
-    id: compositor
-    attributes:
-      label: Compositor
-      options:
-        - Niri
-        - Hyprland
-        - MangoWC (dwl)
-        - Sway
-    validations:
-      required: true
-  - type: dropdown
-    id: distribution
-    attributes:
-      label: Distribution
-      options:
-        - Arch Linux
-        - CachyOS
-        - Fedora
-        - NixOS
-        - Debian
-        - Ubuntu
-        - Gentoo
-        - OpenSUSE
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: distribution_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., PikaOS, Void Linux, etc.
-    validations:
-      required: false
-  - type: dropdown
-    id: installation_method
-    attributes:
-      label: Select your Installation Method
-      options:
-        - DankInstaller
-        - Distro Packaging
-        - Source
-    validations:
-      required: true
-  - type: dropdown
-    id: original_installation_method
-    attributes:
-      label: Was this your original Installation method?
-      options:
-        - "Yes"
-        - No (specify below)
-      default: 0
-    validations:
-      required: false
-  - type: input
-    id: original_installation_method_specify
-    attributes:
-      label: If no, specify
-      placeholder: e.g., Distro Packaging, then Source
-    validations:
-      required: false
-  - type: textarea
-    id: dms_doctor
-    attributes:
-      label: dms doctor -vC
-      description: Output of `dms doctor -vC` command — paste between the details tags below to keep it collapsed in the issue
-      placeholder: Paste the output of `dms doctor -vC` here
-      value: |
-        <details>
-        <summary>Click to expand</summary>
-
-
-        </details>
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Brief description of the issue
-      placeholder: What happened?
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: What did you expect to happen?
-      placeholder: Describe the expected behavior
-    validations:
-      required: false
-  - type: textarea
-    id: steps_to_reproduce
-    attributes:
-      label: Steps to Reproduce
-      description: Please provide detailed steps to reproduce the issue
-      placeholder: |
-        1. ...
-        2. ...
-        3. ...
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Error Messages/Logs
-      description: Please include any error messages, stack traces, or relevant logs
-      placeholder: |
-        Paste error messages or logs here
-    validations:
-      required: false
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots/Recordings
-      description: If applicable, add screenshots or screen recordings
-      placeholder: Attach images or videos here
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,33 @@
+---
+name: Request a Feature
+about: New widgets, new widget behavior, etc.
+title: ""
+labels: "enhancement"
+assignees: ""
+---
+
+## Feature Description
+
+<!-- Brief description of the feature requested -->
+
+## Use Case
+
+<!-- Explain the purpose of this feature/why it'd be useful to you -->
+
+## Compositor
+
+Is this feature specific to one compositor?
+
+- [ ] All compositors
+- [ ] niri
+- [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
+
+## Proposed Solution
+
+<!-- If you have any ideas for how to implement this, please share! -->
+
+## Alternatives/Existing Solutions
+
+<!-- Include any similar/pre-existing products that solve this problem -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,62 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or improvement for DMS. Keep features focused on a single topic with clear benefits, examples, etc. Avoid vague or broad requests, they will be closed.
-labels:
-  - enhancement
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## DankMaterialShell Feature Request
-  - type: textarea
-    id: feature_description
-    attributes:
-      label: Feature Description
-      description: Brief description of the feature requested
-      placeholder: What feature would you like to see?
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: Explain the purpose of this feature/why it'd be useful to you
-      placeholder: Why is this feature important?
-    validations:
-      required: false
-  - type: dropdown
-    id: compositor
-    attributes:
-      label: Compositor(s)
-      description: Is this feature specific to one or more compositors?
-      options:
-        - All compositors
-        - Niri
-        - Hyprland
-        - MangoWC (dwl)
-        - Sway
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: compositor_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., Wayfire, Mutter, etc.
-    validations:
-      required: false
-  - type: textarea
-    id: proposed_solution
-    attributes:
-      label: Proposed Solution
-      description: If you have any ideas for how to implement this, please share!
-      placeholder: Suggest a solution or approach
-    validations:
-      required: false
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives/Existing Solutions
-      description: Include any similar/pre-existing products that solve this problem
-      placeholder: List alternatives or existing solutions
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/support_request.md

@@ -0,0 +1,40 @@
+---
+name: Request Assistance or Support
+about: Help with installation, usage, or general questions.
+title: ""
+labels: "support"
+assignees: ""
+---
+
+## Compositor
+
+- [ ] niri
+- [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
+- [ ] other
+
+## Distribution
+
+<!-- Arch, Fedora, Debian, etc. -->
+
+## dms version
+
+<!-- Output of dms version command -->
+
+## Description
+
+<!-- Brief description of the support needed -->
+
+## Solutions Tried
+
+<!-- Describe what you've tried so far -->
+<!-- Outlining what you've tried so far helps us make improvements to the user experience and documentation to avoid recurrent issues -->
+
+## Configuration Details
+
+<!-- Include any configuration if relevant -->
+
+## Screenshots/Recordings
+
+<!-- If applicable, add screenshots or screen recordings -->

.github/ISSUE_TEMPLATE/support_request.yml

@@ -1,124 +0,0 @@
-name: Support Request
-description: Help with installation, usage, or general questions about DankMaterialShell
-labels:
-  - support
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## DankMaterialShell Support Request
-  - type: dropdown
-    id: compositor
-    attributes:
-      label: Compositor
-      options:
-        - Niri
-        - Hyprland
-        - MangoWC (dwl)
-        - Sway
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: compositor_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., Wayfire, Mutter, etc.
-    validations:
-      required: false
-  - type: dropdown
-    id: distribution
-    attributes:
-      label: Distribution
-      options:
-        - Arch Linux
-        - CachyOS
-        - Fedora
-        - NixOS
-        - Debian
-        - Ubuntu
-        - Gentoo
-        - OpenSUSE
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: distribution_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., PikaOS, Void Linux, etc.
-    validations:
-      required: false
-  - type: dropdown
-    id: installation_method
-    attributes:
-      label: Select your Installation Method
-      options:
-        - DankInstaller
-        - Distro Packaging
-        - Source
-    validations:
-      required: true
-  - type: dropdown
-    id: original_installation_method_different
-    attributes:
-      label: Was your original Installation method different?
-      options:
-        - "Yes"
-        - No (specify below)
-      default: 0
-    validations:
-      required: false
-  - type: input
-    id: original_installation_method_specify
-    attributes:
-      label: If no, specify
-      placeholder: e.g., Distro Packaging, then Source
-    validations:
-      required: false
-  - type: textarea
-    id: dms_doctor
-    attributes:
-      label: dms doctor -vC
-      description: Output of `dms doctor -vC` command — paste between the lines below to keep it collapsed in the issue
-      placeholder: Paste the output of `dms doctor -vC` here
-      value: |
-        <details>
-        <summary>Click to expand</summary>
-
-
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Brief description of the support needed
-      placeholder: What do you need help with?
-    validations:
-      required: true
-  - type: textarea
-    id: solutions_tried
-    attributes:
-      label: Solutions Tried
-      description: Describe what you've tried so far (commands, documentation, etc.)
-      placeholder: List steps or resources you've already tried
-    validations:
-      required: false
-  - type: textarea
-    id: configuration
-    attributes:
-      label: Configuration Details
-      description: Include any relevant configuration if relevant
-      placeholder: Add configuration or environment info
-    validations:
-      required: false
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots/Recordings
-      description: If applicable, add screenshots or screen recordings
-      placeholder: Attach images or videos here
-    validations:
-      required: false

.github/workflows/dms-stable.yml

@@ -1,31 +0,0 @@
-name: Update stable branch
-
-on:
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  contents: write
-
-jobs:
-  update-stable:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create GitHub App token
-        id: app_token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          token: ${{ steps.app_token.outputs.token }}
-
-      - name: Push to stable branch
-        env:
-          GH_TOKEN: ${{ steps.app_token.outputs.token }}
-        run: git push https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git HEAD:refs/heads/stable --force

.github/workflows/go-ci.yml

@@ -26,22 +26,27 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
-
-      - name: Install flatpak
-        run: sudo apt update && sudo apt install -y flatpak
-
-      - name: Add flathub
-        run: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-      - name: Add a flatpak that mutagen could support
-        run: sudo flatpak install -y org.freedesktop.Platform/x86_64/24.08 app.zen_browser.zen
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version-file: ./core/go.mod
 
+      - name: Format check
+        run: |
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+            echo "The following files are not formatted:"
+            gofmt -s -l .
+            exit 1
+          fi
+
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.6
+          working-directory: core
+
       - name: Test
         run: go test -v ./...
 

.github/workflows/nix-pr-check.yml

@@ -1,4 +1,4 @@
-name: Nix flake and NixOS tests
+name: Check nix flake
 
 on:
   pull_request:
@@ -9,35 +9,15 @@ on:
 jobs:
   check-flake:
     runs-on: ubuntu-latest
-    timeout-minutes: 120
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Install Nix
         uses: cachix/install-nix-action@v31
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            system-features = nixos-test benchmark big-parallel kvm
 
       - name: Check the flake
-        run: nix flake check -L
+        run: nix flake check
-
-      - name: Run NixOS module test
-        run: nix build .#nixosTests.x86_64-linux.nixos-module -L
-
-      - name: Run NixOS service start test
-        run: nix build .#nixosTests.x86_64-linux.nixos-service-start-module -L
-
-      - name: Run greeter niri test
-        run: nix build .#nixosTests.x86_64-linux.greeter-niri-module -L
-
-      - name: Run home-manager module test
-        run: nix build .#nixosTests.x86_64-linux.home-manager-module -L
-
-      - name: Run niri home-manager module test
-        run: nix build .#nixosTests.x86_64-linux.niri-home-module -L

.github/workflows/prek.yml

@@ -1,29 +0,0 @@
-name: Pre-commit Checks
-
-on:
-  push:
-  pull_request:
-    branches: [master, main]
-jobs:
-  pre-commit-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Install flatpak
-        run: sudo apt update && sudo apt install -y flatpak
-
-      - name: Add flathub
-        run: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-      - name: Add a flatpak that mutagen could support
-        run: sudo flatpak install -y org.freedesktop.Platform/x86_64/24.08 app.zen_browser.zen
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: core/go.mod
-
-      - name: run pre-commit hooks
-        uses: j178/prek-action@v1

.github/workflows/release.yml

@@ -32,13 +32,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.tag }}
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version-file: ./core/go.mod
 
@@ -106,7 +106,7 @@ jobs:
 
       - name: Upload artifacts (${{ matrix.arch }})
         if: matrix.arch == 'arm64'
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: core-assets-${{ matrix.arch }}
           path: |
@@ -120,7 +120,7 @@ jobs:
 
       - name: Upload artifacts with completions
         if: matrix.arch == 'amd64'
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: core-assets-${{ matrix.arch }}
           path: |
@@ -147,7 +147,7 @@ jobs:
   #         private-key: ${{ secrets.APP_PRIVATE_KEY }}
 
   #     - name: Checkout
-  #       uses: actions/checkout@v6
+  #       uses: actions/checkout@v4
   #       with:
   #         token: ${{ steps.app_token.outputs.token }}
   #         fetch-depth: 0
@@ -181,7 +181,7 @@ jobs:
       TAG: ${{ inputs.tag }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.tag }}
           fetch-depth: 0
@@ -191,13 +191,8 @@ jobs:
           git fetch origin --force tag ${TAG}
           git checkout ${TAG}
 
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: ./core/go.mod
-
       - name: Download core artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           pattern: core-assets-*
           merge-multiple: true
@@ -234,7 +229,6 @@ jobs:
           - **`dms-distropkg-arm64.gz`** - DMS CLI binary built with distro_package tag for ARM64 systems
           - **`dankinstall-amd64.gz`** - Installer binary for x86_64 systems
           - **`dankinstall-arm64.gz`** - Installer binary for ARM64 systems
-          - **`dms-cli-<version>.tar.gz`** - Go source code with vendored modules (for distro packaging)
           - **`dms-qml.tar.gz`** - QML source code only
 
           ### Checksums
@@ -287,9 +281,6 @@ jobs:
           # Copy root LICENSE and CONTRIBUTING.md to quickshell/ for packaging
           cp LICENSE CONTRIBUTING.md quickshell/
 
-          # Copy root assets directory to quickshell for systemd service and desktop file
-          cp -r assets quickshell/
-
           # Tar the CONTENTS of quickshell/, not the directory itself
           (cd quickshell && tar --exclude='.git' \
               --exclude='.github' \
@@ -393,19 +384,6 @@ jobs:
             rm -rf _temp_full
           done
 
-      - name: Generate vendored source tarball
-        run: |
-          set -euxo pipefail
-          VERSION_NUM=${TAG#v}
-          cd core
-          go mod vendor
-          cd ..
-          tar czf "_release_assets/dms-cli-${VERSION_NUM}.tar.gz" \
-            --transform "s,^core/,dms-cli-${VERSION_NUM}/," \
-            --exclude='core/.git' \
-            core/
-          (cd _release_assets && sha256sum "dms-cli-${VERSION_NUM}.tar.gz" > "dms-cli-${VERSION_NUM}.tar.gz.sha256")
-
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
@@ -417,3 +395,297 @@ jobs:
           prerelease: ${{ contains(env.TAG, '-') }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  # trigger-obs-update:
+  #   runs-on: ubuntu-latest
+  #   needs: release
+  #   env:
+  #     TAG: ${{ inputs.tag }}
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ inputs.tag }}
+
+  #     - name: Install OSC
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y osc
+
+  #         mkdir -p ~/.config/osc
+  #         cat > ~/.config/osc/oscrc << EOF
+  #         [general]
+  #         apiurl = https://api.opensuse.org
+
+  #         [https://api.opensuse.org]
+  #         user = ${{ secrets.OBS_USERNAME }}
+  #         pass = ${{ secrets.OBS_PASSWORD }}
+  #         EOF
+  #         chmod 600 ~/.config/osc/oscrc
+
+  #     - name: Update OBS packages
+  #       run: |
+  #         cd distro
+  #         bash scripts/obs-upload.sh dms "Update to ${TAG}"
+
+  # trigger-ppa-update:
+  #   runs-on: ubuntu-latest
+  #   needs: release
+  #   env:
+  #     TAG: ${{ inputs.tag }}
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ inputs.tag }}
+
+  #     - name: Install build dependencies
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y \
+  #           debhelper \
+  #           devscripts \
+  #           dput \
+  #           lftp \
+  #           build-essential \
+  #           fakeroot \
+  #           dpkg-dev
+
+  #     - name: Configure GPG
+  #       env:
+  #         GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+  #       run: |
+  #         echo "$GPG_KEY" | gpg --import
+  #         GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
+  #         echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
+
+  #     - name: Upload to PPA
+  #       run: |
+  #         cd distro/ubuntu/ppa
+  #         bash create-and-upload.sh ../dms dms questing
+
+  # copr-build:
+  #   runs-on: ubuntu-latest
+  #   needs: release
+  #   env:
+  #     TAG: ${{ inputs.tag }}
+
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ inputs.tag }}
+
+  #     - name: Determine version
+  #       id: version
+  #       run: |
+  #         VERSION="${TAG#v}"
+  #         echo "version=$VERSION" >> $GITHUB_OUTPUT
+  #         echo "Building DMS stable version: $VERSION"
+
+  #     - name: Setup build environment
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y rpm wget curl jq gzip
+  #         mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+
+  #     - name: Download release assets
+  #       run: |
+  #         VERSION="${{ steps.version.outputs.version }}"
+  #         cd ~/rpmbuild/SOURCES
+
+  #         wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
+  #           echo "Failed to download dms-qml.tar.gz for v${VERSION}"
+  #           exit 1
+  #         }
+
+  #     - name: Generate stable spec file
+  #       run: |
+  #         VERSION="${{ steps.version.outputs.version }}"
+  #         CHANGELOG_DATE="$(date '+%a %b %d %Y')"
+
+  #         cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+  #         # Spec for DMS stable releases - Generated by GitHub Actions
+
+  #         %global debug_package %{nil}
+  #         %global version VERSION_PLACEHOLDER
+  #         %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+
+  #         Name:           dms
+  #         Version:        %{version}
+  #         Release:        1%{?dist}
+  #         Summary:        %{pkg_summary}
+
+  #         License:        MIT
+  #         URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+  #         Source0:        dms-qml.tar.gz
+
+  #         BuildRequires:  gzip
+  #         BuildRequires:  wget
+  #         BuildRequires:  systemd-rpm-macros
+
+  #         Requires:       (quickshell or quickshell-git)
+  #         Requires:       accountsservice
+  #         Requires:       dms-cli = %{version}-%{release}
+  #         Requires:       dgop
+
+  #         Recommends:     cava
+  #         Recommends:     cliphist
+  #         Recommends:     danksearch
+  #         Recommends:     matugen
+  #         Recommends:     wl-clipboard
+  #         Recommends:     NetworkManager
+  #         Recommends:     qt6-qtmultimedia
+  #         Suggests:       qt6ct
+
+  #         %description
+  #         DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+  #         and optimized for the niri and hyprland compositors. Features notifications,
+  #         app launcher, wallpaper customization, and fully customizable with plugins.
+
+  #         Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+  #         process monitoring, notification center, clipboard history, dock, control center,
+  #         lock screen, and comprehensive plugin system.
+
+  #         %package -n dms-cli
+  #         Summary:        DankMaterialShell CLI tool
+  #         License:        MIT
+  #         URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+  #         %description -n dms-cli
+  #         Command-line interface for DankMaterialShell configuration and management.
+  #         Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+  #         %prep
+  #         %setup -q -c -n dms-qml
+
+  #         # Download architecture-specific binaries during build
+  #         case "%{_arch}" in
+  #           x86_64)
+  #             ARCH_SUFFIX="amd64"
+  #             ;;
+  #           aarch64)
+  #             ARCH_SUFFIX="arm64"
+  #             ;;
+  #           *)
+  #             echo "Unsupported architecture: %{_arch}"
+  #             exit 1
+  #             ;;
+  #         esac
+
+  #         wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+  #           echo "Failed to download dms-cli for architecture %{_arch}"
+  #           exit 1
+  #         }
+  #         gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+  #         chmod +x %{_builddir}/dms-cli
+
+  #         %build
+
+  #         %install
+  #         install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+
+  #         install -d %{buildroot}%{_datadir}/bash-completion/completions
+  #         install -d %{buildroot}%{_datadir}/zsh/site-functions
+  #         install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+  #         %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+  #         %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+  #         %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
+
+  #         install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+  #         install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
+  #         install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
+
+  #         install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+  #         cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+  #         rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+  #         rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+  #         rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+  #         rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+  #         echo "%{version}" > %{buildroot}%{_datadir}/quickshell/dms/VERSION
+
+  #         %posttrans
+  #         if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+  #             rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+  #             rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+  #             rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+  #         fi
+  #         # Signal running DMS instances to reload
+  #         pkill -USR1 -x dms >/dev/null 2>&1 || :
+
+  #         %files
+  #         %license LICENSE
+  #         %doc README.md CONTRIBUTING.md
+  #         %{_datadir}/quickshell/dms/
+  #         %{_userunitdir}/dms.service
+  #         %{_datadir}/applications/dms-open.desktop
+  #         %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
+
+  #         %files -n dms-cli
+  #         %{_bindir}/dms
+  #         %{_datadir}/bash-completion/completions/dms
+  #         %{_datadir}/zsh/site-functions/_dms
+  #         %{_datadir}/fish/vendor_completions.d/dms.fish
+
+  #         %changelog
+  #         * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
+  #         - Stable release VERSION_PLACEHOLDER
+  #         - Built from GitHub release
+  #         SPECEOF
+
+  #         sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+  #         sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+  #     - name: Build SRPM
+  #       id: build
+  #       run: |
+  #         cd ~/rpmbuild/SPECS
+  #         rpmbuild -bs dms.spec
+
+  #         SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
+  #         SRPM_NAME=$(basename "$SRPM")
+
+  #         echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
+  #         echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
+  #         echo "SRPM built: $SRPM_NAME"
+
+  #     - name: Upload SRPM artifact
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: dms-stable-srpm-${{ steps.version.outputs.version }}
+  #         path: ${{ steps.build.outputs.srpm_path }}
+  #         retention-days: 90
+
+  #     - name: Install Copr CLI
+  #       run: |
+  #         sudo apt-get install -y python3-pip
+  #         pip3 install copr-cli
+
+  #         mkdir -p ~/.config
+  #         cat > ~/.config/copr << EOF
+  #         [copr-cli]
+  #         login = ${{ secrets.COPR_LOGIN }}
+  #         username = avengemedia
+  #         token = ${{ secrets.COPR_TOKEN }}
+  #         copr_url = https://copr.fedorainfracloud.org
+  #         EOF
+  #         chmod 600 ~/.config/copr
+
+  #     - name: Upload to Copr
+  #       run: |
+  #         SRPM="${{ steps.build.outputs.srpm_path }}"
+  #         VERSION="${{ steps.version.outputs.version }}"
+
+  #         echo "Uploading SRPM to avengemedia/dms..."
+  #         BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
+  #         echo "$BUILD_OUTPUT"
+
+  #         BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
+
+  #         if [ "$BUILD_ID" != "unknown" ]; then
+  #           echo "Build submitted: https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
+  #         fi

.github/workflows/run-copr.yml

@@ -3,17 +3,8 @@ name: DMS Copr Stable Release
 on:
   workflow_dispatch:
     inputs:
-      package:
-        description: 'Package to build (dms, dms-greeter, or both)'
-        required: false
-        default: 'dms'
-        type: choice
-        options:
-          - dms
-          - dms-greeter
-          - both
       version:
-        description: 'Versioning (e.g., 1.0.3, leave empty for latest release)'
+        description: 'Versioning (e.g., 0.1.14, leave empty for latest release)'
         required: false
         default: ''
       release:
@@ -22,31 +13,12 @@ on:
         default: '1'
 
 jobs:
-  determine-packages:
-    runs-on: ubuntu-latest
-    outputs:
-      packages: ${{ steps.set-packages.outputs.packages }}
-    steps:
-      - name: Set package list
-        id: set-packages
-        run: |
-          PACKAGE_INPUT="${{ github.event.inputs.package || 'dms' }}"
-          if [ "$PACKAGE_INPUT" = "both" ]; then
-            echo 'packages=["dms","dms-greeter"]' >> $GITHUB_OUTPUT
-          else
-            echo "packages=[\"$PACKAGE_INPUT\"]" >> $GITHUB_OUTPUT
-          fi
-
   build-and-upload:
-    needs: determine-packages
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package: ${{ fromJSON(needs.determine-packages.outputs.packages) }}
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       
       - name: Determine version
         id: version
@@ -67,7 +39,7 @@ jobs:
 
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "release=$RELEASE" >> $GITHUB_OUTPUT
-          echo "✅ Building ${{ matrix.package }} version: $VERSION-$RELEASE"
+          echo "✅ Building DMS hotfix version: $VERSION-$RELEASE"
       
       - name: Setup build environment
         run: |
@@ -98,31 +70,157 @@ jobs:
           VERSION="${{ steps.version.outputs.version }}"
           RELEASE="${{ steps.version.outputs.release }}"
           CHANGELOG_DATE="$(date '+%a %b %d %Y')"
-          PACKAGE="${{ matrix.package }}"
 
-          # Copy spec file from repository
+          cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
-          cp distro/fedora/${PACKAGE}.spec ~/rpmbuild/SPECS/${PACKAGE}.spec
+          # Spec for DMS stable releases - Generated by GitHub Actions
 
-          # Replace placeholders with actual values
+          %global debug_package %{nil}
-          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/${PACKAGE}.spec
+          %global version VERSION_PLACEHOLDER
-          sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/${PACKAGE}.spec
+          %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
-          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/${PACKAGE}.spec
 
-          echo "✅ Spec file generated for ${PACKAGE} v${VERSION}-${RELEASE}"
+          Name:           dms
+          Version:        %{version}
+          Release:        RELEASE_PLACEHOLDER%{?dist}
+          Summary:        %{pkg_summary}
+
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          Source0:        dms-qml.tar.gz
+
+          BuildRequires:  gzip
+          BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros
+
+          Requires:       (quickshell or quickshell-git)
+          Requires:       accountsservice
+          Requires:       dms-cli = %{version}-%{release}
+          Requires:       dgop
+
+          Recommends:     cava
+          Recommends:     cliphist
+          Recommends:     danksearch
+          Recommends:     hyprpicker
+          Recommends:     matugen
+          Recommends:     wl-clipboard
+          Recommends:     NetworkManager
+          Recommends:     qt6-qtmultimedia
+          Suggests:       qt6ct
+
+          %description
+          DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+          and optimized for the niri and hyprland compositors. Features notifications,
+          app launcher, wallpaper customization, and fully customizable with plugins.
+
+          Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+          process monitoring, notification center, clipboard history, dock, control center,
+          lock screen, and comprehensive plugin system.
+
+          %package -n dms-cli
+          Summary:        DankMaterialShell CLI tool
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          %description -n dms-cli
+          Command-line interface for DankMaterialShell configuration and management.
+          Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+          %prep
+          %setup -q -c -n dms-qml
+
+          # Download architecture-specific binaries during build
+          # This ensures the correct architecture is used for each build target
+          case "%{_arch}" in
+            x86_64)
+              ARCH_SUFFIX="amd64"
+              ;;
+            aarch64)
+              ARCH_SUFFIX="arm64"
+              ;;
+            *)
+              echo "Unsupported architecture: %{_arch}"
+              exit 1
+              ;;
+          esac
+
+          # Download dms-cli for target architecture
+          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dms-cli for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+          chmod +x %{_builddir}/dms-cli
+
+          %build
+
+          %install
+          install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+
+          # Shell completions
+          install -d %{buildroot}%{_datadir}/bash-completion/completions
+          install -d %{buildroot}%{_datadir}/zsh/site-functions
+          install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+          %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+          %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+          %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
+
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+          install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+          rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+          %posttrans
+          # Clean up old installation path from previous versions (only if empty)
+          if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+              # Remove directories only if empty (preserves any user-added files)
+              rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+          fi
+          # Signal running DMS instances to reload (harmless if none running)
+          pkill -USR1 -x dms >/dev/null 2>&1 || :
+
+          %files
+          %license LICENSE
+          %doc README.md CONTRIBUTING.md
+          %{_datadir}/quickshell/dms/
+          %{_userunitdir}/dms.service
+
+          %files -n dms-cli
+          %{_bindir}/dms
+          %{_datadir}/bash-completion/completions/dms
+          %{_datadir}/zsh/site-functions/_dms
+          %{_datadir}/fish/vendor_completions.d/dms.fish
+
+          %changelog
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-RELEASE_PLACEHOLDER
+          - Stable release VERSION_PLACEHOLDER
+          - Built from GitHub release
+          SPECEOF
+
+          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+          echo "✅ Spec file generated for v${VERSION}-${RELEASE}"
           echo ""
           echo "=== Spec file preview ==="
-          head -40 ~/rpmbuild/SPECS/${PACKAGE}.spec
+          head -40 ~/rpmbuild/SPECS/dms.spec
       
       - name: Build SRPM
         id: build
         run: |
           cd ~/rpmbuild/SPECS
-          PACKAGE="${{ matrix.package }}"
           
-          echo "🔨 Building SRPM for ${PACKAGE}..."
+          echo "🔨 Building SRPM..."
-          rpmbuild -bs ${PACKAGE}.spec
+          rpmbuild -bs dms.spec
           
-          SRPM=$(ls ~/rpmbuild/SRPMS/${PACKAGE}-*.src.rpm | tail -n 1)
+          SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
           SRPM_NAME=$(basename "$SRPM")
           
           echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
@@ -134,9 +232,9 @@ jobs:
           rpm -qpi "$SRPM"
       
       - name: Upload SRPM artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.package }}-stable-srpm-${{ steps.version.outputs.version }}
+          name: dms-stable-srpm-${{ steps.version.outputs.version }}
           path: ${{ steps.build.outputs.srpm_path }}
           retention-days: 90
       
@@ -157,40 +255,23 @@ jobs:
           
           echo "✅ Copr CLI configured"
       
-      - name: Determine Copr project
-        id: copr_project
-        run: |
-          PACKAGE="${{ matrix.package }}"
-          if [ "$PACKAGE" = "dms" ]; then
-            COPR_PROJECT="avengemedia/dms"
-          elif [ "$PACKAGE" = "dms-greeter" ]; then
-            COPR_PROJECT="avengemedia/danklinux"
-          else
-            echo "❌ Unknown package: $PACKAGE"
-            exit 1
-          fi
-          echo "copr_project=$COPR_PROJECT" >> $GITHUB_OUTPUT
-          echo "✅ Copr project: $COPR_PROJECT"
-
       - name: Upload to Copr
         run: |
           SRPM="${{ steps.build.outputs.srpm_path }}"
           VERSION="${{ steps.version.outputs.version }}"
-          COPR_PROJECT="${{ steps.copr_project.outputs.copr_project }}"
-          PACKAGE="${{ matrix.package }}"
           
-          echo "🚀 Uploading ${PACKAGE} SRPM to ${COPR_PROJECT}..."
+          echo "🚀 Uploading SRPM to avengemedia/dms..."
           echo "   SRPM: $(basename $SRPM)"
           echo "   Version: $VERSION"
           
-          BUILD_OUTPUT=$(copr-cli build "$COPR_PROJECT" "$SRPM" --nowait 2>&1)
+          BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
           echo "$BUILD_OUTPUT"
           
           BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
           
           if [ "$BUILD_ID" != "unknown" ]; then
             echo "✅ Build submitted successfully!"
-            echo "🔗 https://copr.fedorainfracloud.org/coprs/${COPR_PROJECT}/build/$BUILD_ID/"
+            echo "🔗 https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
           else
             echo "⚠️  Could not extract build ID, but upload may have succeeded"
           fi
@@ -198,13 +279,10 @@ jobs:
       - name: Build summary
         if: always()
         run: |
-          PACKAGE="${{ matrix.package }}"
+          echo "### 🎉 DMS Stable Build Summary" >> $GITHUB_STEP_SUMMARY
-          COPR_PROJECT="${{ steps.copr_project.outputs.copr_project }}"
-          echo "### 🎉 ${PACKAGE} Stable Build Summary" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Package:** ${PACKAGE}" >> $GITHUB_STEP_SUMMARY
           echo "- **Version:** ${{ steps.version.outputs.version }}-${{ steps.version.outputs.release }}" >> $GITHUB_STEP_SUMMARY
           echo "- **SRPM:** ${{ steps.build.outputs.srpm_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Project:** https://copr.fedorainfracloud.org/coprs/${COPR_PROJECT}/" >> $GITHUB_STEP_SUMMARY
+          echo "- **Project:** https://copr.fedorainfracloud.org/coprs/avengemedia/dms/" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "Stable release has been built and uploaded to Copr!" >> $GITHUB_STEP_SUMMARY

.github/workflows/run-obs.yml

@@ -4,21 +4,18 @@ on:
   workflow_dispatch:
     inputs:
       package:
-        description: "Package to update"
+        description: 'Package to update (dms, dms-git, or all)'
-        required: true
-        type: choice
-        options:
-          - dms
-          - dms-greeter
-          - dms-git
-          - all
-        default: "dms"
-      rebuild_release:
-        description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)"
         required: false
-        default: ""
+        default: 'all'
+      rebuild_release:
+        description: 'Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)'
+        required: false
+        default: ''
+  push:
+    tags:
+      - 'v*'
   schedule:
-    - cron: "0 2,5,14,17,20,23 * * *" # 9am, 12pm, 3pm, 6pm, 9pm, 12am EST (UTC times shown)
+    - cron: '0 */3 * * *'  # Every 3 hours for dms-git builds
 
 jobs:
   check-updates:
@@ -32,325 +29,10 @@ jobs:
     
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       
-      - name: Check for updates
-        id: check
-        env:
-          OBS_USERNAME: ${{ secrets.OBS_USERNAME }}
-          OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }}
-        run: |
-          # Helper function to check dms-git commit
-          check_dms_git() {
-            local CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
-            local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:dms-git/dms-git/dms-git.spec" 2>/dev/null || echo "")
-            local OBS_COMMIT=$(echo "$OBS_SPEC" | grep "^Version:" | grep -oP '\.[a-f0-9]{8}' | tr -d '.' || echo "")
-
-            if [[ -n "$OBS_COMMIT" && "$CURRENT_COMMIT" == "$OBS_COMMIT" ]]; then
-              echo "📋 dms-git: Commit $CURRENT_COMMIT already exists, skipping"
-              return 1  # No update needed
-            else
-              echo "📋 dms-git: New commit $CURRENT_COMMIT (OBS has ${OBS_COMMIT:-none})"
-              return 0  # Update needed
-            fi
-          }
-
-          # Helper function to check dms stable tag
-          # Sets LATEST_TAG variable in parent scope if update needed
-          check_dms_stable() {
-            LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
-            local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:dms/dms/dms.spec" 2>/dev/null || echo "")
-            local OBS_VERSION=$(echo "$OBS_SPEC" | grep "^Version:" | awk '{print $2}' | xargs || echo "")
-
-            if [[ -n "$LATEST_TAG" && "$LATEST_TAG" == "$OBS_VERSION" ]]; then
-              echo "📋 dms: Tag $LATEST_TAG already exists, skipping"
-              return 1  # No update needed
-            else
-              echo "📋 dms: New tag ${LATEST_TAG:-unknown} (OBS has ${OBS_VERSION:-none})"
-              return 0  # Update needed
-            fi
-          }
-
-          # Helper function to check dms-greeter stable tag
-          check_dms_greeter_stable() {
-            LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
-            local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:danklinux/dms-greeter/dms-greeter.spec" 2>/dev/null || echo "")
-            local OBS_VERSION=$(echo "$OBS_SPEC" | grep "^Version:" | awk '{print $2}' | xargs | sed 's/^v//')
-
-            if [[ -n "$LATEST_TAG" && "$LATEST_TAG" == "v$OBS_VERSION" ]]; then
-              echo "📋 dms-greeter: Tag $LATEST_TAG already exists, skipping"
-              return 1  # No update needed
-            else
-              echo "📋 dms-greeter: New tag ${LATEST_TAG:-unknown} (OBS has ${OBS_VERSION:-none})"
-              return 0  # Update needed
-            fi
-          }
-
-          # Main logic
-          REBUILD="${{ github.event.inputs.rebuild_release }}"
-
-          if [[ "${{ github.ref }}" =~ ^refs/tags/ ]] && [[ -z "${{ github.event.inputs.package }}" ]]; then
-            # Run from tag with no package specified - update both stable packages
-            echo "packages=dms dms-greeter" >> $GITHUB_OUTPUT
-            VERSION="${GITHUB_REF#refs/tags/}"
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
-            echo "has_updates=true" >> $GITHUB_OUTPUT
-            echo "Triggered by tag: $VERSION (always update)"
-
-          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            # Scheduled run - check dms-git only
-            echo "packages=dms-git" >> $GITHUB_OUTPUT
-            if check_dms_git; then
-              echo "has_updates=true" >> $GITHUB_OUTPUT
-            else
-              echo "has_updates=false" >> $GITHUB_OUTPUT
-            fi
-
-          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
-            # Manual workflow trigger
-            PKG="${{ github.event.inputs.package }}"
-
-            if [[ -n "$REBUILD" ]]; then
-              # Rebuild requested - always proceed
-              echo "packages=$PKG" >> $GITHUB_OUTPUT
-              echo "has_updates=true" >> $GITHUB_OUTPUT
-              echo "🔄 Manual rebuild requested: $PKG (db$REBUILD)"
-
-            elif [[ "$PKG" == "all" ]]; then
-              # Check each stable package and build list of those needing updates
-              PACKAGES_TO_UPDATE=()
-              if check_dms_stable; then
-                PACKAGES_TO_UPDATE+=("dms")
-                if [[ -n "$LATEST_TAG" ]]; then
-                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                fi
-              fi
-              if check_dms_greeter_stable; then
-                PACKAGES_TO_UPDATE+=("dms-greeter")
-                [[ -n "$LATEST_TAG" ]] && echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-              fi
-
-              if [[ ${#PACKAGES_TO_UPDATE[@]} -gt 0 ]]; then
-                echo "packages=${PACKAGES_TO_UPDATE[*]}" >> $GITHUB_OUTPUT
-                echo "has_updates=true" >> $GITHUB_OUTPUT
-                echo "✓ Packages to update: ${PACKAGES_TO_UPDATE[*]}"
-              else
-                echo "packages=" >> $GITHUB_OUTPUT
-                echo "has_updates=false" >> $GITHUB_OUTPUT
-                echo "✓ Both packages up to date"
-              fi
-
-            elif [[ "$PKG" == "dms-git" ]]; then
-              if check_dms_git; then
-                echo "packages=$PKG" >> $GITHUB_OUTPUT
-                echo "has_updates=true" >> $GITHUB_OUTPUT
-              else
-                echo "packages=" >> $GITHUB_OUTPUT
-                echo "has_updates=false" >> $GITHUB_OUTPUT
-              fi
-
-            elif [[ "$PKG" == "dms" ]]; then
-              if check_dms_stable; then
-                echo "packages=$PKG" >> $GITHUB_OUTPUT
-                echo "has_updates=true" >> $GITHUB_OUTPUT
-                if [[ -n "$LATEST_TAG" ]]; then
-                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                fi
-              else
-                echo "packages=" >> $GITHUB_OUTPUT
-                echo "has_updates=false" >> $GITHUB_OUTPUT
-              fi
-
-            elif [[ "$PKG" == "dms-greeter" ]]; then
-              if check_dms_greeter_stable; then
-                echo "packages=$PKG" >> $GITHUB_OUTPUT
-                echo "has_updates=true" >> $GITHUB_OUTPUT
-                if [[ -n "$LATEST_TAG" ]]; then
-                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                fi
-              else
-                echo "packages=" >> $GITHUB_OUTPUT
-                echo "has_updates=false" >> $GITHUB_OUTPUT
-              fi
-
-            else
-              # Unknown package - proceed anyway
-              echo "packages=$PKG" >> $GITHUB_OUTPUT
-              echo "has_updates=true" >> $GITHUB_OUTPUT
-              echo "Manual trigger: $PKG"
-            fi
-          else
-            # Fallback - proceed
-            echo "packages=all" >> $GITHUB_OUTPUT
-            echo "has_updates=true" >> $GITHUB_OUTPUT
-          fi
-
-  update-obs:
-    name: Upload to OBS
-    needs: check-updates
-    runs-on: ubuntu-latest
-    if: needs.check-updates.outputs.has_updates == 'true'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Wait before OBS upload
-        run: sleep 3
-
-      - name: Determine packages to update
-        id: packages
-        run: |
-          # Use check-updates outputs when available
-          if [[ -n "${{ needs.check-updates.outputs.version }}" ]]; then
-            # Use version from check-updates job
-            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
-            echo "version=${{ needs.check-updates.outputs.version }}" >> $GITHUB_OUTPUT
-            echo "Using version from check-updates: ${{ needs.check-updates.outputs.version }}"
-          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            # Scheduled run - dms-git only
-            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
-            echo "Triggered by schedule: updating git package"
-          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
-            # Manual workflow dispatch
-
-            # Determine version for dms stable and dms-greeter using the API
-            # GITHUB_REF is unreliable when "Use workflow from" a tag; API works from any ref
-            if [[ "${{ github.event.inputs.package }}" == "dms" ]] || [[ "${{ github.event.inputs.package }}" == "dms-greeter" ]] || [[ "${{ github.event.inputs.package }}" == "all" ]]; then
-              LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
-              if [[ -n "$LATEST_TAG" ]]; then
-                echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                echo "Using latest release from API: $LATEST_TAG"
-              else
-                echo "ERROR: Could not fetch latest release from API"
-                exit 1
-              fi
-            fi
-
-            # Use filtered packages from check-updates when package="all" and no rebuild/tag specified
-            if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ ! "${{ github.ref }}" =~ ^refs/tags/ ]]; then
-              echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
-              echo "Manual trigger: all (filtered to: ${{ needs.check-updates.outputs.packages }})"
-            else
-              echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
-              echo "Manual trigger: ${{ github.event.inputs.package }}"
-            fi
-          else
-            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
-            if [[ -n "${{ needs.check-updates.outputs.version }}" ]]; then
-              echo "version=${{ needs.check-updates.outputs.version }}" >> $GITHUB_OUTPUT
-            fi
-          fi
-
-      - name: Update dms-git spec version
-        if: contains(steps.packages.outputs.packages, 'dms-git')
-        run: |
-          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
-          COMMIT_COUNT=$(git rev-list --count HEAD)
-          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "1.0.2")
-          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
-          echo "📦 Updating dms-git.spec to version: $NEW_VERSION"
-
-          sed -i "s/^Version:.*/Version:        $NEW_VERSION/" distro/opensuse/dms-git.spec
-
-          # Single changelog entry (git snapshots don't need history)
-          DATE_STR=$(date "+%a %b %d %Y")
-          LOCAL_SPEC_HEAD=$(sed -n '1,/%changelog/{ /%changelog/d; p }' distro/opensuse/dms-git.spec)
-          {
-            echo "$LOCAL_SPEC_HEAD"
-            echo "%changelog"
-            echo "* $DATE_STR Avenge Media <AvengeMedia.US@gmail.com> - ${NEW_VERSION}-1"
-            echo "- Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)"
-          } > distro/opensuse/dms-git.spec
-
-      - name: Update Debian dms-git changelog version
-        if: contains(steps.packages.outputs.packages, 'dms-git')
-        run: |
-          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
-          COMMIT_COUNT=$(git rev-list --count HEAD)
-          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "1.0.2")
-          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
-          echo "📦 Updating Debian dms-git changelog to version: $NEW_VERSION"
-
-          # Single changelog entry (git snapshots don't need history)
-          CHANGELOG_DATE=$(date -R)
-          {
-            echo "dms-git (${NEW_VERSION}db1) nightly; urgency=medium"
-            echo ""
-            echo "  * Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)"
-            echo ""
-            echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
-          } > "distro/debian/dms-git/debian/changelog"
-
-      - name: Update stable version (dms + dms-greeter)
-        if: steps.packages.outputs.version != ''
-        run: |
-          VERSION="${{ steps.packages.outputs.version }}"
-          VERSION_NO_V="${VERSION#v}"
-          PACKAGES="${{ steps.packages.outputs.packages }}"
-          echo "==> Updating packaging files to version: $VERSION_NO_V"
-
-          # Update dms spec and changelog when dms is in the upload list
-          if [[ "$PACKAGES" == *"dms"* ]]; then
-            sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
-            UPDATED_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1)
-            echo "✓ dms spec now shows Version: $UPDATED_VERSION"
-
-            DATE_STR=$(date "+%a %b %d %Y")
-            LOCAL_SPEC_HEAD=$(sed -n '1,/%changelog/{ /%changelog/d; p }' distro/opensuse/dms.spec)
-            {
-              echo "$LOCAL_SPEC_HEAD"
-              echo "%changelog"
-              echo "* $DATE_STR AvengeMedia <maintainer@avengemedia.com> - ${VERSION_NO_V}-1"
-              echo "- Update to stable $VERSION release"
-            } > distro/opensuse/dms.spec
-
-            if [[ -f "distro/debian/dms/debian/changelog" ]]; then
-              CHANGELOG_DATE=$(date -R)
-              {
-                echo "dms (${VERSION_NO_V}db1) stable; urgency=medium"
-                echo ""
-                echo "  * Update to $VERSION stable release"
-                echo ""
-                echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
-              } > "distro/debian/dms/debian/changelog"
-              echo "✓ Updated dms changelog to ${VERSION_NO_V}db1"
-            fi
-          fi
-
-          # Update dms-greeter changelog when dms-greeter is in the upload list
-          if [[ "$PACKAGES" == *"dms-greeter"* ]] && [[ -f "distro/debian/dms-greeter/debian/changelog" ]]; then
-            CHANGELOG_DATE=$(date -R)
-            {
-              echo "dms-greeter (${VERSION_NO_V}db1) unstable; urgency=medium"
-              echo ""
-              echo "  * Update to $VERSION stable release"
-              echo ""
-              echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
-            } > "distro/debian/dms-greeter/debian/changelog"
-            echo "✓ Updated dms-greeter changelog to ${VERSION_NO_V}db1"
-          fi
-
-          # Update Debian _service files for packages in upload list (download_url paths)
-          for service in distro/debian/*/_service; do
-            if [[ -f "$service" ]]; then
-              # Update tar_scm revision parameter (for dms-git)
-              sed -i "s|<param name=\"revision\">v[0-9.]*</param>|<param name=\"revision\">$VERSION</param>|" "$service"
-              # Update download_url paths (for dms, dms-greeter stable)
-              sed -i "s|/v[0-9.]\+/|/$VERSION/|g" "$service"
-              sed -i "s|/tags/v[0-9.]\+\.tar\.gz|/tags/$VERSION.tar.gz|g" "$service"
-            fi
-          done
-
-      - name: Install Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: ./core/go.mod
-
       - name: Install OSC
         run: |
           sudo apt-get update
@@ -367,159 +49,228 @@ jobs:
           EOF
           chmod 600 ~/.config/osc/oscrc
       
-      # Cache OBS bundled Go toolchains
+      - name: Check for updates
-      - name: Cache OBS bundled Go toolchains (dms-git)
+        id: check
-        if: contains(steps.packages.outputs.packages, 'dms-git')
+        run: |
-        uses: actions/cache@v4
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Triggered by tag: $VERSION (always update)"
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "Checking if dms-git source has changed..."
+
+            # Get current commit hash (8 chars to match spec format)
+            CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
+
+            # Check OBS for last uploaded commit
+            OBS_BASE="$HOME/.cache/osc-checkouts"
+            mkdir -p "$OBS_BASE"
+            OBS_PROJECT="home:AvengeMedia:dms-git"
+
+            if [[ -d "$OBS_BASE/$OBS_PROJECT/dms-git" ]]; then
+              cd "$OBS_BASE/$OBS_PROJECT/dms-git"
+              osc up -q 2>/dev/null || true
+
+              # Extract commit hash from spec Version line & format like; 0.6.2+git2264.a679be68
+              if [[ -f "dms-git.spec" ]]; then
+                OBS_COMMIT=$(grep "^Version:" "dms-git.spec" | grep -oP '\.[a-f0-9]{8}' | tr -d '.' || echo "")
+
+                if [[ -n "$OBS_COMMIT" ]]; then
+                  if [[ "$CURRENT_COMMIT" == "$OBS_COMMIT" ]]; then
+                    echo "has_updates=false" >> $GITHUB_OUTPUT
+                    echo "📋 Commit $CURRENT_COMMIT already uploaded to OBS, skipping"
+                  else
+                    echo "has_updates=true" >> $GITHUB_OUTPUT
+                    echo "📋 New commit detected: $CURRENT_COMMIT (OBS has $OBS_COMMIT)"
+                  fi
+                else
+                  echo "has_updates=true" >> $GITHUB_OUTPUT
+                  echo "📋 Could not extract OBS commit, proceeding with update"
+                fi
+              else
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+                echo "📋 No spec file in OBS, proceeding with update"
+              fi
+
+              cd "${{ github.workspace }}"
+            else
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "📋 First upload to OBS, update needed"
+            fi
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=all" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+          fi
+
+  update-obs:
+    name: Upload to OBS
+    needs: check-updates
+    runs-on: ubuntu-latest
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      needs.check-updates.outputs.has_updates == 'true'
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          path: /home/runner/.cache/dms-obs-go-toolchain
+          fetch-depth: 0
-          key: dms-obs-go-toolchain-${{ runner.os }}-${{ hashFiles('core/go.mod') }}
+      
-          restore-keys: |
+      - name: Determine packages to update
-            dms-obs-go-toolchain-${{ runner.os }}-
+        id: packages
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "Triggered by tag: $VERSION"
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+            echo "Triggered by schedule: updating git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+          fi
+      
+      - name: Update dms-git spec version
+        if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all'
+        run: |
+          # Get commit info for dms-git versioning
+          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
+          COMMIT_COUNT=$(git rev-list --count HEAD)
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
+          
+          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
+          echo "📦 Updating dms-git.spec to version: $NEW_VERSION"
+          
+          # Update version in spec
+          sed -i "s/^Version:.*/Version:        $NEW_VERSION/" distro/opensuse/dms-git.spec
+          
+          # Add changelog entry
+          DATE_STR=$(date "+%a %b %d %Y")
+          CHANGELOG_ENTRY="* $DATE_STR Avenge Media <AvengeMedia.US@gmail.com> - ${NEW_VERSION}-1\n- Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)"
+          sed -i "/%changelog/a\\$CHANGELOG_ENTRY" distro/opensuse/dms-git.spec
+
+      - name: Update Debian dms-git changelog version
+        if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all'
+        run: |
+          # Get commit info for dms-git versioning 
+          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
+          COMMIT_COUNT=$(git rev-list --count HEAD)
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
+
+          # Debian version format: 0.6.2+git2256.9162e314 
+          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
+          echo "📦 Updating Debian dms-git changelog to version: $NEW_VERSION"
+
+          CHANGELOG_DATE=$(date -R)
+
+          CHANGELOG_FILE="distro/debian/dms-git/debian/changelog"
+
+          # Get current version from changelog
+          CURRENT_VERSION=$(head -1 "$CHANGELOG_FILE" | sed 's/.*(\([^)]*\)).*/\1/')
+
+          echo "Current Debian version: $CURRENT_VERSION"
+          echo "New version: $NEW_VERSION"
+
+          # Only update if version changed 
+          if [ "$CURRENT_VERSION" != "$NEW_VERSION" ]; then
+            # Create new changelog entry at top
+            TEMP_CHANGELOG=$(mktemp)
+
+            cat > "$TEMP_CHANGELOG" << EOF
+          dms-git ($NEW_VERSION) nightly; urgency=medium
+
+            * Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)
+
+           -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE
+
+          EOF
+
+            # Prepend to existing changelog
+            cat "$CHANGELOG_FILE" >> "$TEMP_CHANGELOG"
+            mv "$TEMP_CHANGELOG" "$CHANGELOG_FILE"
+
+            echo "✓ Updated Debian changelog: $CURRENT_VERSION → $NEW_VERSION"
+          else
+            echo "✓ Debian changelog already at version $NEW_VERSION"
+          fi
+
+      - name: Update dms stable version
+        if: steps.packages.outputs.version != ''
+        run: |
+          VERSION="${{ steps.packages.outputs.version }}"
+          VERSION_NO_V="${VERSION#v}"
+          echo "Updating packaging to version $VERSION_NO_V"
+          
+          # Update openSUSE dms spec (stable only)
+          sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
+          
+          # Update Debian _service files
+          for service in distro/debian/*/_service; do
+            if [[ -f "$service" ]]; then
+              sed -i "s|<param name=\"revision\">v[0-9.]*</param>|<param name=\"revision\">$VERSION</param>|" "$service"
+            fi
+          done
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+
+      - name: Install OSC
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc
+
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org
+
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc
 
       - name: Upload to OBS
-        id: upload
         env:
+          FORCE_REBUILD: ${{ github.event_name == 'workflow_dispatch' && 'true' || '' }}
           REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
-          TAG_VERSION: ${{ steps.packages.outputs.version }}
         run: |
           PACKAGES="${{ steps.packages.outputs.packages }}"
-
-          if [[ -z "$PACKAGES" ]]; then
-            echo "✓ No packages need uploading. All up to date!"
-            echo "uploaded_packages=" >> $GITHUB_OUTPUT
-            echo "skipped_packages=" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
           MESSAGE="Automated update from GitHub Actions"
+          
           if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
             MESSAGE="Update to ${{ steps.packages.outputs.version }}"
-            echo "==> Version being uploaded: ${{ steps.packages.outputs.version }}"
           fi
           
-          UPLOADED_PACKAGES=()
+          if [[ "$PACKAGES" == "all" ]]; then
-          SKIPPED_PACKAGES=()
+            bash distro/scripts/obs-upload.sh dms "$MESSAGE"
-
+            bash distro/scripts/obs-upload.sh dms-git "Automated git update"
-          # PACKAGES can be space-separated list (e.g., "dms dms-greeter" from "all" check)
-          # Loop through each package and upload
-          for PKG in $PACKAGES; do
-            echo ""
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            echo "Uploading $PKG to OBS..."
-            if [[ -n "$REBUILD_RELEASE" ]]; then
-              echo "🔄 Using rebuild release number: db$REBUILD_RELEASE"
-            fi
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-
-            LOG_FILE=$(mktemp)
-            set +e
-            if [[ "$PKG" == "dms-git" ]]; then
-              bash distro/scripts/obs-upload.sh dms-git "Automated git update" >"$LOG_FILE" 2>&1
           else
-              bash distro/scripts/obs-upload.sh "$PKG" "$MESSAGE" >"$LOG_FILE" 2>&1
+            bash distro/scripts/obs-upload.sh "$PACKAGES" "$MESSAGE"
           fi
-            STATUS=$?
-            set -e
-
-            cat "$LOG_FILE"
-
-            if [[ $STATUS -ne 0 ]]; then
-              rm -f "$LOG_FILE"
-              echo "❌ Upload failed for $PKG"
-              exit $STATUS
-            fi
-
-            if grep -Eq "Exiting gracefully \(no changes needed\)|No changes needed for this package\. Exiting gracefully\." "$LOG_FILE"; then
-              echo "ℹ️  $PKG is already up to date. Skipped."
-              SKIPPED_PACKAGES+=("$PKG")
-            else
-              UPLOADED_PACKAGES+=("$PKG")
-            fi
-
-            rm -f "$LOG_FILE"
-          done
-
-          echo "uploaded_packages=${UPLOADED_PACKAGES[*]}" >> $GITHUB_OUTPUT
-          echo "skipped_packages=${SKIPPED_PACKAGES[*]}" >> $GITHUB_OUTPUT
       
       - name: Summary
-        if: always()
         run: |
-          echo "### OBS Package Upload Summary" >> $GITHUB_STEP_SUMMARY
+          echo "### OBS Package Update Complete" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-
+          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
-          PACKAGES="${{ steps.packages.outputs.packages }}"
-
-          if [[ -z "$PACKAGES" ]]; then
-            echo "**Status:** ✅ All packages up to date (no uploads needed)" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "All packages are current. Run completed successfully." >> $GITHUB_STEP_SUMMARY
-          else
-            UPLOADED_PACKAGES="${{ steps.upload.outputs.uploaded_packages }}"
-            SKIPPED_PACKAGES="${{ steps.upload.outputs.skipped_packages }}"
-            TOTAL_COUNT=$(wc -w <<<"$PACKAGES" | tr -d ' ')
-            UPLOADED_COUNT=0
-            SKIPPED_COUNT=0
-            if [[ -n "$UPLOADED_PACKAGES" ]]; then
-              UPLOADED_COUNT=$(wc -w <<<"$UPLOADED_PACKAGES" | tr -d ' ')
-            fi
-            if [[ -n "$SKIPPED_PACKAGES" ]]; then
-              SKIPPED_COUNT=$(wc -w <<<"$SKIPPED_PACKAGES" | tr -d ' ')
-            fi
-            in_list() {
-              local item="$1"
-              local list="$2"
-              [[ " $list " == *" $item "* ]]
-            }
-
-            if [[ "${{ job.status }}" == "success" ]]; then
-              echo "**Status:** ✅ Completed successfully" >> $GITHUB_STEP_SUMMARY
-            else
-              echo "**Status:** ❌ Completed with errors" >> $GITHUB_STEP_SUMMARY
-            fi
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**Processed:** $TOTAL_COUNT package(s)" >> $GITHUB_STEP_SUMMARY
-            echo "**Uploaded:** $UPLOADED_COUNT package(s)" >> $GITHUB_STEP_SUMMARY
-            echo "**Skipped (up to date):** $SKIPPED_COUNT package(s)" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**Packages:**" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-
-            for PKG in $PACKAGES; do
-              STATUS_ICON="✅"
-              STATUS_TEXT="uploaded"
-              if in_list "$PKG" "$SKIPPED_PACKAGES"; then
-                STATUS_ICON="ℹ️"
-                STATUS_TEXT="up to date (skipped)"
-              elif ! in_list "$PKG" "$UPLOADED_PACKAGES"; then
-                STATUS_ICON="❌"
-                STATUS_TEXT="failed"
-              fi
-
-              case "$PKG" in
-                dms)
-                  echo "- $STATUS_ICON **dms** ($STATUS_TEXT) → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:dms/dms)" >> $GITHUB_STEP_SUMMARY
-                  ;;
-                dms-git)
-                  echo "- $STATUS_ICON **dms-git** ($STATUS_TEXT) → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:dms-git/dms-git)" >> $GITHUB_STEP_SUMMARY
-                  ;;
-                dms-greeter)
-                  echo "- $STATUS_ICON **dms-greeter** ($STATUS_TEXT) → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:danklinux/dms-greeter)" >> $GITHUB_STEP_SUMMARY
-                  ;;
-              esac
-            done
-            echo "" >> $GITHUB_STEP_SUMMARY
-
-            if [[ -n "${{ github.event.inputs.rebuild_release }}" ]]; then
-              echo "**Rebuild Number:** db${{ github.event.inputs.rebuild_release }}" >> $GITHUB_STEP_SUMMARY
-              echo "" >> $GITHUB_STEP_SUMMARY
-            fi
-
           if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
-              echo "**Version:** ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-              echo "" >> $GITHUB_STEP_SUMMARY
           fi
-
+          if [[ "${{ needs.check-updates.outputs.has_updates }}" == "false" ]]; then
-            echo "Monitor build progress on [OBS project page](https://build.opensuse.org/project/show/home:AvengeMedia)." >> $GITHUB_STEP_SUMMARY
+            echo "- **Status**: Skipped (no changes detected)" >> $GITHUB_STEP_SUMMARY
           fi
+          echo "- **Project**: https://build.opensuse.org/project/show/home:AvengeMedia" >> $GITHUB_STEP_SUMMARY

.github/workflows/run-ppa.yml

@@ -4,100 +4,91 @@ on:
   workflow_dispatch:
     inputs:
       package:
-        description: "Package to upload"
+        description: 'Package to upload (dms, dms-git, dms-greeter, or all)'
-        required: true
-        type: choice
-        options:
-          - dms
-          - dms-greeter
-          - dms-git
-          - all
-        default: "dms"
-      rebuild_release:
-        description: "Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)"
         required: false
-        default: ""
+        default: 'dms-git'
+      rebuild_release:
+        description: 'Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)'
+        required: false
+        default: ''
   schedule:
-    - cron: "0 2,5,14,17,20,23 * * *" # 9am, 12pm, 3pm, 6pm, 9pm, 12am EST (UTC times shown)
+    - cron: '0 */3 * * *'  # Every 3 hours for dms-git builds
 
 jobs:
   check-updates:
-    name: Check package/series updates
+    name: Check for updates
     runs-on: ubuntu-latest
 
     outputs:
       has_updates: ${{ steps.check.outputs.has_updates }}
-      targets: ${{ steps.check.outputs.targets }}
+      packages: ${{ steps.check.outputs.packages }}
-      targets_json: ${{ steps.check.outputs.targets_json }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq curl git
-
       - name: Check for updates
         id: check
         run: |
-          chmod +x distro/scripts/ppa-sync-plan.sh
-
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            PACKAGE="dms-git"
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "Checking if dms-git source has changed..."
+
+            # Get current commit hash (8 chars to match changelog format)
+            CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
+
+            # Extract commit hash from changelog
+            # Format: dms-git (0.6.2+git2264.c5c5ce84) questing; urgency=medium
+            CHANGELOG_FILE="distro/ubuntu/dms-git/debian/changelog"
+
+            if [[ -f "$CHANGELOG_FILE" ]]; then
+              CHANGELOG_COMMIT=$(head -1 "$CHANGELOG_FILE" | grep -oP '\.[a-f0-9]{8}' | tr -d '.' || echo "")
+
+              if [[ -n "$CHANGELOG_COMMIT" ]]; then
+                if [[ "$CURRENT_COMMIT" == "$CHANGELOG_COMMIT" ]]; then
+                  echo "has_updates=false" >> $GITHUB_OUTPUT
+                  echo "📋 Commit $CURRENT_COMMIT already in changelog, skipping upload"
                 else
-            PACKAGE="${{ github.event.inputs.package }}"
+                  echo "has_updates=true" >> $GITHUB_OUTPUT
+                  echo "📋 New commit detected: $CURRENT_COMMIT (changelog has $CHANGELOG_COMMIT)"
                 fi
-
-          REBUILD_RELEASE="${{ github.event.inputs.rebuild_release }}"
-          ARGS=(--package "$PACKAGE" --json)
-          if [[ -n "$REBUILD_RELEASE" ]]; then
-            ARGS+=(--rebuild "$REBUILD_RELEASE")
-          fi
-
-          TARGETS_JSON=$(distro/scripts/ppa-sync-plan.sh "${ARGS[@]}" 2> ppa-audit.log)
-          cat ppa-audit.log
-
-          TARGETS=$(echo "$TARGETS_JSON" | jq -r 'join(" ")')
-          if [[ "$TARGETS_JSON" != "[]" ]]; then
-            echo "has_updates=true" >> "$GITHUB_OUTPUT"
-            echo "targets=$TARGETS" >> "$GITHUB_OUTPUT"
-            echo "targets_json=$TARGETS_JSON" >> "$GITHUB_OUTPUT"
-            echo "Package/series targets: $TARGETS"
               else
-            echo "has_updates=false" >> "$GITHUB_OUTPUT"
+                echo "has_updates=true" >> $GITHUB_OUTPUT
-            echo "targets=" >> "$GITHUB_OUTPUT"
+                echo "📋 Could not extract commit from changelog, proceeding with upload"
-            echo "targets_json=[]" >> "$GITHUB_OUTPUT"
+              fi
-            echo "No package/series uploads needed"
+            else
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "📋 No changelog file found, proceeding with upload"
+            fi
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
           fi
 
   upload-ppa:
-    name: Upload ${{ matrix.target }}
+    name: Upload to PPA
     needs: check-updates
     runs-on: ubuntu-latest
-    if: needs.check-updates.outputs.has_updates == 'true'
+    if: |
-    timeout-minutes: 120
+      github.event_name == 'workflow_dispatch' ||
-    strategy:
+      needs.check-updates.outputs.has_updates == 'true'
-      fail-fast: false
-      matrix:
-        target: ${{ fromJson(needs.check-updates.outputs.targets_json) }}
-    concurrency:
-      group: ppa-dms-${{ matrix.target }}
-      cancel-in-progress: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
-          go-version-file: ./core/go.mod
+          go-version: '1.24'
           cache: false  
 
       - name: Install build dependencies
@@ -110,8 +101,7 @@ jobs:
             lftp \
             build-essential \
             fakeroot \
-            dpkg-dev \
+            dpkg-dev
-            openssh-client
       
       - name: Configure GPG
         env:
@@ -119,32 +109,80 @@ jobs:
         run: |
           echo "$GPG_KEY" | gpg --import
           GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
-          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> "$GITHUB_ENV"
+          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
       
-      - name: Upload target
+      - name: Determine packages to upload
-        env:
+        id: packages
-          TARGET: ${{ matrix.target }}
-          LAUNCHPAD_SSH_PRIVATE_KEY: ${{ secrets.LAUNCHPAD_SSH_PRIVATE_KEY }}
-          LAUNCHPAD_SSH_LOGIN: ${{ secrets.LAUNCHPAD_SSH_LOGIN }}
         run: |
-          IFS=':' read -r PACKAGE UBUNTU_SERIES PPA_NUM <<< "$TARGET"
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+            echo "Triggered by schedule: uploading git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+          fi
       
-          case "$PACKAGE" in
+      - name: Upload to PPA
-            dms) PPA_NAME="dms" ;;
+        env:
-            dms-git) PPA_NAME="dms-git" ;;
+          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
-            dms-greeter) PPA_NAME="danklinux" ;;
+        run: |
-            *) echo "::error::Unknown package $PACKAGE"; exit 1 ;;
+          PACKAGES="${{ steps.packages.outputs.packages }}"
-          esac
           
-          echo "Uploading $PACKAGE to $PPA_NAME/$UBUNTU_SERIES with ppa$PPA_NUM"
+          if [[ "$PACKAGES" == "all" ]]; then
-          bash distro/scripts/ppa-upload.sh "$PACKAGE" "$PPA_NAME" "$UBUNTU_SERIES" "$PPA_NUM"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms to PPA..."
+            if [ -n "$REBUILD_RELEASE" ]; then
+              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
+            fi
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms" dms questing
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms-git to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-git" dms-git questing
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms-greeter to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-greeter" danklinux questing
+          else
+            PPA_NAME="$PACKAGES"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading $PACKAGES to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/$PACKAGES" "$PPA_NAME" questing
+          fi
       
       - name: Summary
-        if: always()
         run: |
-          echo "### PPA Package Upload" >> "$GITHUB_STEP_SUMMARY"
+          echo "### PPA Package Upload Complete" >> $GITHUB_STEP_SUMMARY
-          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Target:** ${{ matrix.target }}" >> "$GITHUB_STEP_SUMMARY"
+          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **DMS PPA:** https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> "$GITHUB_STEP_SUMMARY"
+
-          echo "- **DMS-Git PPA:** https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> "$GITHUB_STEP_SUMMARY"
+          if [[ "${{ needs.check-updates.outputs.has_updates }}" == "false" ]]; then
-          echo "- **DankLinux PPA:** https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages" >> "$GITHUB_STEP_SUMMARY"
+            echo "- **Status**: Skipped (no changes detected)" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          if [[ "$PACKAGES" == "all" ]]; then
+            echo "- **PPA dms**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
+            echo "- **PPA dms-git**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
+            echo "- **PPA danklinux**: https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms-git" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms-greeter" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages" >> $GITHUB_STEP_SUMMARY
+          fi
+          
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Builds will appear once Launchpad processes the uploads." >> $GITHUB_STEP_SUMMARY

.github/workflows/update-vendor-hash.yml

@@ -24,7 +24,7 @@ jobs:
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ steps.app_token.outputs.token }}
@@ -36,17 +36,17 @@ jobs:
         run: |
           set -euo pipefail
           echo "Attempting nix build to get new vendorHash..."
-          if output=$(nix build .#dms-shell 2>&1); then
+          if output=$(nix build .#dmsCli 2>&1); then
             echo "Build succeeded, no hash update needed"
             exit 0
           fi
-          new_hash=$(echo "$output" | grep -oP "got:\s+\K\S+" | head -n1 || true)
+          new_hash=$(echo "$output" | grep -oP "got:\s+\K\S+" | head -n1)
           [ -n "$new_hash" ] || { echo "Could not extract new vendorHash"; echo "$output"; exit 1; }
           current_hash=$(grep -oP 'vendorHash = "\K[^"]+' flake.nix)
           [ "$current_hash" = "$new_hash" ] && { echo "vendorHash already up to date"; exit 0; }
           sed -i "s|vendorHash = \"$current_hash\"|vendorHash = \"$new_hash\"|" flake.nix
           echo "Verifying build with new vendorHash..."
-          nix build .#dms-shell
+          nix build .#dmsCli
           echo "vendorHash updated successfully!"
 
       - name: Commit and push vendorHash update
@@ -59,8 +59,8 @@ jobs:
             git config user.email "dms-ci[bot]@users.noreply.github.com"
             git add flake.nix
             git commit -m "nix: update vendorHash for go.mod changes" || exit 0
-            git pull --rebase origin ${{ github.ref_name }}
+            git pull --rebase origin master
-            git push https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git HEAD:${{ github.ref_name }}
+            git push https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git HEAD:master
           else
             echo "No changes to flake.nix"
           fi

.gitignore

@@ -56,8 +56,6 @@ UNUSED
 
 CLAUDE-activeContext.md
 CLAUDE-temp.md
-AGENTS-activeContext.md
-AGENTS-temp.md
 
 # Auto-generated theme files
 *.generated.*
@@ -98,17 +96,20 @@ go.work
 go.work.sum
 
 # env file
-.env*
+.env
 
 # Editor/IDE
 # .idea/
 # .vscode/
-vim/
 
 bin/
 
+# Extracted source trees in Ubuntu package directories  
+distro/ubuntu/*/dms-git-repo/
+distro/ubuntu/*/DankMaterialShell-*/
+distro/ubuntu/danklinux/*/dsearch-*/
+distro/ubuntu/danklinux/*/dgop-*/
+
 # direnv
 .envrc
 .direnv/
-quickshell/dms-plugins
-__pycache__

.pre-commit-config.yaml

@@ -1,30 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
-    hooks:
-      - id: trailing-whitespace
-      - id: check-yaml
-      - id: end-of-file-fixer
-  - repo: local
-    hooks:
-      - id: shellcheck
-        name: shellcheck
-        entry: shellcheck -e SC2164 -e SC2001 -e SC2012 -e SC2317
-        language: system
-        types: [shell]
-  - repo: local
-    hooks:
-      - id: go-mod-tidy
-        name: go mod tidy
-        entry: bash -c 'cd core && go mod tidy'
-        language: system
-        files: ^core/.*\.(go|mod|sum)$
-        pass_filenames: false
-  - repo: local
-    hooks:
-      - id: no-console-in-qml
-        name: no console.* in QML (use Log service)
-        entry: bash -c 'if grep -nE "console\.(log|error|info|warn|debug)" "$@"; then echo "Use the Log service (log.info/warn/error/debug/fatal) instead of console.*" >&2; exit 1; fi' --
-        language: system
-        files: ^quickshell/.*\.qml$
-        exclude: ^quickshell/(Services/Log\.qml$|dms-plugins/|PLUGINS/)

CHANGELOG.MD

@@ -1,41 +0,0 @@
-This file is more of a quick reference so I know what to account for before next releases.
-
-# 1.5.0
-- Overhauled shadows
-- App ID changed to com.danklinux.dms - breaking for window rules
-- Greeter stuff
-- Terminal mux
-- Locale overrides
-- new neovim theming
-
-# 1.4.0
-
-- Overhauled system monitor, graphs, styling
-- dbus API for plugins, KDEConnect
-- new dank16 algorithm
-- launcher actions, customize env, args, name, icon
-- launcher v2 - omega stuff, GIF search, supa powerful
-- dock on bar
-- window rule manager, with IPC - #TODO verify RTL layout (niri only)
-
-# 1.2.0
-
-- Added clipboard and clipboard history integration
-- Added swipe to dismiss notification popups and from center
-- Added paste from clipboard history view - requires wtype
-- Optimize surface damage of OSD & Toast
-- Add monitor configurator (niri, Hyprland, MangoWC)
-- **BREAKING** ghostty theme changed to ~/.config/ghostty/themes/danktheme
-  - requires intervention and doc update
-- Added desktop widget plugins
-  - dev guidance available
-  - builtin clock & dgop widgets
-  - new IPC targets
-- Initial RTL support/i18n
-- Theme registry
-- Notification persistence & history
-- **BREAKING** vscode theme needs re-installed
-- dms doctor cmd
-- niri/hypr/mango gaps/window/border overrides
-- settings search
-- notification display ops on lock screen

CONTRIBUTING.md

@@ -6,10 +6,10 @@ To contribute fork this repository, make your changes, and open a pull request.
 
 ## Setup
 
-Install [prek](https://prek.j178.dev/) then activate pre-commit hooks:
+Enable pre-commit hooks to catch CI failures before pushing:
 
 ```bash
-prek install
+git config core.hooksPath .githooks
 ```
 
 ### Nix Development Shell
@@ -21,8 +21,7 @@ nix develop
 ```
 
 This will provide:
-
+- Go 1.24 toolchain (go, gopls, delve, go-tools) and GNU Make
-- Go 1.25+ toolchain (go, gopls, delve, go-tools) and GNU Make
 - Quickshell and required QML packages
 - Properly configured QML2_IMPORT_PATH
 
@@ -37,43 +36,10 @@ This is a monorepo, the easiest thing to do is to open an editor in either `quic
 1. Install the [QML Extension](https://doc.qt.io/vscodeext/)
 2. Configure `ctrl+shift+p` -> user preferences (json) with qmlls path
 
-**Note:** Paths may vary by distribution. Below are examples for Arch Linux and Fedora.
-
-**Arch Linux:**
-
 ```json
 {
-  "[qml]": {
-    "editor.defaultFormatter": "qt-project.qmlls",
-    "editor.formatOnSave": true
-  },
   "qt-qml.doNotAskForQmllsDownload": true,
-  "qt-qml.qmlls.customExePath": "/usr/lib/qt6/bin/qmlls",
+  "qt-qml.qmlls.customExePath": "/usr/lib/qt6/bin/qmlls"
-  "qt-core.additionalQtPaths": [
-    {
-      "name": "Qt-6.x-linux-g++",
-      "path": "/usr/bin/qmake"
-    }
-  ]
-}
-```
-
-**Fedora:**
-
-```json
-{
-  "[qml]": {
-    "editor.defaultFormatter": "qt-project.qmlls",
-    "editor.formatOnSave": true
-  },
-  "qt-qml.doNotAskForQmllsDownload": true,
-  "qt-qml.qmlls.customExePath": "/usr/bin/qmlls",
-  "qt-core.additionalQtPaths": [
-    {
-      "name": "Qt-6.x-Fedora-linux-g++",
-      "path": "/usr/bin/qmake6"
-    }
-  ]
 }
 ```
 
@@ -86,23 +52,7 @@ touch .qmlls.ini
 
 4. Restart dms to generate the `.qmlls.ini` file
 
-5. Run `make lint-qml` from the repo root to lint QML entrypoints (requires the `.qmlls.ini` generated above). The script needs the **Qt 6** `qmllint`; it checks `qmllint6`, Fedora's `qmllint-qt6`, `/usr/lib/qt6/bin/qmllint`, then `qmllint` in `PATH`. If your Qt 6 binary lives elsewhere, set `QMLLINT=/path/to/qmllint`.
+5. Make your changes, test, and open a pull request.
-
-6. Make your changes, test, and open a pull request.
-
-### I18n/Localization
-
-When adding user-facing strings, ensure they are wrapped in `I18n.tr()` with context, for example.
-
-```qml
-import qs.Common
-
-Text {
-  text: I18n.tr("Hello World", "<This is context for the translators, example> Hello world greeting that appears on the lock screen")
-}
-```
-
-Preferably, try to keep new terms to a minimum and re-use existing terms where possible. See `quickshell/translations/en.json` for the list of existing terms. (This isn't always possible obviously, but instead of using `Auto-connect` you would use `Autoconnect` since it's already translated)
 
 ### GO (`core` directory)
 

Makefile

@@ -18,7 +18,7 @@ SHELL_INSTALL_DIR=$(DATA_DIR)/quickshell/dms
 ASSETS_DIR=assets
 APPLICATIONS_DIR=$(DATA_DIR)/applications
 
-.PHONY: all build clean lint-qml install install-bin install-shell install-completions install-systemd install-icon install-desktop uninstall uninstall-bin uninstall-shell uninstall-completions uninstall-systemd uninstall-icon uninstall-desktop help
+.PHONY: all build clean install install-bin install-shell install-completions install-systemd install-icon install-desktop uninstall uninstall-bin uninstall-shell uninstall-completions uninstall-systemd uninstall-icon uninstall-desktop help
 
 all: build
 
@@ -32,9 +32,6 @@ clean:
 	@$(MAKE) -C $(CORE_DIR) clean
 	@echo "Clean complete"
 
-lint-qml:
-	@./quickshell/scripts/qmllint-entrypoints.sh
-
 # Installation targets
 install-bin:
 	@echo "Installing $(BINARY_NAME) to $(INSTALL_DIR)..."
@@ -46,6 +43,7 @@ install-shell:
 	@mkdir -p $(SHELL_INSTALL_DIR)
 	@cp -r $(SHELL_DIR)/* $(SHELL_INSTALL_DIR)/
 	@rm -rf $(SHELL_INSTALL_DIR)/.git* $(SHELL_INSTALL_DIR)/.github
+	@$(MAKE) --no-print-directory -C $(CORE_DIR) print-version > $(SHELL_INSTALL_DIR)/VERSION
 	@echo "Shell files installed"
 
 install-completions:
@@ -61,10 +59,10 @@ install-completions:
 install-systemd:
 	@echo "Installing systemd user service..."
 	@mkdir -p $(SYSTEMD_USER_DIR)
-	@if [ -n "$(SUDO_USER)" ]; then chown -R $(SUDO_USER):"$(id -gn $SUDO_USER)" $(SYSTEMD_USER_DIR); fi
+	@if [ -n "$(SUDO_USER)" ]; then chown -R $(SUDO_USER):$(SUDO_USER) $(SYSTEMD_USER_DIR); fi
 	@sed 's|/usr/bin/dms|$(INSTALL_DIR)/dms|g' $(ASSETS_DIR)/systemd/dms.service > $(SYSTEMD_USER_DIR)/dms.service
 	@chmod 644 $(SYSTEMD_USER_DIR)/dms.service
-	@if [ -n "$(SUDO_USER)" ]; then chown $(SUDO_USER):"$(id -gn $SUDO_USER)" $(SYSTEMD_USER_DIR)/dms.service; fi
+	@if [ -n "$(SUDO_USER)" ]; then chown $(SUDO_USER):$(SUDO_USER) $(SYSTEMD_USER_DIR)/dms.service; fi
 	@echo "Systemd service installed to $(SYSTEMD_USER_DIR)/dms.service"
 
 install-icon:
@@ -79,7 +77,7 @@ install-desktop:
 	@update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true
 	@echo "Desktop entry installed"
 
-install: install-bin install-shell install-completions install-systemd install-icon install-desktop
+install: build install-bin install-shell install-completions install-systemd install-icon install-desktop
 	@echo ""
 	@echo "Installation complete!"
 	@echo ""
@@ -133,7 +131,6 @@ help:
 	@echo "  all (default)        - Build the DMS binary"
 	@echo "  build                - Same as 'all'"
 	@echo "  clean                - Clean build artifacts"
-	@echo "  lint-qml             - Run qmllint on shell entrypoints using the Quickshell tooling VFS"
 	@echo ""
 	@echo "Install:"
 	@echo "  install              - Build and install everything (requires sudo)"

README.md

@@ -13,13 +13,13 @@ Built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/)
 [![GitHub stars](https://img.shields.io/github/stars/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=ffd700)](https://github.com/AvengeMedia/DankMaterialShell/stargazers)
 [![GitHub License](https://img.shields.io/github/license/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=b9c8da)](https://github.com/AvengeMedia/DankMaterialShell/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/v/release/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/releases)
-[![Arch version](https://img.shields.io/archlinux/v/extra/x86_64/dms-shell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://archlinux.org/packages/extra/x86_64/dms-shell/)
+[![AUR version](https://img.shields.io/aur/version/dms-shell-bin?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://aur.archlinux.org/packages/dms-shell-bin)
 [![AUR version (git)](<https://img.shields.io/aur/version/dms-shell-git?style=for-the-badge&labelColor=101418&color=9ccbfb&label=AUR%20(git)>)](https://aur.archlinux.org/packages/dms-shell-git)
 [![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Fdanklinux)](https://ko-fi.com/danklinux)
 
 </div>
 
-DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org), [labwc](https://labwc.github.io/), [Scroll](https://github.com/dawsers/scroll), [Miracle WM](https://github.com/miracle-wm-org/miracle-wm), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop.
+DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org), [labwc](https://labwc.github.io/), [Scroll](https://github.com/dawsers/scroll), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop.
 
 ## Repository Structure
 
@@ -105,7 +105,7 @@ Extend functionality with the [plugin registry](https://plugins.danklinux.com).
 
 ## Supported Compositors
 
-Works best with [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [Sway](https://swaywm.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [labwc](https://labwc.github.io/), [Scroll](https://github.com/dawsers/scroll), and [Miracle WM](https://github.com/miracle-wm-org/miracle-wm) with full workspace switching, overview integration, and monitor management. Other Wayland compositors work with reduced features.
+Works best with [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [Sway](https://swaywm.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [labwc](https://labwc.github.io/), and [Scroll](https://github.com/dawsers/scroll) with full workspace switching, overview integration, and monitor management. Other Wayland compositors work with reduced features.
 
 [Compositor configuration guide](https://danklinux.com/docs/dankmaterialshell/compositors)
 
@@ -163,7 +163,7 @@ quickshell -p quickshell/
   inputs.dms.url = "github:AvengeMedia/DankMaterialShell";
 
   # Use in home-manager or NixOS configuration
-  imports = [ inputs.dms.homeModules.dank-material-shell ];
+  imports = [ inputs.dms.homeModules.dankMaterialShell.default ];
 }
 ```
 

assets/dms-open.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=DMS
+Name=DMS Application Picker
 Comment=Select an application to open links and files
 Exec=dms open %u
 Icon=danklogo
 Terminal=false
 NoDisplay=true
-MimeType=x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/dms;text/html;application/xhtml+xml;
+MimeType=x-scheme-handler/http;x-scheme-handler/https;text/html;application/xhtml+xml;
 Categories=Utility;

assets/systemd/dms.service

@@ -9,7 +9,7 @@ Type=dbus
 BusName=org.freedesktop.Notifications
 ExecStart=/usr/bin/dms run --session
 ExecReload=/usr/bin/pkill -USR1 -x dms
-Restart=on-failure
+Restart=always
 RestartSec=1.23
 TimeoutStopSec=10
 

core/.golangci.yml

@@ -102,11 +102,7 @@ linters:
       - linters:
           - ineffassign
         path: internal/proto/
-      # binary.Write/Read to bytes.Buffer can't fail
+      # binary.Write to bytes.Buffer can't fail
       - linters:
           - errcheck
-        text: "Error return value of `binary\\.(Write|Read)` is not checked"
+        text: "Error return value of `binary\\.Write` is not checked"
-      # bytes.Reader.Read can't fail (reads from memory)
-      - linters:
-          - errcheck
-        text: "Error return value of `buf\\.Read` is not checked"

core/.mockery.yml

@@ -28,12 +28,6 @@ packages:
       outpkg: mocks_brightness
     interfaces:
       DBusConn:
-  github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation:
-    config:
-      dir: "internal/mocks/geolocation"
-      outpkg: mocks_geolocation
-    interfaces:
-      Client:
   github.com/AvengeMedia/DankMaterialShell/core/internal/server/network:
     config:
       dir: "internal/mocks/network"
@@ -62,21 +56,3 @@ packages:
       outpkg: mocks_version
     interfaces:
       VersionFetcher:
-  github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext:
-    config:
-      dir: "internal/mocks/wlcontext"
-      outpkg: mocks_wlcontext
-    interfaces:
-      WaylandContext:
-  github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client:
-    config:
-      dir: "internal/mocks/wlclient"
-      outpkg: mocks_wlclient
-    interfaces:
-      WaylandDisplay:
-  github.com/AvengeMedia/DankMaterialShell/core/internal/utils:
-    config:
-      dir: "internal/mocks/utils"
-      outpkg: mocks_utils
-    interfaces:
-      AppChecker:

core/.pre-commit-config.yaml

@@ -1,16 +0,0 @@
-repos:
-  - repo: https://github.com/golangci/golangci-lint
-    rev: v2.10.1
-    hooks:
-      - id: golangci-lint-fmt
-        require_serial: true
-      - id: golangci-lint-full
-      - id: golangci-lint-config-verify
-  - repo: local
-    hooks:
-      - id: go-test
-        name: go test
-        entry: go test ./...
-        language: system
-        pass_filenames: false
-        types: [go]

core/Makefile

@@ -63,19 +63,19 @@ endif
 
 build-all: build dankinstall
 
-install:
+install: build
 	@echo "Installing $(BINARY_NAME) to $(INSTALL_DIR)..."
 	@install -D -m 755 $(BUILD_DIR)/$(BINARY_NAME) $(INSTALL_DIR)/$(BINARY_NAME)
 	@echo "Installation complete"
 
-install-all:
+install-all: build-all
 	@echo "Installing $(BINARY_NAME) to $(INSTALL_DIR)..."
 	@install -D -m 755 $(BUILD_DIR)/$(BINARY_NAME) $(INSTALL_DIR)/$(BINARY_NAME)
 	@echo "Installing $(BINARY_NAME_INSTALL) to $(INSTALL_DIR)..."
 	@install -D -m 755 $(BUILD_DIR)/$(BINARY_NAME_INSTALL) $(INSTALL_DIR)/$(BINARY_NAME_INSTALL)
 	@echo "Installation complete"
 
-install-dankinstall:
+install-dankinstall: dankinstall
 	@echo "Installing $(BINARY_NAME_INSTALL) to $(INSTALL_DIR)..."
 	@install -D -m 755 $(BUILD_DIR)/$(BINARY_NAME_INSTALL) $(INSTALL_DIR)/$(BINARY_NAME_INSTALL)
 	@echo "Installation complete"

core/README.md

@@ -10,67 +10,38 @@ Go-based backend for DankMaterialShell providing system integration, IPC, and in
 Command-line interface and daemon for shell management and system control.
 
 **dankinstall**
-Distribution-aware installer for deploying DMS and compositor configurations on Arch, Fedora, Debian, Ubuntu, openSUSE, and Gentoo. Supports both an interactive TUI and a headless (unattended) mode via CLI flags.
+Distribution-aware installer with TUI for deploying DMS and compositor configurations on Arch, Fedora, Debian, Ubuntu, openSUSE, and Gentoo.
 
 ## System Integration
 
-### Wayland Protocols (Client)
+**Wayland Protocols**
+- `wlr-gamma-control-unstable-v1` - Night mode and gamma control
+- `wlr-screencopy-unstable-v1` - Screen capture for color picker
+- `wlr-layer-shell-unstable-v1` - Overlay surfaces for color picker
+- `wp-viewporter` - Fractional scaling support
+- `dwl-ipc-unstable-v2` - dwl/MangoWC workspace integration
+- `ext-workspace-v1` - Workspace protocol support
+- `wlr-output-management-unstable-v1` - Display configuration
 
-All Wayland protocols are consumed as a client - connecting to the compositor.
+**DBus Interfaces**
+- NetworkManager/iwd - Network management
+- logind - Session control and inhibit locks
+- accountsservice - User account information
+- CUPS - Printer management
+- Custom IPC via unix socket (JSON API)
 
-| Protocol                                  | Purpose                                                     |
+**Hardware Control**
-| ----------------------------------------- | ----------------------------------------------------------- |
+- DDC/CI protocol - External monitor brightness control (like `ddcutil`)
-| `wlr-gamma-control-unstable-v1`           | Night mode color temperature control                        |
+- Backlight control - Internal display brightness via `login1` or sysfs
-| `wlr-screencopy-unstable-v1`              | Screen capture for color picker/screenshot                  |
+- LED control - Keyboard/device LED management
-| `wlr-layer-shell-unstable-v1`             | Overlay surfaces for color picker UI/screenshot             |
+- evdev input monitoring - Keyboard state tracking (caps lock, etc.)
-| `wlr-output-management-unstable-v1`       | Display configuration                                       |
-| `wlr-output-power-management-unstable-v1` | DPMS on/off CLI                                             |
-| `wp-viewporter`                           | Fractional scaling support (color picker/screenshot UIs)    |
-| `keyboard-shortcuts-inhibit-unstable-v1`  | Inhibit compositor shortcuts during color picker/screenshot |
-| `ext-data-control-v1`                     | Clipboard history and persistence                           |
-| `ext-workspace-v1`                        | Workspace integration                                       |
-| `dwl-ipc-unstable-v2`                     | dwl/MangoWC IPC for tags, outputs, etc.                     |
-
-### DBus Interfaces
-
-**Client (consuming external services):**
-
-| Interface                        | Purpose                                       |
-| -------------------------------- | --------------------------------------------- |
-| `org.bluez`                      | Bluetooth management with pairing agent       |
-| `org.freedesktop.NetworkManager` | Network management                            |
-| `net.connman.iwd`                | iwd Wi-Fi backend                             |
-| `org.freedesktop.network1`       | systemd-networkd integration                  |
-| `org.freedesktop.login1`         | Session control, sleep inhibitors, brightness |
-| `org.freedesktop.Accounts`       | User account information                      |
-| `org.freedesktop.portal.Desktop` | Desktop appearance settings (color scheme)    |
-| CUPS via IPP + D-Bus             | Printer management with job notifications     |
-
-**Server (implementing interfaces):**
-
-| Interface                     | Purpose                                |
-| ----------------------------- | -------------------------------------- |
-| `org.freedesktop.ScreenSaver` | Screensaver inhibit for video playback |
-
-Custom IPC via unix socket (JSON API) for shell communication.
-
-### Hardware Control
-
-| Subsystem | Method              | Purpose                            |
-| --------- | ------------------- | ---------------------------------- |
-| DDC/CI    | I2C direct          | External monitor brightness        |
-| Backlight | logind or sysfs     | Internal display brightness        |
-| evdev     | `/dev/input/event*` | Keyboard state (caps lock LED)     |
-| udev      | netlink monitor     | Backlight device updates (for OSD) |
-
-### Plugin System
 
+**Plugin System**
 - Plugin registry integration
 - Plugin lifecycle management
 - Settings persistence
 
 ## CLI Commands
-
 - `dms run [-d]` - Start shell (optionally as daemon)
 - `dms restart` / `dms kill` - Manage running processes
 - `dms ipc <command>` - Send IPC commands (toggle launcher, notifications, etc.)
@@ -96,10 +67,9 @@ The on-screen preview displays the selected format. JSON output includes hex, RG
 
 ## Building
 
-Requires Go 1.25+
+Requires Go 1.24+
 
 **Development build:**
-
 ```bash
 make              # Build dms CLI
 make dankinstall  # Build installer
@@ -107,7 +77,6 @@ make test         # Run tests
 ```
 
 **Distribution build:**
-
 ```bash
 make dist         # Build without update/greeter features
 ```
@@ -115,7 +84,6 @@ make dist         # Build without update/greeter features
 Produces `bin/dms-linux-amd64` and `bin/dms-linux-arm64`
 
 **Installation:**
-
 ```bash
 sudo make install  # Install to /usr/local/bin/dms
 ```
@@ -123,7 +91,6 @@ sudo make install  # Install to /usr/local/bin/dms
 ## Development
 
 **Setup pre-commit hooks:**
-
 ```bash
 git config core.hooksPath .githooks
 ```
@@ -131,7 +98,6 @@ git config core.hooksPath .githooks
 This runs gofmt, golangci-lint, tests, and builds before each commit when `core/` files are staged.
 
 **Regenerating Wayland Protocol Bindings:**
-
 ```bash
 go install github.com/rajveermalviya/go-wayland/cmd/go-wayland-scanner@latest
 go-wayland-scanner -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \
@@ -139,7 +105,6 @@ go-wayland-scanner -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \
 ```
 
 **Module Structure:**
-
 - `cmd/` - Binary entrypoints (dms, dankinstall)
 - `internal/distros/` - Distribution-specific installation logic
 - `internal/proto/` - Wayland protocol bindings
@@ -147,50 +112,10 @@ go-wayland-scanner -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \
 
 ## Installation via dankinstall
 
-**Interactive (TUI):**
-
 ```bash
 curl -fsSL https://install.danklinux.com | sh
 ```
 
-**Headless (unattended):**
-
-Headless mode requires cached sudo credentials. Run `sudo -v` first:
-
-```bash
-sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c niri -t ghostty -y
-sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c hyprland -t kitty --include-deps dms-greeter -y
-```
-
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--compositor <niri|hyprland>` | `-c` | Compositor/WM to install (required for headless) |
-| `--term <ghostty|kitty|alacritty>` | `-t` | Terminal emulator (required for headless) |
-| `--include-deps <name,...>` | | Enable optional dependencies (e.g. `dms-greeter`) |
-| `--exclude-deps <name,...>` | | Skip specific dependencies |
-| `--replace-configs <name,...>` | | Replace specific configuration files (mutually exclusive with `--replace-configs-all`) |
-| `--replace-configs-all` | | Replace all configuration files (mutually exclusive with `--replace-configs`) |
-| `--yes` | `-y` | Required for headless mode — confirms installation without interactive prompts |
-
-Headless mode requires `--yes` to proceed; without it, the installer exits with an error.
-Configuration files are not replaced by default unless `--replace-configs` or `--replace-configs-all` is specified.
-`dms-greeter` is disabled by default; use `--include-deps dms-greeter` to enable it.
-
-When no flags are provided, `dankinstall` launches the interactive TUI.
-
-### Headless mode validation rules
-
-Headless mode activates when `--compositor` or `--term` is provided.
-
-- Both `--compositor` and `--term` are required; providing only one results in an error.
-- Headless-only flags (`--include-deps`, `--exclude-deps`, `--replace-configs`, `--replace-configs-all`, `--yes`) are rejected in TUI mode.
-- Positional arguments are not accepted.
-
-### Log file location
-
-`dankinstall` writes logs to `/tmp` by default.
-Set the `DANKINSTALL_LOG_DIR` environment variable to override the log directory.
-
 ## Supported Distributions
 
 Arch, Fedora, Debian, Ubuntu, openSUSE, Gentoo (and derivatives)

core/cmd/dankinstall/main.go

@@ -3,152 +3,20 @@ package main
 import (
 	"fmt"
 	"os"
-	"strings"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/headless"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/spf13/cobra"
 )
 
 var Version = "dev"
 
-// Flag variables bound via pflag
-var (
-	compositor        string
-	term              string
-	includeDeps       []string
-	excludeDeps       []string
-	replaceConfigs    []string
-	replaceConfigsAll bool
-	yes               bool
-)
-
-var rootCmd = &cobra.Command{
-	Use:   "dankinstall",
-	Short: "Install DankMaterialShell and its dependencies",
-	Long: `dankinstall sets up DankMaterialShell with your chosen compositor and terminal.
-
-Without flags, it launches an interactive TUI. Providing either --compositor
-or --term activates headless (unattended) mode, which requires both flags.
-
-Headless mode requires cached sudo credentials. Run 'sudo -v' beforehand, or
-configure passwordless sudo for your user.`,
-	Args:          cobra.NoArgs,
-	RunE:          runDankinstall,
-	SilenceErrors: true,
-	SilenceUsage:  true,
-}
-
-func init() {
-	rootCmd.Flags().StringVarP(&compositor, "compositor", "c", "", "Compositor/WM to install: niri or hyprland (enables headless mode)")
-	rootCmd.Flags().StringVarP(&term, "term", "t", "", "Terminal emulator to install: ghostty, kitty, or alacritty (enables headless mode)")
-	rootCmd.Flags().StringSliceVar(&includeDeps, "include-deps", []string{}, "Optional deps to enable (e.g. dms-greeter)")
-	rootCmd.Flags().StringSliceVar(&excludeDeps, "exclude-deps", []string{}, "Deps to skip during installation")
-	rootCmd.Flags().StringSliceVar(&replaceConfigs, "replace-configs", []string{}, "Deploy only named configs (e.g. niri,ghostty)")
-	rootCmd.Flags().BoolVar(&replaceConfigsAll, "replace-configs-all", false, "Deploy and replace all configurations")
-	rootCmd.Flags().BoolVarP(&yes, "yes", "y", false, "Auto-confirm all prompts")
-}
-
 func main() {
 	if os.Getuid() == 0 {
 		fmt.Fprintln(os.Stderr, "Error: dankinstall must not be run as root")
 		os.Exit(1)
 	}
 
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-}
-
-func runDankinstall(cmd *cobra.Command, args []string) error {
-	headlessMode := compositor != "" || term != ""
-
-	if !headlessMode {
-		// Reject headless-only flags when running in TUI mode.
-		headlessOnly := []string{
-			"include-deps",
-			"exclude-deps",
-			"replace-configs",
-			"replace-configs-all",
-			"yes",
-		}
-		var set []string
-		for _, name := range headlessOnly {
-			if cmd.Flags().Changed(name) {
-				set = append(set, "--"+name)
-			}
-		}
-		if len(set) > 0 {
-			return fmt.Errorf("flags %s are only valid in headless mode (requires both --compositor and --term)", strings.Join(set, ", "))
-		}
-	}
-
-	if headlessMode {
-		return runHeadless()
-	}
-	return runTUI()
-}
-
-func runHeadless() error {
-	// Validate required flags
-	if compositor == "" {
-		return fmt.Errorf("--compositor is required for headless mode (niri or hyprland)")
-	}
-	if term == "" {
-		return fmt.Errorf("--term is required for headless mode (ghostty, kitty, or alacritty)")
-	}
-
-	cfg := headless.Config{
-		Compositor:        compositor,
-		Terminal:          term,
-		IncludeDeps:       includeDeps,
-		ExcludeDeps:       excludeDeps,
-		ReplaceConfigs:    replaceConfigs,
-		ReplaceConfigsAll: replaceConfigsAll,
-		Yes:               yes,
-	}
-
-	runner := headless.NewRunner(cfg)
-
-	// Set up file logging
-	fileLogger, err := log.NewFileLogger()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Warning: Failed to create log file: %v\n", err)
-	}
-
-	if fileLogger != nil {
-		fmt.Printf("Logging to: %s\n", fileLogger.GetLogPath())
-		fileLogger.StartListening(runner.GetLogChan())
-		defer func() {
-			if err := fileLogger.Close(); err != nil {
-				fmt.Fprintf(os.Stderr, "Warning: Failed to close log file: %v\n", err)
-			}
-		}()
-	} else {
-		// Drain the log channel to prevent blocking sends from deadlocking
-		// downstream components (distros, config deployer) that write to it.
-		// Use an explicit stop signal because this code does not own the
-		// runner log channel and cannot assume it will be closed.
-		defer drainLogChan(runner.GetLogChan())()
-	}
-
-	if err := runner.Run(); err != nil {
-		if fileLogger != nil {
-			fmt.Fprintf(os.Stderr, "\nFull logs are available at: %s\n", fileLogger.GetLogPath())
-		}
-		return err
-	}
-
-	if fileLogger != nil {
-		fmt.Printf("\nFull logs are available at: %s\n", fileLogger.GetLogPath())
-	}
-	return nil
-}
-
-func runTUI() error {
 	fileLogger, err := log.NewFileLogger()
 	if err != nil {
 		fmt.Printf("Warning: Failed to create log file: %v\n", err)
@@ -170,50 +38,18 @@ func runTUI() error {
 
 	if fileLogger != nil {
 		fileLogger.StartListening(model.GetLogChan())
-	} else {
-		// Drain the log channel to prevent blocking sends from deadlocking
-		// downstream components (distros, config deployer) that write to it.
-		// Use an explicit stop signal because this code does not own the
-		// model log channel and cannot assume it will be closed.
-		defer drainLogChan(model.GetLogChan())()
 	}
 
 	p := tea.NewProgram(model, tea.WithAltScreen())
 	if _, err := p.Run(); err != nil {
+		fmt.Printf("Error running program: %v\n", err)
 		if logFilePath != "" {
-			fmt.Fprintf(os.Stderr, "\nFull logs are available at: %s\n", logFilePath)
+			fmt.Printf("\nFull logs are available at: %s\n", logFilePath)
 		}
-		return fmt.Errorf("error running program: %w", err)
+		os.Exit(1)
 	}
 
 	if logFilePath != "" {
 		fmt.Printf("\nFull logs are available at: %s\n", logFilePath)
 	}
-	return nil
-}
-
-// drainLogChan starts a goroutine that discards all messages from logCh,
-// preventing blocking sends from deadlocking downstream components. It returns
-// a cleanup function that signals the goroutine to stop and waits for it to
-// exit. Callers should defer the returned function.
-func drainLogChan(logCh <-chan string) func() {
-	drainStop := make(chan struct{})
-	drainDone := make(chan struct{})
-	go func() {
-		defer close(drainDone)
-		for {
-			select {
-			case <-drainStop:
-				return
-			case _, ok := <-logCh:
-				if !ok {
-					return
-				}
-			}
-		}
-	}()
-	return func() {
-		close(drainStop)
-		<-drainDone
-	}
 }

core/cmd/dms/assets/cli-policy.default.json

@@ -1,10 +0,0 @@
-{
-  "policy_version": 1,
-  "blocked_commands": [
-    "greeter install",
-    "greeter enable",
-    "greeter uninstall",
-    "setup"
-  ],
-  "message": "This command is disabled on immutable/image-based systems. Use your distro-native workflow for system-level changes."
-}

core/cmd/dms/commands_auth.go

@@ -1,77 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	sharedpam "github.com/AvengeMedia/DankMaterialShell/core/internal/pam"
-	"github.com/spf13/cobra"
-)
-
-var authCmd = &cobra.Command{
-	Use:   "auth",
-	Short: "Manage DMS authentication sync",
-	Long:  "Manage shared PAM/authentication setup for DMS greeter and lock screen",
-}
-
-var authSyncCmd = &cobra.Command{
-	Use:     "sync",
-	Short:   "Sync DMS authentication configuration",
-	Long:    "Apply shared PAM/authentication changes for the lock screen and greeter based on current DMS settings",
-	PreRunE: preRunPrivileged,
-	Run: func(cmd *cobra.Command, args []string) {
-		yes, _ := cmd.Flags().GetBool("yes")
-		term, _ := cmd.Flags().GetBool("terminal")
-		if term {
-			if err := syncAuthInTerminal(yes); err != nil {
-				log.Fatalf("Error launching auth sync in terminal: %v", err)
-			}
-			return
-		}
-		if err := syncAuth(yes); err != nil {
-			log.Fatalf("Error syncing authentication: %v", err)
-		}
-	},
-}
-
-func init() {
-	authSyncCmd.Flags().BoolP("yes", "y", false, "Non-interactive mode: skip prompts")
-	authSyncCmd.Flags().BoolP("terminal", "t", false, "Run auth sync in a new terminal (for entering sudo password)")
-}
-
-func syncAuth(nonInteractive bool) error {
-	if !nonInteractive {
-		fmt.Println("=== DMS Authentication Sync ===")
-		fmt.Println()
-	}
-
-	logFunc := func(msg string) {
-		fmt.Println(msg)
-	}
-
-	if err := sharedpam.SyncAuthConfig(logFunc, "", sharedpam.SyncAuthOptions{}); err != nil {
-		return err
-	}
-
-	if !nonInteractive {
-		fmt.Println("\n=== Authentication Sync Complete ===")
-		fmt.Println("\nAuthentication changes have been applied.")
-	}
-
-	return nil
-}
-
-func syncAuthInTerminal(nonInteractive bool) error {
-	syncFlags := make([]string, 0, 1)
-	if nonInteractive {
-		syncFlags = append(syncFlags, "--yes")
-	}
-
-	shellSyncCmd := "dms auth sync"
-	if len(syncFlags) > 0 {
-		shellSyncCmd += " " + strings.Join(syncFlags, " ")
-	}
-	shellCmd := shellSyncCmd + `; echo; echo "Authentication sync finished. Closing in 3 seconds..."; sleep 3`
-	return runCommandInTerminal(shellCmd)
-}

core/cmd/dms/commands_blur.go

@@ -1,40 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/blur"
-	"github.com/spf13/cobra"
-)
-
-var blurCmd = &cobra.Command{
-	Use:   "blur",
-	Short: "Background blur utilities",
-}
-
-var blurCheckCmd = &cobra.Command{
-	Use:   "check",
-	Short: "Check if the compositor supports background blur (ext-background-effect-v1)",
-	Args:  cobra.NoArgs,
-	Run:   runBlurCheck,
-}
-
-func init() {
-	blurCmd.AddCommand(blurCheckCmd)
-}
-
-func runBlurCheck(cmd *cobra.Command, args []string) {
-	supported, err := blur.ProbeSupport()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-
-	switch supported {
-	case true:
-		fmt.Println("supported")
-	default:
-		fmt.Println("unsupported")
-	}
-}

core/cmd/dms/commands_brightness.go

@@ -179,7 +179,7 @@ func runBrightnessList(cmd *cobra.Command, args []string) {
 	fmt.Printf("%-*s  %-12s  %-*s  %s\n", idPad, "Device", "Class", namePad, "Name", "Brightness")
 
 	sepLen := idPad + 2 + 12 + 2 + namePad + 2 + 15
-	for range sepLen {
+	for i := 0; i < sepLen; i++ {
 		fmt.Print("─")
 	}
 	fmt.Println()
@@ -236,7 +236,6 @@ func runBrightnessSet(cmd *cobra.Command, args []string) {
 			defer ddc.Close()
 			time.Sleep(100 * time.Millisecond)
 			if err := ddc.SetBrightnessWithExponent(deviceID, percent, exponential, exponent, nil); err == nil {
-				ddc.WaitPending()
 				fmt.Printf("Set %s to %d%%\n", deviceID, percent)
 				return
 			}

core/cmd/dms/commands_chroma.go

@@ -1,300 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/alecthomas/chroma/v2"
-	"github.com/alecthomas/chroma/v2/formatters/html"
-	"github.com/alecthomas/chroma/v2/lexers"
-	"github.com/alecthomas/chroma/v2/styles"
-	"github.com/spf13/cobra"
-	"github.com/yuin/goldmark"
-	highlighting "github.com/yuin/goldmark-highlighting/v2"
-	"github.com/yuin/goldmark/extension"
-	"github.com/yuin/goldmark/parser"
-	ghtml "github.com/yuin/goldmark/renderer/html"
-)
-
-var (
-	chromaLanguage    string
-	chromaStyle       string
-	chromaInline      bool
-	chromaMarkdown    bool
-	chromaLineNumbers bool
-
-	// Caching layer for performance
-	lexerCache     = make(map[string]chroma.Lexer)
-	styleCache     = make(map[string]*chroma.Style)
-	formatterCache = make(map[string]*html.Formatter)
-	cacheMutex     sync.RWMutex
-	maxFileSize    = int64(5 * 1024 * 1024) // 5MB default
-)
-
-var chromaCmd = &cobra.Command{
-	Use:   "chroma [file]",
-	Short: "Syntax highlight source code",
-	Long: `Generate syntax-highlighted HTML from source code.
-
-Reads from file or stdin, outputs HTML with syntax highlighting.
-Language is auto-detected from filename or can be specified with --language.
-
-Examples:
-  dms chroma main.go
-  dms chroma --language python script.py
-  echo "def foo(): pass" | dms chroma -l python
-  cat code.rs | dms chroma -l rust --style dracula
-  dms chroma --markdown README.md
-  dms chroma --markdown --style github-dark notes.md
-  dms chroma list-languages
-  dms chroma list-styles`,
-	Args: cobra.MaximumNArgs(1),
-	Run:  runChroma,
-}
-
-var chromaListLanguagesCmd = &cobra.Command{
-	Use:   "list-languages",
-	Short: "List all supported languages",
-	Run: func(cmd *cobra.Command, args []string) {
-		for _, name := range lexers.Names(true) {
-			fmt.Println(name)
-		}
-	},
-}
-
-var chromaListStylesCmd = &cobra.Command{
-	Use:   "list-styles",
-	Short: "List all available color styles",
-	Run: func(cmd *cobra.Command, args []string) {
-		for _, name := range styles.Names() {
-			fmt.Println(name)
-		}
-	},
-}
-
-func init() {
-	chromaCmd.Flags().StringVarP(&chromaLanguage, "language", "l", "", "Language for highlighting (auto-detect if not specified)")
-	chromaCmd.Flags().StringVarP(&chromaStyle, "style", "s", "monokai", "Color style (monokai, dracula, github, etc.)")
-	chromaCmd.Flags().BoolVar(&chromaInline, "inline", false, "Output inline styles instead of CSS classes")
-	chromaCmd.Flags().BoolVar(&chromaLineNumbers, "line-numbers", false, "Show line numbers in output")
-	chromaCmd.Flags().BoolVarP(&chromaMarkdown, "markdown", "m", false, "Render markdown with syntax-highlighted code blocks")
-	chromaCmd.Flags().Int64Var(&maxFileSize, "max-size", 5*1024*1024, "Maximum file size to process without warning (bytes)")
-
-	chromaCmd.AddCommand(chromaListLanguagesCmd)
-	chromaCmd.AddCommand(chromaListStylesCmd)
-}
-
-func getCachedLexer(key string, fallbackFunc func() chroma.Lexer) chroma.Lexer {
-	cacheMutex.RLock()
-	if lexer, ok := lexerCache[key]; ok {
-		cacheMutex.RUnlock()
-		return lexer
-	}
-	cacheMutex.RUnlock()
-
-	lexer := fallbackFunc()
-	if lexer != nil {
-		cacheMutex.Lock()
-		lexerCache[key] = lexer
-		cacheMutex.Unlock()
-	}
-	return lexer
-}
-
-func getCachedStyle(name string) *chroma.Style {
-	cacheMutex.RLock()
-	if style, ok := styleCache[name]; ok {
-		cacheMutex.RUnlock()
-		return style
-	}
-	cacheMutex.RUnlock()
-
-	style := styles.Get(name)
-	if style == nil {
-		fmt.Fprintf(os.Stderr, "Warning: Style '%s' not found, using fallback\n", name)
-		style = styles.Fallback
-	}
-
-	cacheMutex.Lock()
-	styleCache[name] = style
-	cacheMutex.Unlock()
-	return style
-}
-
-func getCachedFormatter(inline bool, lineNumbers bool) *html.Formatter {
-	key := fmt.Sprintf("inline=%t,lineNumbers=%t", inline, lineNumbers)
-
-	cacheMutex.RLock()
-	if formatter, ok := formatterCache[key]; ok {
-		cacheMutex.RUnlock()
-		return formatter
-	}
-	cacheMutex.RUnlock()
-
-	var opts []html.Option
-	if inline {
-		opts = append(opts, html.WithClasses(false))
-	} else {
-		opts = append(opts, html.WithClasses(true))
-	}
-	opts = append(opts, html.TabWidth(4))
-
-	if lineNumbers {
-		opts = append(opts, html.WithLineNumbers(true))
-		opts = append(opts, html.LineNumbersInTable(false))
-		opts = append(opts, html.WithLinkableLineNumbers(false, ""))
-	}
-
-	formatter := html.New(opts...)
-
-	cacheMutex.Lock()
-	formatterCache[key] = formatter
-	cacheMutex.Unlock()
-	return formatter
-}
-
-func runChroma(cmd *cobra.Command, args []string) {
-	var source string
-	var filename string
-
-	// Read from file or stdin
-	if len(args) > 0 {
-		filename = args[0]
-
-		// Check file size before reading
-		fileInfo, err := os.Stat(filename)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error reading file info: %v\n", err)
-			os.Exit(1)
-		}
-
-		if fileInfo.Size() > maxFileSize {
-			fmt.Fprintf(os.Stderr, "Warning: File size (%d bytes) exceeds recommended limit (%d bytes)\n",
-				fileInfo.Size(), maxFileSize)
-			fmt.Fprintf(os.Stderr, "Processing may be slow. Consider using smaller files.\n")
-		}
-
-		content, err := os.ReadFile(filename)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error reading file: %v\n", err)
-			os.Exit(1)
-		}
-		source = string(content)
-	} else {
-		stat, _ := os.Stdin.Stat()
-		if (stat.Mode() & os.ModeCharDevice) != 0 {
-			_ = cmd.Help()
-			os.Exit(0)
-		}
-
-		content, err := io.ReadAll(os.Stdin)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error reading stdin: %v\n", err)
-			os.Exit(1)
-		}
-		source = string(content)
-	}
-
-	// Handle empty input
-	if strings.TrimSpace(source) == "" {
-		return
-	}
-
-	// Handle Markdown rendering
-	if chromaMarkdown {
-		md := goldmark.New(
-			goldmark.WithExtensions(
-				extension.GFM,
-				highlighting.NewHighlighting(
-					highlighting.WithStyle(chromaStyle),
-					highlighting.WithFormatOptions(
-						html.WithClasses(!chromaInline),
-					),
-				),
-			),
-			goldmark.WithParserOptions(
-				parser.WithAutoHeadingID(),
-			),
-			goldmark.WithRendererOptions(
-				ghtml.WithHardWraps(),
-				ghtml.WithXHTML(),
-			),
-		)
-
-		var buf bytes.Buffer
-		if err := md.Convert([]byte(source), &buf); err != nil {
-			fmt.Fprintf(os.Stderr, "Markdown rendering error: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Print(buf.String())
-		return
-	}
-
-	// Detect or use specified lexer
-	var lexer chroma.Lexer
-	if chromaLanguage != "" {
-		lexer = getCachedLexer(chromaLanguage, func() chroma.Lexer {
-			l := lexers.Get(chromaLanguage)
-			if l == nil {
-				fmt.Fprintf(os.Stderr, "Unknown language: %s\n", chromaLanguage)
-				os.Exit(1)
-			}
-			return l
-		})
-	} else if filename != "" {
-		lexer = getCachedLexer("file:"+filename, func() chroma.Lexer {
-			return lexers.Match(filename)
-		})
-	}
-
-	// Try content analysis if no lexer found (limit to first 1KB for performance)
-	if lexer == nil {
-		analyzeContent := source
-		if len(source) > 1024 {
-			analyzeContent = source[:1024]
-		}
-		lexer = lexers.Analyse(analyzeContent)
-	}
-
-	// Fallback to plaintext
-	if lexer == nil {
-		lexer = lexers.Fallback
-	}
-
-	lexer = chroma.Coalesce(lexer)
-
-	// Get cached style
-	style := getCachedStyle(chromaStyle)
-
-	// Get cached formatter
-	formatter := getCachedFormatter(chromaInline, chromaLineNumbers)
-
-	// Tokenize
-	iterator, err := lexer.Tokenise(nil, source)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Tokenization error: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Format and output
-	if chromaLineNumbers {
-		var buf bytes.Buffer
-		if err := formatter.Format(&buf, style, iterator); err != nil {
-			fmt.Fprintf(os.Stderr, "Formatting error: %v\n", err)
-			os.Exit(1)
-		}
-		// Add spacing between line numbers
-		output := buf.String()
-		output = strings.ReplaceAll(output, "</span><span>", "</span>\u00A0\u00A0<span>")
-		fmt.Print(output)
-	} else {
-		if err := formatter.Format(os.Stdout, style, iterator); err != nil {
-			fmt.Fprintf(os.Stderr, "Formatting error: %v\n", err)
-			os.Exit(1)
-		}
-	}
-}

core/cmd/dms/commands_colorpicker.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"os"
+	"os/exec"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/colorpicker"
 	"github.com/spf13/cobra"
 )
@@ -37,9 +37,6 @@ Output format flags (mutually exclusive, default: --hex):
   --cmyk - CMYK values (C% M% Y% K%)
   --json - JSON with all formats
 
-Optional:
-  --raw - Removes ANSI escape codes and background colors. Use this when piping to other commands
-
 Examples:
   dms color pick                # Pick color, output as hex
   dms color pick --rgb          # Output as RGB
@@ -56,7 +53,6 @@ func init() {
 	colorPickCmd.Flags().Bool("hsv", false, "Output as HSV (H S% V%)")
 	colorPickCmd.Flags().Bool("cmyk", false, "Output as CMYK (C% M% Y% K%)")
 	colorPickCmd.Flags().Bool("json", false, "Output all formats as JSON")
-	colorPickCmd.Flags().Bool("raw", false, "Removes ANSI escape codes and background colors. Use this when piping to other commands")
 	colorPickCmd.Flags().StringVarP(&colorOutputFmt, "output-format", "o", "", "Custom output format template")
 	colorPickCmd.Flags().BoolVarP(&colorAutocopy, "autocopy", "a", false, "Copy result to clipboard")
 	colorPickCmd.Flags().BoolVarP(&colorLowercase, "lowercase", "l", false, "Output hex in lowercase")
@@ -117,15 +113,7 @@ func runColorPick(cmd *cobra.Command, args []string) {
 
 	if jsonOutput {
 		fmt.Println(output)
-		return
+	} else if color.IsDark() {
-	}
-
-	if raw, _ := cmd.Flags().GetBool("raw"); raw {
-		fmt.Printf("%s\n", output)
-		return
-	}
-
-	if color.IsDark() {
 		fmt.Printf("\033[48;2;%d;%d;%dm\033[97m %s \033[0m\n", color.R, color.G, color.B, output)
 	} else {
 		fmt.Printf("\033[48;2;%d;%d;%dm\033[30m %s \033[0m\n", color.R, color.G, color.B, output)
@@ -133,7 +121,13 @@ func runColorPick(cmd *cobra.Command, args []string) {
 }
 
 func copyToClipboard(text string) {
-	if err := clipboard.CopyText(text); err != nil {
+	var cmd *exec.Cmd
-		fmt.Fprintln(os.Stderr, "clipboard copy failed:", err)
+	if _, err := exec.LookPath("wl-copy"); err == nil {
+		cmd = exec.Command("wl-copy", text)
+	} else {
+		fmt.Fprintln(os.Stderr, "wl-copy not found, cannot copy to clipboard")
+		return
 	}
+
+	_ = cmd.Run()
 }

core/cmd/dms/commands_common.go

@@ -26,17 +26,6 @@ var runCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		daemon, _ := cmd.Flags().GetBool("daemon")
 		session, _ := cmd.Flags().GetBool("session")
-		if v, _ := cmd.Flags().GetString("log-level"); v != "" {
-			if err := os.Setenv("DMS_LOG_LEVEL", v); err != nil {
-				log.Fatalf("Failed to set DMS_LOG_LEVEL: %v", err)
-			}
-		}
-		if v, _ := cmd.Flags().GetString("log-file"); v != "" {
-			if err := os.Setenv("DMS_LOG_FILE", v); err != nil {
-				log.Fatalf("Failed to set DMS_LOG_FILE: %v", err)
-			}
-		}
-		log.ApplyEnvOverrides()
 		if daemon {
 			runShellDaemon(session)
 		} else {
@@ -75,8 +64,10 @@ var killCmd = &cobra.Command{
 }
 
 var ipcCmd = &cobra.Command{
-	Use:   "ipc [target] [function] [args...]",
+	Use:     "ipc",
 	Short:   "Send IPC commands to running DMS shell",
+	Long:    "Send IPC commands to running DMS shell (qs -c dms ipc <args>)",
+	PreRunE: findConfig,
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		_ = findConfig(cmd, args)
 		return getShellIPCCompletions(args, toComplete), cobra.ShellCompDirectiveNoFileComp
@@ -86,13 +77,6 @@ var ipcCmd = &cobra.Command{
 	},
 }
 
-func init() {
-	ipcCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
-		_ = findConfig(cmd, args)
-		printIPCHelp()
-	})
-}
-
 var debugSrvCmd = &cobra.Command{
 	Use:   "debug-srv",
 	Short: "Start the debug server",
@@ -187,6 +171,7 @@ var pluginsUpdateCmd = &cobra.Command{
 }
 
 func runVersion(cmd *cobra.Command, args []string) {
+	printASCII()
 	fmt.Printf("%s\n", formatVersion(Version))
 }
 
@@ -235,7 +220,7 @@ func getBaseVersion() string {
 	}
 
 	// Fallback
-	return "1.0.2"
+	return "0.6.2"
 }
 
 func startDebugServer() error {
@@ -527,17 +512,6 @@ func getCommonCommands() []*cobra.Command {
 		colorCmd,
 		screenshotCmd,
 		notifyActionCmd,
-		notifyCmd,
-		genericNotifyActionCmd,
 		matugenCmd,
-		clipboardCmd,
-		chromaCmd,
-		doctorCmd,
-		configCmd,
-		dlCmd,
-		randrCmd,
-		blurCmd,
-		trashCmd,
-		systemCmd,
 	}
 }

core/cmd/dms/commands_config.go

@@ -1,318 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-	"github.com/spf13/cobra"
-)
-
-var configCmd = &cobra.Command{
-	Use:   "config",
-	Short: "Configuration utilities",
-}
-
-var resolveIncludeCmd = &cobra.Command{
-	Use:   "resolve-include <compositor> <filename>",
-	Short: "Check if a file is included in compositor config",
-	Long:  "Recursively check if a file is included/sourced in compositor configuration. Returns JSON with exists and included status.",
-	Args:  cobra.ExactArgs(2),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch len(args) {
-		case 0:
-			return []string{"hyprland", "niri", "mangowc"}, cobra.ShellCompDirectiveNoFileComp
-		case 1:
-			return []string{"cursor.kdl", "cursor.conf", "outputs.kdl", "outputs.conf", "binds.kdl", "binds.conf"}, cobra.ShellCompDirectiveNoFileComp
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	},
-	Run: runResolveInclude,
-}
-
-func init() {
-	configCmd.AddCommand(resolveIncludeCmd)
-}
-
-type IncludeResult struct {
-	Exists   bool `json:"exists"`
-	Included bool `json:"included"`
-}
-
-func runResolveInclude(cmd *cobra.Command, args []string) {
-	compositor := strings.ToLower(args[0])
-	filename := args[1]
-
-	var result IncludeResult
-	var err error
-
-	switch compositor {
-	case "hyprland":
-		result, err = checkHyprlandInclude(filename)
-	case "niri":
-		result, err = checkNiriInclude(filename)
-	case "mangowc", "dwl", "mango":
-		result, err = checkMangoWCInclude(filename)
-	default:
-		log.Fatalf("Unknown compositor: %s", compositor)
-	}
-
-	if err != nil {
-		log.Fatalf("Error checking include: %v", err)
-	}
-
-	output, _ := json.Marshal(result)
-	fmt.Fprintln(os.Stdout, string(output))
-}
-
-func checkHyprlandInclude(filename string) (IncludeResult, error) {
-	configDir, err := utils.ExpandPath("$HOME/.config/hypr")
-	if err != nil {
-		return IncludeResult{}, err
-	}
-
-	targetPath := filepath.Join(configDir, "dms", filename)
-	result := IncludeResult{}
-
-	if _, err := os.Stat(targetPath); err == nil {
-		result.Exists = true
-	}
-
-	mainConfig := filepath.Join(configDir, "hyprland.conf")
-	if _, err := os.Stat(mainConfig); os.IsNotExist(err) {
-		return result, nil
-	}
-
-	processed := make(map[string]bool)
-	result.Included = hyprlandFindInclude(mainConfig, "dms/"+filename, processed)
-	return result, nil
-}
-
-func hyprlandFindInclude(filePath, target string, processed map[string]bool) bool {
-	absPath, err := filepath.Abs(filePath)
-	if err != nil {
-		return false
-	}
-
-	if processed[absPath] {
-		return false
-	}
-	processed[absPath] = true
-
-	data, err := os.ReadFile(absPath)
-	if err != nil {
-		return false
-	}
-
-	baseDir := filepath.Dir(absPath)
-	lines := strings.Split(string(data), "\n")
-
-	for _, line := range lines {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "#") || trimmed == "" {
-			continue
-		}
-
-		if !strings.HasPrefix(trimmed, "source") {
-			continue
-		}
-
-		parts := strings.SplitN(trimmed, "=", 2)
-		if len(parts) < 2 {
-			continue
-		}
-
-		sourcePath := strings.TrimSpace(parts[1])
-		if matchesTarget(sourcePath, target) {
-			return true
-		}
-
-		fullPath := sourcePath
-		if !filepath.IsAbs(sourcePath) {
-			fullPath = filepath.Join(baseDir, sourcePath)
-		}
-
-		expanded, err := utils.ExpandPath(fullPath)
-		if err != nil {
-			continue
-		}
-
-		if hyprlandFindInclude(expanded, target, processed) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func checkNiriInclude(filename string) (IncludeResult, error) {
-	configDir, err := utils.ExpandPath("$HOME/.config/niri")
-	if err != nil {
-		return IncludeResult{}, err
-	}
-
-	targetPath := filepath.Join(configDir, "dms", filename)
-	result := IncludeResult{}
-
-	if _, err := os.Stat(targetPath); err == nil {
-		result.Exists = true
-	}
-
-	mainConfig := filepath.Join(configDir, "config.kdl")
-	if _, err := os.Stat(mainConfig); os.IsNotExist(err) {
-		return result, nil
-	}
-
-	processed := make(map[string]bool)
-	result.Included = niriFindInclude(mainConfig, "dms/"+filename, processed)
-	return result, nil
-}
-
-func niriFindInclude(filePath, target string, processed map[string]bool) bool {
-	absPath, err := filepath.Abs(filePath)
-	if err != nil {
-		return false
-	}
-
-	if processed[absPath] {
-		return false
-	}
-	processed[absPath] = true
-
-	data, err := os.ReadFile(absPath)
-	if err != nil {
-		return false
-	}
-
-	baseDir := filepath.Dir(absPath)
-	content := string(data)
-
-	for _, line := range strings.Split(content, "\n") {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "//") || trimmed == "" {
-			continue
-		}
-
-		if !strings.HasPrefix(trimmed, "include") {
-			continue
-		}
-
-		startQuote := strings.Index(trimmed, "\"")
-		if startQuote == -1 {
-			continue
-		}
-		endQuote := strings.LastIndex(trimmed, "\"")
-		if endQuote <= startQuote {
-			continue
-		}
-
-		includePath := trimmed[startQuote+1 : endQuote]
-		if matchesTarget(includePath, target) {
-			return true
-		}
-
-		fullPath := includePath
-		if !filepath.IsAbs(includePath) {
-			fullPath = filepath.Join(baseDir, includePath)
-		}
-
-		if niriFindInclude(fullPath, target, processed) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func checkMangoWCInclude(filename string) (IncludeResult, error) {
-	configDir, err := utils.ExpandPath("$HOME/.config/mango")
-	if err != nil {
-		return IncludeResult{}, err
-	}
-
-	targetPath := filepath.Join(configDir, "dms", filename)
-	result := IncludeResult{}
-
-	if _, err := os.Stat(targetPath); err == nil {
-		result.Exists = true
-	}
-
-	mainConfig := filepath.Join(configDir, "config.conf")
-	if _, err := os.Stat(mainConfig); os.IsNotExist(err) {
-		mainConfig = filepath.Join(configDir, "mango.conf")
-	}
-	if _, err := os.Stat(mainConfig); os.IsNotExist(err) {
-		return result, nil
-	}
-
-	processed := make(map[string]bool)
-	result.Included = mangowcFindInclude(mainConfig, "dms/"+filename, processed)
-	return result, nil
-}
-
-func mangowcFindInclude(filePath, target string, processed map[string]bool) bool {
-	absPath, err := filepath.Abs(filePath)
-	if err != nil {
-		return false
-	}
-
-	if processed[absPath] {
-		return false
-	}
-	processed[absPath] = true
-
-	data, err := os.ReadFile(absPath)
-	if err != nil {
-		return false
-	}
-
-	baseDir := filepath.Dir(absPath)
-	lines := strings.Split(string(data), "\n")
-
-	for _, line := range lines {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "#") || trimmed == "" {
-			continue
-		}
-
-		if !strings.HasPrefix(trimmed, "source") {
-			continue
-		}
-
-		parts := strings.SplitN(trimmed, "=", 2)
-		if len(parts) < 2 {
-			continue
-		}
-
-		sourcePath := strings.TrimSpace(parts[1])
-		if matchesTarget(sourcePath, target) {
-			return true
-		}
-
-		fullPath := sourcePath
-		if !filepath.IsAbs(sourcePath) {
-			fullPath = filepath.Join(baseDir, sourcePath)
-		}
-
-		expanded, err := utils.ExpandPath(fullPath)
-		if err != nil {
-			continue
-		}
-
-		if mangowcFindInclude(expanded, target, processed) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func matchesTarget(path, target string) bool {
-	path = strings.TrimPrefix(path, "./")
-	target = strings.TrimPrefix(target, "./")
-	return path == target || strings.HasSuffix(path, "/"+target)
-}

core/cmd/dms/commands_dank16.go

@@ -22,7 +22,6 @@ func init() {
 	dank16Cmd.Flags().Bool("json", false, "Output in JSON format")
 	dank16Cmd.Flags().Bool("kitty", false, "Output in Kitty terminal format")
 	dank16Cmd.Flags().Bool("foot", false, "Output in Foot terminal format")
-	dank16Cmd.Flags().Bool("neovim", false, "Output in Neovim plugin format")
 	dank16Cmd.Flags().Bool("alacritty", false, "Output in Alacritty terminal format")
 	dank16Cmd.Flags().Bool("ghostty", false, "Output in Ghostty terminal format")
 	dank16Cmd.Flags().Bool("wezterm", false, "Output in Wezterm terminal format")
@@ -41,7 +40,6 @@ func runDank16(cmd *cobra.Command, args []string) {
 	isJson, _ := cmd.Flags().GetBool("json")
 	isKitty, _ := cmd.Flags().GetBool("kitty")
 	isFoot, _ := cmd.Flags().GetBool("foot")
-	isNeovim, _ := cmd.Flags().GetBool("neovim")
 	isAlacritty, _ := cmd.Flags().GetBool("alacritty")
 	isGhostty, _ := cmd.Flags().GetBool("ghostty")
 	isWezterm, _ := cmd.Flags().GetBool("wezterm")
@@ -118,8 +116,6 @@ func runDank16(cmd *cobra.Command, args []string) {
 		fmt.Print(dank16.GenerateGhosttyTheme(colors))
 	} else if isWezterm {
 		fmt.Print(dank16.GenerateWeztermTheme(colors))
-	} else if isNeovim {
-		fmt.Print(dank16.GenerateNeovimTheme(colors))
 	} else {
 		fmt.Print(dank16.GenerateGhosttyTheme(colors))
 	}

core/cmd/dms/commands_download.go

@@ -1,99 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/spf13/cobra"
-)
-
-var dlOutput string
-var dlUserAgent string
-var dlTimeout int
-var dlIPv4Only bool
-
-var dlCmd = &cobra.Command{
-	Use:   "dl <url>",
-	Short: "Download a URL to stdout or file",
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runDownload(args[0]); err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
-	},
-}
-
-func init() {
-	dlCmd.Flags().StringVarP(&dlOutput, "output", "o", "", "Output file path (default: stdout)")
-	dlCmd.Flags().StringVar(&dlUserAgent, "user-agent", "", "Custom User-Agent header")
-	dlCmd.Flags().IntVar(&dlTimeout, "timeout", 10, "Request timeout in seconds")
-	dlCmd.Flags().BoolVarP(&dlIPv4Only, "ipv4", "4", false, "Force IPv4 only")
-}
-
-func runDownload(url string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(dlTimeout)*time.Second)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return fmt.Errorf("invalid request: %w", err)
-	}
-
-	switch {
-	case dlUserAgent != "":
-		req.Header.Set("User-Agent", dlUserAgent)
-	default:
-		req.Header.Set("User-Agent", "DankMaterialShell/1.0 (Linux)")
-	}
-
-	dialer := &net.Dialer{Timeout: 5 * time.Second}
-	transport := &http.Transport{DialContext: dialer.DialContext}
-	if dlIPv4Only {
-		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-			return dialer.DialContext(ctx, "tcp4", addr)
-		}
-	}
-	client := &http.Client{Transport: transport}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return fmt.Errorf("download failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("HTTP %d", resp.StatusCode)
-	}
-
-	if dlOutput == "" {
-		_, err = io.Copy(os.Stdout, resp.Body)
-		return err
-	}
-
-	if dir := filepath.Dir(dlOutput); dir != "." {
-		if err := os.MkdirAll(dir, 0755); err != nil {
-			return fmt.Errorf("mkdir failed: %w", err)
-		}
-	}
-
-	f, err := os.Create(dlOutput)
-	if err != nil {
-		return fmt.Errorf("create failed: %w", err)
-	}
-	defer f.Close()
-
-	if _, err := io.Copy(f, resp.Body); err != nil {
-		os.Remove(dlOutput)
-		return fmt.Errorf("write failed: %w", err)
-	}
-
-	fmt.Println(dlOutput)
-	return nil
-}

core/cmd/dms/commands_features.go

@@ -4,7 +4,6 @@ package main
 
 import (
 	"bufio"
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -16,7 +15,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/distros"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/privesc"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/version"
 	"github.com/spf13/cobra"
@@ -111,37 +109,16 @@ func updateArchLinux() error {
 	}
 
 	var packageName string
-	var isAUR bool
+	if isArchPackageInstalled("dms-shell-bin") {
-	if isArchPackageInstalled("dms-shell") {
+		packageName = "dms-shell-bin"
-		packageName = "dms-shell"
 	} else if isArchPackageInstalled("dms-shell-git") {
 		packageName = "dms-shell-git"
-		isAUR = true
-	} else if isArchPackageInstalled("dms-shell-bin") {
-		packageName = "dms-shell-bin"
-		isAUR = true
 	} else {
-		fmt.Println("Info: No dms-shell package found.")
+		fmt.Println("Info: Neither dms-shell-bin nor dms-shell-git package found.")
 		fmt.Println("Info: Falling back to git-based update method...")
 		return updateOtherDistros()
 	}
 
-	if !isAUR {
-		fmt.Printf("This will update %s using pacman.\n", packageName)
-		if !confirmUpdate() {
-			return errdefs.ErrUpdateCancelled
-		}
-
-		fmt.Printf("\nRunning: pacman -S %s\n", packageName)
-		if err := privesc.Run(context.Background(), "", "pacman", "-S", "--noconfirm", packageName); err != nil {
-			fmt.Printf("Error: Failed to update using pacman: %v\n", err)
-			return err
-		}
-
-		fmt.Println("dms successfully updated")
-		return nil
-	}
-
 	var helper string
 	var updateCmd *exec.Cmd
 
@@ -400,7 +377,7 @@ func updateDMSBinary() error {
 	}
 
 	version := ""
-	for line := range strings.SplitSeq(string(output), "\n") {
+	for _, line := range strings.Split(string(output), "\n") {
 		if strings.Contains(line, "\"tag_name\"") {
 			parts := strings.Split(line, "\"")
 			if len(parts) >= 4 {
@@ -466,7 +443,7 @@ func updateDMSBinary() error {
 
 	decompressedPath := filepath.Join(tempDir, "dms")
 
-	if err := os.Chmod(decompressedPath, 0o755); err != nil {
+	if err := os.Chmod(decompressedPath, 0755); err != nil {
 		return fmt.Errorf("failed to make binary executable: %w", err)
 	}
 
@@ -477,7 +454,11 @@ func updateDMSBinary() error {
 
 	fmt.Printf("Installing to %s...\n", currentPath)
 
-	if err := privesc.Run(context.Background(), "", "install", "-m", "0755", decompressedPath, currentPath); err != nil {
+	replaceCmd := exec.Command("sudo", "install", "-m", "0755", decompressedPath, currentPath)
+	replaceCmd.Stdin = os.Stdin
+	replaceCmd.Stdout = os.Stdout
+	replaceCmd.Stderr = os.Stderr
+	if err := replaceCmd.Run(); err != nil {
 		return fmt.Errorf("failed to replace binary: %w", err)
 	}
 

core/cmd/dms/commands_greeter_test.go

@@ -1,87 +0,0 @@
-package main
-
-import (
-	"errors"
-	"reflect"
-	"testing"
-
-	sharedpam "github.com/AvengeMedia/DankMaterialShell/core/internal/pam"
-)
-
-func TestSyncGreeterConfigsAndAuthDelegatesSharedAuth(t *testing.T) {
-	origGreeterConfigSyncFn := greeterConfigSyncFn
-	origSharedAuthSyncFn := sharedAuthSyncFn
-	t.Cleanup(func() {
-		greeterConfigSyncFn = origGreeterConfigSyncFn
-		sharedAuthSyncFn = origSharedAuthSyncFn
-	})
-
-	var calls []string
-	greeterConfigSyncFn = func(dmsPath, compositor string, logFunc func(string), sudoPassword string) error {
-		if dmsPath != "/tmp/dms" {
-			t.Fatalf("unexpected dmsPath %q", dmsPath)
-		}
-		if compositor != "niri" {
-			t.Fatalf("unexpected compositor %q", compositor)
-		}
-		if sudoPassword != "" {
-			t.Fatalf("expected empty sudoPassword, got %q", sudoPassword)
-		}
-		calls = append(calls, "configs")
-		return nil
-	}
-
-	var gotOptions sharedpam.SyncAuthOptions
-	sharedAuthSyncFn = func(logFunc func(string), sudoPassword string, options sharedpam.SyncAuthOptions) error {
-		if sudoPassword != "" {
-			t.Fatalf("expected empty sudoPassword, got %q", sudoPassword)
-		}
-		gotOptions = options
-		calls = append(calls, "auth")
-		return nil
-	}
-
-	err := syncGreeterConfigsAndAuth("/tmp/dms", "niri", func(string) {}, sharedpam.SyncAuthOptions{
-		ForceGreeterAuth: true,
-	}, func() {
-		calls = append(calls, "before-auth")
-	})
-	if err != nil {
-		t.Fatalf("syncGreeterConfigsAndAuth returned error: %v", err)
-	}
-
-	wantCalls := []string{"configs", "before-auth", "auth"}
-	if !reflect.DeepEqual(calls, wantCalls) {
-		t.Fatalf("call order = %v, want %v", calls, wantCalls)
-	}
-	if !gotOptions.ForceGreeterAuth {
-		t.Fatalf("expected ForceGreeterAuth to be true, got %+v", gotOptions)
-	}
-}
-
-func TestSyncGreeterConfigsAndAuthStopsOnConfigError(t *testing.T) {
-	origGreeterConfigSyncFn := greeterConfigSyncFn
-	origSharedAuthSyncFn := sharedAuthSyncFn
-	t.Cleanup(func() {
-		greeterConfigSyncFn = origGreeterConfigSyncFn
-		sharedAuthSyncFn = origSharedAuthSyncFn
-	})
-
-	greeterConfigSyncFn = func(string, string, func(string), string) error {
-		return errors.New("config sync failed")
-	}
-
-	authCalled := false
-	sharedAuthSyncFn = func(func(string), string, sharedpam.SyncAuthOptions) error {
-		authCalled = true
-		return nil
-	}
-
-	err := syncGreeterConfigsAndAuth("/tmp/dms", "niri", func(string) {}, sharedpam.SyncAuthOptions{}, nil)
-	if err == nil || err.Error() != "config sync failed" {
-		t.Fatalf("expected config sync error, got %v", err)
-	}
-	if authCalled {
-		t.Fatal("expected auth sync not to run after config sync failure")
-	}
-}

core/cmd/dms/commands_keybinds.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds/providers"
@@ -58,15 +57,12 @@ var keybindsRemoveCmd = &cobra.Command{
 }
 
 func init() {
-	keybindsListCmd.Flags().BoolP("json", "j", false, "Output as JSON")
 	keybindsShowCmd.Flags().String("path", "", "Override config path for the provider")
 	keybindsSetCmd.Flags().String("desc", "", "Description for hotkey overlay")
 	keybindsSetCmd.Flags().Bool("allow-when-locked", false, "Allow when screen is locked")
 	keybindsSetCmd.Flags().Int("cooldown-ms", 0, "Cooldown in milliseconds")
 	keybindsSetCmd.Flags().Bool("no-repeat", false, "Disable key repeat")
-	keybindsSetCmd.Flags().Bool("no-inhibiting", false, "Keep bind active when shortcuts are inhibited (allow-inhibiting=false)")
 	keybindsSetCmd.Flags().String("replace-key", "", "Original key to replace (removes old key)")
-	keybindsSetCmd.Flags().String("flags", "", "Hyprland bind flags (e.g., 'e' for repeat, 'l' for locked, 'r' for release)")
 
 	keybindsCmd.AddCommand(keybindsListCmd)
 	keybindsCmd.AddCommand(keybindsShowCmd)
@@ -83,36 +79,25 @@ func init() {
 func initializeProviders() {
 	registry := keybinds.GetDefaultRegistry()
 
-	hyprlandProvider := providers.NewHyprlandProvider("")
+	hyprlandProvider := providers.NewHyprlandProvider("$HOME/.config/hypr")
 	if err := registry.Register(hyprlandProvider); err != nil {
 		log.Warnf("Failed to register Hyprland provider: %v", err)
 	}
 
-	mangowcProvider := providers.NewMangoWCProvider("")
+	mangowcProvider := providers.NewMangoWCProvider("$HOME/.config/mango")
 	if err := registry.Register(mangowcProvider); err != nil {
 		log.Warnf("Failed to register MangoWC provider: %v", err)
 	}
 
-	configDir, _ := os.UserConfigDir()
+	scrollProvider := providers.NewSwayProvider("$HOME/.config/scroll")
-
-	if configDir != "" {
-		scrollProvider := providers.NewSwayProvider(filepath.Join(configDir, "scroll"))
 	if err := registry.Register(scrollProvider); err != nil {
 		log.Warnf("Failed to register Scroll provider: %v", err)
 	}
-	}
 
-	miracleProvider := providers.NewMiracleProvider("")
+	swayProvider := providers.NewSwayProvider("$HOME/.config/sway")
-	if err := registry.Register(miracleProvider); err != nil {
-		log.Warnf("Failed to register Miracle WM provider: %v", err)
-	}
-
-	if configDir != "" {
-		swayProvider := providers.NewSwayProvider(filepath.Join(configDir, "sway"))
 	if err := registry.Register(swayProvider); err != nil {
 		log.Warnf("Failed to register Sway provider: %v", err)
 	}
-	}
 
 	niriProvider := providers.NewNiriProvider("")
 	if err := registry.Register(niriProvider); err != nil {
@@ -125,21 +110,12 @@ func initializeProviders() {
 	}
 }
 
-func runKeybindsList(cmd *cobra.Command, _ []string) {
+func runKeybindsList(_ *cobra.Command, _ []string) {
 	providerList := keybinds.GetDefaultRegistry().List()
-	asJSON, _ := cmd.Flags().GetBool("json")
-
-	if asJSON {
-		output, _ := json.Marshal(providerList)
-		fmt.Fprintln(os.Stdout, string(output))
-		return
-	}
-
 	if len(providerList) == 0 {
 		fmt.Fprintln(os.Stdout, "No providers available")
 		return
 	}
-
 	fmt.Fprintln(os.Stdout, "Available providers:")
 	for _, name := range providerList {
 		fmt.Fprintf(os.Stdout, "  - %s\n", name)
@@ -156,8 +132,6 @@ func makeProviderWithPath(name, path string) keybinds.Provider {
 		return providers.NewSwayProvider(path)
 	case "scroll":
 		return providers.NewSwayProvider(path)
-	case "miracle":
-		return providers.NewMiracleProvider(path)
 	case "niri":
 		return providers.NewNiriProvider(path)
 	default:
@@ -227,12 +201,6 @@ func runKeybindsSet(cmd *cobra.Command, args []string) {
 	if v, _ := cmd.Flags().GetBool("no-repeat"); v {
 		options["repeat"] = false
 	}
-	if v, _ := cmd.Flags().GetBool("no-inhibiting"); v {
-		options["allow-inhibiting"] = false
-	}
-	if v, _ := cmd.Flags().GetString("flags"); v != "" {
-		options["flags"] = v
-	}
 
 	desc, _ := cmd.Flags().GetString("desc")
 	if err := writable.SetBind(key, action, desc, options); err != nil {

core/cmd/dms/commands_matugen.go

@@ -3,14 +3,14 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
+	"net"
 	"os"
 	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/matugen"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server"
 	"github.com/spf13/cobra"
 )
 
@@ -32,16 +32,9 @@ var matugenQueueCmd = &cobra.Command{
 	Run:   runMatugenQueue,
 }
 
-var matugenCheckCmd = &cobra.Command{
-	Use:   "check",
-	Short: "Check which template apps are detected",
-	Run:   runMatugenCheck,
-}
-
 func init() {
 	matugenCmd.AddCommand(matugenGenerateCmd)
 	matugenCmd.AddCommand(matugenQueueCmd)
-	matugenCmd.AddCommand(matugenCheckCmd)
 
 	for _, cmd := range []*cobra.Command{matugenGenerateCmd, matugenQueueCmd} {
 		cmd.Flags().String("state-dir", "", "State directory for cache files")
@@ -56,12 +49,10 @@ func init() {
 		cmd.Flags().String("stock-colors", "", "Stock theme colors JSON")
 		cmd.Flags().Bool("sync-mode-with-portal", false, "Sync color scheme with GNOME portal")
 		cmd.Flags().Bool("terminals-always-dark", false, "Force terminal themes to dark variant")
-		cmd.Flags().String("skip-templates", "", "Comma-separated list of templates to skip")
-		cmd.Flags().Float64("contrast", 0, "Contrast value from -1 to 1 (0 = standard)")
 	}
 
 	matugenQueueCmd.Flags().Bool("wait", true, "Wait for completion")
-	matugenQueueCmd.Flags().Duration("timeout", 90*time.Second, "Timeout for waiting")
+	matugenQueueCmd.Flags().Duration("timeout", 30*time.Second, "Timeout for waiting")
 }
 
 func buildMatugenOptions(cmd *cobra.Command) matugen.Options {
@@ -77,8 +68,6 @@ func buildMatugenOptions(cmd *cobra.Command) matugen.Options {
 	stockColors, _ := cmd.Flags().GetString("stock-colors")
 	syncModeWithPortal, _ := cmd.Flags().GetBool("sync-mode-with-portal")
 	terminalsAlwaysDark, _ := cmd.Flags().GetBool("terminals-always-dark")
-	skipTemplates, _ := cmd.Flags().GetString("skip-templates")
-	contrast, _ := cmd.Flags().GetFloat64("contrast")
 
 	return matugen.Options{
 		StateDir:            stateDir,
@@ -86,25 +75,19 @@ func buildMatugenOptions(cmd *cobra.Command) matugen.Options {
 		ConfigDir:           configDir,
 		Kind:                kind,
 		Value:               value,
-		Mode:                matugen.ColorMode(mode),
+		Mode:                mode,
 		IconTheme:           iconTheme,
 		MatugenType:         matugenType,
-		Contrast:            contrast,
 		RunUserTemplates:    runUserTemplates,
 		StockColors:         stockColors,
 		SyncModeWithPortal:  syncModeWithPortal,
 		TerminalsAlwaysDark: terminalsAlwaysDark,
-		SkipTemplates:       skipTemplates,
 	}
 }
 
 func runMatugenGenerate(cmd *cobra.Command, args []string) {
 	opts := buildMatugenOptions(cmd)
-	err := matugen.Run(opts)
+	if err := matugen.Run(opts); err != nil {
-	switch {
-	case errors.Is(err, matugen.ErrNoChanges):
-		os.Exit(2)
-	case err != nil:
 		log.Fatalf("Theme generation failed: %v", err)
 	}
 }
@@ -114,10 +97,33 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 	wait, _ := cmd.Flags().GetBool("wait")
 	timeout, _ := cmd.Flags().GetDuration("timeout")
 
-	request := models.Request{
+	socketPath := os.Getenv("DMS_SOCKET")
-		ID:     1,
+	if socketPath == "" {
-		Method: "matugen.queue",
+		var err error
-		Params: map[string]any{
+		socketPath, err = server.FindSocket()
+		if err != nil {
+			log.Info("No socket available, running synchronously")
+			if err := matugen.Run(opts); err != nil {
+				log.Fatalf("Theme generation failed: %v", err)
+			}
+			return
+		}
+	}
+
+	conn, err := net.Dial("unix", socketPath)
+	if err != nil {
+		log.Info("Socket connection failed, running synchronously")
+		if err := matugen.Run(opts); err != nil {
+			log.Fatalf("Theme generation failed: %v", err)
+		}
+		return
+	}
+	defer conn.Close()
+
+	request := map[string]any{
+		"id":     1,
+		"method": "matugen.queue",
+		"params": map[string]any{
 			"stateDir":            opts.StateDir,
 			"shellDir":            opts.ShellDir,
 			"configDir":           opts.ConfigDir,
@@ -130,24 +136,15 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 			"stockColors":         opts.StockColors,
 			"syncModeWithPortal":  opts.SyncModeWithPortal,
 			"terminalsAlwaysDark": opts.TerminalsAlwaysDark,
-			"skipTemplates":       opts.SkipTemplates,
-			"contrast":            opts.Contrast,
 			"wait":                wait,
 		},
 	}
 
+	if err := json.NewEncoder(conn).Encode(request); err != nil {
+		log.Fatalf("Failed to send request: %v", err)
+	}
+
 	if !wait {
-		if err := sendServerRequestFireAndForget(request); err != nil {
-			log.Info("Server unavailable, running synchronously")
-			err := matugen.Run(opts)
-			switch {
-			case errors.Is(err, matugen.ErrNoChanges):
-				os.Exit(2)
-			case err != nil:
-				log.Fatalf("Theme generation failed: %v", err)
-			}
-			return
-		}
 		fmt.Println("Theme generation queued")
 		return
 	}
@@ -157,22 +154,17 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 
 	resultCh := make(chan error, 1)
 	go func() {
-		resp, ok := tryServerRequest(request)
+		var response struct {
-		if !ok {
+			ID     int    `json:"id"`
-			log.Info("Server unavailable, running synchronously")
+			Result any    `json:"result"`
-			err := matugen.Run(opts)
+			Error  string `json:"error"`
-			switch {
-			case errors.Is(err, matugen.ErrNoChanges):
-				resultCh <- matugen.ErrNoChanges
-			case err != nil:
-				resultCh <- err
-			default:
-				resultCh <- nil
 		}
+		if err := json.NewDecoder(conn).Decode(&response); err != nil {
+			resultCh <- fmt.Errorf("failed to read response: %w", err)
 			return
 		}
-		if resp.Error != "" {
+		if response.Error != "" {
-			resultCh <- fmt.Errorf("server error: %s", resp.Error)
+			resultCh <- fmt.Errorf("server error: %s", response.Error)
 			return
 		}
 		resultCh <- nil
@@ -180,10 +172,7 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 
 	select {
 	case err := <-resultCh:
-		switch {
+		if err != nil {
-		case errors.Is(err, matugen.ErrNoChanges):
-			os.Exit(2)
-		case err != nil:
 			log.Fatalf("Theme generation failed: %v", err)
 		}
 		fmt.Println("Theme generation completed")
@@ -191,12 +180,3 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 		log.Fatalf("Timeout waiting for theme generation")
 	}
 }
-
-func runMatugenCheck(cmd *cobra.Command, args []string) {
-	checks := matugen.CheckTemplates(nil)
-	data, err := json.Marshal(checks)
-	if err != nil {
-		log.Fatalf("Failed to marshal check results: %v", err)
-	}
-	fmt.Println(string(data))
-}

core/cmd/dms/commands_notify.go

@@ -1,68 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/notify"
-	"github.com/spf13/cobra"
-)
-
-var (
-	notifyAppName string
-	notifyIcon    string
-	notifyFile    string
-	notifyTimeout int
-)
-
-var notifyCmd = &cobra.Command{
-	Use:   "notify <summary> [body]",
-	Short: "Send a desktop notification",
-	Long: `Send a desktop notification with optional actions.
-
-If --file is provided, the notification will have "Open" and "Open Folder" actions.
-
-Examples:
-  dms notify "Hello" "World"
-  dms notify "File received" "photo.jpg" --file ~/Downloads/photo.jpg --icon smartphone
-  dms notify "Download complete" --file ~/Downloads/file.zip --app "My App"`,
-	Args: cobra.MinimumNArgs(1),
-	Run:  runNotify,
-}
-
-var genericNotifyActionCmd = &cobra.Command{
-	Use:    "notify-action-generic",
-	Hidden: true,
-	Run: func(cmd *cobra.Command, args []string) {
-		notify.RunActionListener(args)
-	},
-}
-
-func init() {
-	notifyCmd.Flags().StringVar(&notifyAppName, "app", "DMS", "Application name")
-	notifyCmd.Flags().StringVar(&notifyIcon, "icon", "", "Icon name or path")
-	notifyCmd.Flags().StringVar(&notifyFile, "file", "", "File path (enables Open/Open Folder actions)")
-	notifyCmd.Flags().IntVar(&notifyTimeout, "timeout", 5000, "Timeout in milliseconds")
-}
-
-func runNotify(cmd *cobra.Command, args []string) {
-	summary := args[0]
-	body := ""
-	if len(args) > 1 {
-		body = args[1]
-	}
-
-	n := notify.Notification{
-		AppName:  notifyAppName,
-		Icon:     notifyIcon,
-		Summary:  summary,
-		Body:     body,
-		FilePath: notifyFile,
-		Timeout:  int32(notifyTimeout),
-	}
-
-	if err := notify.Send(n); err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-}

core/cmd/dms/commands_open.go

@@ -1,14 +1,17 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"mime"
+	"net"
 	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/spf13/cobra"
 )
@@ -90,6 +93,32 @@ func mimeTypeToCategories(mimeType string) []string {
 }
 
 func runOpen(target string) {
+	socketPath, err := server.FindSocket()
+	if err != nil {
+		log.Warnf("DMS socket not found: %v", err)
+		fmt.Println("DMS is not running. Please start DMS first.")
+		os.Exit(1)
+	}
+
+	conn, err := net.Dial("unix", socketPath)
+	if err != nil {
+		log.Warnf("DMS socket connection failed: %v", err)
+		fmt.Println("DMS is not running. Please start DMS first.")
+		os.Exit(1)
+	}
+	defer conn.Close()
+
+	buf := make([]byte, 1)
+	for {
+		_, err := conn.Read(buf)
+		if err != nil {
+			return
+		}
+		if buf[0] == '\n' {
+			break
+		}
+	}
+
 	// Parse file:// URIs to extract the actual file path
 	actualTarget := target
 	detectedMimeType := openMimeType
@@ -131,12 +160,6 @@ func runOpen(target string) {
 			detectedRequestType = "url"
 		}
 		log.Infof("Detected HTTP(S) URL")
-	} else if strings.HasPrefix(target, "dms://") {
-		// Handle DMS internal URLs (theme/plugin install, etc.)
-		if detectedRequestType == "" {
-			detectedRequestType = "url"
-		}
-		log.Infof("Detected DMS internal URL")
 	} else if _, err := os.Stat(target); err == nil {
 		// Handle local file paths directly (not file:// URIs)
 		// Convert to absolute path
@@ -183,7 +206,7 @@ func runOpen(target string) {
 	}
 
 	method := "apppicker.open"
-	if detectedMimeType == "" && len(detectedCategories) == 0 && (strings.HasPrefix(target, "http://") || strings.HasPrefix(target, "https://") || strings.HasPrefix(target, "dms://")) {
+	if detectedMimeType == "" && len(detectedCategories) == 0 && (strings.HasPrefix(target, "http://") || strings.HasPrefix(target, "https://")) {
 		method = "browser.open"
 		params["url"] = target
 	}
@@ -196,9 +219,8 @@ func runOpen(target string) {
 
 	log.Infof("Sending request - Method: %s, Params: %+v", method, params)
 
-	if err := sendServerRequestFireAndForget(req); err != nil {
+	if err := json.NewEncoder(conn).Encode(req); err != nil {
-		fmt.Println("DMS is not running. Please start DMS first.")
+		log.Fatalf("Failed to send request: %v", err)
-		os.Exit(1)
 	}
 
 	log.Infof("Request sent successfully")

core/cmd/dms/commands_randr.go

@@ -1,58 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/spf13/cobra"
-)
-
-var randrCmd = &cobra.Command{
-	Use:   "randr",
-	Short: "Query output display information",
-	Long:  "Query Wayland compositor for output names, scales, resolutions and refresh rates via zwlr-output-management",
-	Run:   runRandr,
-}
-
-func init() {
-	randrCmd.Flags().Bool("json", false, "Output in JSON format")
-}
-
-type randrJSON struct {
-	Outputs []randrOutput `json:"outputs"`
-}
-
-func runRandr(cmd *cobra.Command, args []string) {
-	outputs, err := queryRandr()
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
-
-	jsonFlag, _ := cmd.Flags().GetBool("json")
-
-	if jsonFlag {
-		data, err := json.Marshal(randrJSON{Outputs: outputs})
-		if err != nil {
-			log.Fatalf("failed to marshal JSON: %v", err)
-		}
-		fmt.Println(string(data))
-		return
-	}
-
-	for i, out := range outputs {
-		if i > 0 {
-			fmt.Println()
-		}
-		status := "enabled"
-		if !out.Enabled {
-			status = "disabled"
-		}
-		fmt.Printf("%s (%s)\n", out.Name, status)
-		fmt.Printf("  Scale:      %.4g\n", out.Scale)
-		fmt.Printf("  Resolution: %dx%d\n", out.Width, out.Height)
-		if out.Refresh > 0 {
-			fmt.Printf("  Refresh:    %.2f Hz\n", float64(out.Refresh)/1000.0)
-		}
-	}
-}

core/cmd/dms/commands_root.go

@@ -7,7 +7,9 @@ import (
 	"strings"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/dms"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
+	tea "github.com/charmbracelet/bubbletea"
 	"github.com/spf13/cobra"
 )
 
@@ -18,9 +20,11 @@ var rootCmd = &cobra.Command{
 	Use:   "dms",
 	Short: "dms CLI",
 	Long:  "dms is the DankMaterialShell management CLI and backend server.",
+	Run:   runInteractiveMode,
 }
 
 func init() {
+	// Add the -c flag
 	rootCmd.PersistentFlags().StringVarP(&customConfigPath, "config", "c", "", "Specify a custom path to the DMS config directory")
 }
 
@@ -34,7 +38,7 @@ func findConfig(cmd *cobra.Command, args []string) error {
 		if statErr == nil && !info.IsDir() {
 			configPath = customConfigPath
 			log.Debug("Using config from: %s", configPath)
-			return nil
+			return nil // <-- Guard statement
 		}
 
 		if statErr != nil {
@@ -46,9 +50,6 @@ func findConfig(cmd *cobra.Command, args []string) error {
 
 	configStateFile := filepath.Join(getRuntimeDir(), "danklinux.path")
 	if data, readErr := os.ReadFile(configStateFile); readErr == nil {
-		if len(getAllDMSPIDs()) == 0 {
-			os.Remove(configStateFile)
-		} else {
 		statePath := strings.TrimSpace(string(data))
 		shellPath := filepath.Join(statePath, "shell.qml")
 
@@ -56,8 +57,8 @@ func findConfig(cmd *cobra.Command, args []string) error {
 			log.Debug("Using config from active session state file: %s", statePath)
 			configPath = statePath
 			log.Debug("Using config from: %s", configPath)
-				return nil
+			return nil // <-- Guard statement
-			}
+		} else {
 			os.Remove(configStateFile)
 		}
 	}
@@ -72,3 +73,18 @@ func findConfig(cmd *cobra.Command, args []string) error {
 	log.Debug("Using config from: %s", configPath)
 	return nil
 }
+func runInteractiveMode(cmd *cobra.Command, args []string) {
+	detector, _ := dms.NewDetector()
+
+	if !detector.IsDMSInstalled() {
+		log.Error("DankMaterialShell (DMS) is not detected as installed on this system.")
+		log.Info("Please install DMS using dankinstall before using this management interface.")
+		os.Exit(1)
+	}
+
+	model := dms.NewModel(Version)
+	p := tea.NewProgram(model, tea.WithAltScreen())
+	if _, err := p.Run(); err != nil {
+		log.Fatalf("Error running program: %v", err)
+	}
+}

core/cmd/dms/commands_screenshot.go

@@ -4,17 +4,17 @@ import (
 	"bytes"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/screenshot"
 	"github.com/spf13/cobra"
 )
 
 var (
 	ssOutputName    string
-	ssCursor      string
+	ssIncludeCursor bool
 	ssFormat        string
 	ssQuality       int
 	ssOutputDir     string
@@ -22,8 +22,6 @@ var (
 	ssNoClipboard   bool
 	ssNoFile        bool
 	ssNoNotify      bool
-	ssNoConfirm   bool
-	ssReset       bool
 	ssStdout        bool
 )
 
@@ -52,11 +50,9 @@ Examples:
   dms screenshot output -o DP-1      # Specific output
   dms screenshot window              # Focused window (Hyprland)
   dms screenshot last                # Last region (pre-selected)
-  dms screenshot --reset             # Reset last region pre-selection
   dms screenshot --no-clipboard      # Save file only
   dms screenshot --no-file           # Clipboard only
-  dms screenshot --no-confirm        # Region capture on mouse release
+  dms screenshot --cursor            # Include cursor
-  dms screenshot --cursor=on         # Include cursor
   dms screenshot -f jpg -q 85        # JPEG with quality 85`,
 }
 
@@ -115,7 +111,7 @@ var notifyActionCmd = &cobra.Command{
 
 func init() {
 	screenshotCmd.PersistentFlags().StringVarP(&ssOutputName, "output", "o", "", "Output name for 'output' mode")
-	screenshotCmd.PersistentFlags().StringVar(&ssCursor, "cursor", "off", "Include cursor in screenshot (on/off)")
+	screenshotCmd.PersistentFlags().BoolVar(&ssIncludeCursor, "cursor", false, "Include cursor in screenshot")
 	screenshotCmd.PersistentFlags().StringVarP(&ssFormat, "format", "f", "png", "Output format (png, jpg, ppm)")
 	screenshotCmd.PersistentFlags().IntVarP(&ssQuality, "quality", "q", 90, "JPEG quality (1-100)")
 	screenshotCmd.PersistentFlags().StringVarP(&ssOutputDir, "dir", "d", "", "Output directory")
@@ -123,8 +119,6 @@ func init() {
 	screenshotCmd.PersistentFlags().BoolVar(&ssNoClipboard, "no-clipboard", false, "Don't copy to clipboard")
 	screenshotCmd.PersistentFlags().BoolVar(&ssNoFile, "no-file", false, "Don't save to file")
 	screenshotCmd.PersistentFlags().BoolVar(&ssNoNotify, "no-notify", false, "Don't show notification")
-	screenshotCmd.PersistentFlags().BoolVar(&ssNoConfirm, "no-confirm", false, "Region mode: capture on mouse release without Enter/Space confirmation")
-	screenshotCmd.PersistentFlags().BoolVar(&ssReset, "reset", false, "Reset saved last-region preselection before capturing")
 	screenshotCmd.PersistentFlags().BoolVar(&ssStdout, "stdout", false, "Output image to stdout (for piping to swappy, etc.)")
 
 	screenshotCmd.AddCommand(ssRegionCmd)
@@ -142,14 +136,10 @@ func getScreenshotConfig(mode screenshot.Mode) screenshot.Config {
 	config := screenshot.DefaultConfig()
 	config.Mode = mode
 	config.OutputName = ssOutputName
-	if strings.EqualFold(ssCursor, "on") {
+	config.IncludeCursor = ssIncludeCursor
-		config.Cursor = screenshot.CursorOn
-	}
 	config.Clipboard = !ssNoClipboard
 	config.SaveFile = !ssNoFile
 	config.Notify = !ssNoNotify
-	config.NoConfirm = ssNoConfirm
-	config.Reset = ssReset
 	config.Stdout = ssStdout
 
 	if ssOutputDir != "" {
@@ -267,7 +257,9 @@ func copyImageToClipboard(buf *screenshot.ShmBuffer, format screenshot.Format, q
 		}
 	}
 
-	return clipboard.Copy(data.Bytes(), mimeType)
+	cmd := exec.Command("wl-copy", "--type", mimeType)
+	cmd.Stdin = &data
+	return cmd.Run()
 }
 
 func writeImageToStdout(buf *screenshot.ShmBuffer, format screenshot.Format, quality int, pixelFormat uint32) error {

core/cmd/dms/commands_setup.go

@@ -4,16 +4,12 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/greeter"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/privesc"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -21,7 +17,6 @@ var setupCmd = &cobra.Command{
 	Use:   "setup",
 	Short: "Deploy DMS configurations",
 	Long:  "Deploy compositor and terminal configurations with interactive prompts",
-	PersistentPreRunE: preRunPrivileged,
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := runSetup(); err != nil {
 			log.Fatalf("Error during setup: %v", err)
@@ -29,248 +24,9 @@ var setupCmd = &cobra.Command{
 	},
 }
 
-var setupBindsCmd = &cobra.Command{
-	Use:   "binds",
-	Short: "Deploy default keybinds config",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("binds"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-var setupLayoutCmd = &cobra.Command{
-	Use:   "layout",
-	Short: "Deploy default layout config",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("layout"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-var setupColorsCmd = &cobra.Command{
-	Use:   "colors",
-	Short: "Deploy default colors config",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("colors"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-var setupAlttabCmd = &cobra.Command{
-	Use:   "alttab",
-	Short: "Deploy default alt-tab config (niri only)",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("alttab"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-var setupOutputsCmd = &cobra.Command{
-	Use:   "outputs",
-	Short: "Deploy default outputs config",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("outputs"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-var setupCursorCmd = &cobra.Command{
-	Use:   "cursor",
-	Short: "Deploy default cursor config",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("cursor"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-var setupWindowrulesCmd = &cobra.Command{
-	Use:   "windowrules",
-	Short: "Deploy default window rules config",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := runSetupDmsConfig("windowrules"); err != nil {
-			log.Fatalf("Error: %v", err)
-		}
-	},
-}
-
-type dmsConfigSpec struct {
-	niriFile    string
-	hyprFile    string
-	niriContent func(terminal string) string
-	hyprContent func(terminal string) string
-}
-
-var dmsConfigSpecs = map[string]dmsConfigSpec{
-	"binds": {
-		niriFile: "binds.kdl",
-		hyprFile: "binds.conf",
-		niriContent: func(t string) string {
-			return strings.ReplaceAll(config.NiriBindsConfig, "{{TERMINAL_COMMAND}}", t)
-		},
-		hyprContent: func(t string) string {
-			return strings.ReplaceAll(config.HyprBindsConfig, "{{TERMINAL_COMMAND}}", t)
-		},
-	},
-	"layout": {
-		niriFile:    "layout.kdl",
-		hyprFile:    "layout.conf",
-		niriContent: func(_ string) string { return config.NiriLayoutConfig },
-		hyprContent: func(_ string) string { return config.HyprLayoutConfig },
-	},
-	"colors": {
-		niriFile:    "colors.kdl",
-		hyprFile:    "colors.conf",
-		niriContent: func(_ string) string { return config.NiriColorsConfig },
-		hyprContent: func(_ string) string { return config.HyprColorsConfig },
-	},
-	"alttab": {
-		niriFile:    "alttab.kdl",
-		niriContent: func(_ string) string { return config.NiriAlttabConfig },
-	},
-	"outputs": {
-		niriFile:    "outputs.kdl",
-		hyprFile:    "outputs.conf",
-		niriContent: func(_ string) string { return "" },
-		hyprContent: func(_ string) string { return "" },
-	},
-	"cursor": {
-		niriFile:    "cursor.kdl",
-		hyprFile:    "cursor.conf",
-		niriContent: func(_ string) string { return "" },
-		hyprContent: func(_ string) string { return "" },
-	},
-	"windowrules": {
-		niriFile:    "windowrules.kdl",
-		hyprFile:    "windowrules.conf",
-		niriContent: func(_ string) string { return "" },
-		hyprContent: func(_ string) string { return "" },
-	},
-}
-
-func detectTerminal() (string, error) {
-	terminals := []string{"ghostty", "foot", "kitty", "alacritty"}
-	var found []string
-	for _, t := range terminals {
-		if utils.CommandExists(t) {
-			found = append(found, t)
-		}
-	}
-
-	switch len(found) {
-	case 0:
-		return "ghostty", nil
-	case 1:
-		return found[0], nil
-	}
-
-	fmt.Println("Multiple terminals detected:")
-	for i, t := range found {
-		fmt.Printf("%d) %s\n", i+1, t)
-	}
-	fmt.Printf("\nChoice (1-%d): ", len(found))
-
-	var response string
-	fmt.Scanln(&response)
-	response = strings.TrimSpace(response)
-
-	choice := 0
-	fmt.Sscanf(response, "%d", &choice)
-	if choice < 1 || choice > len(found) {
-		return "", fmt.Errorf("invalid choice")
-	}
-	return found[choice-1], nil
-}
-
-func detectCompositorForSetup() (string, error) {
-	compositors := greeter.DetectCompositors()
-
-	switch len(compositors) {
-	case 0:
-		return "", fmt.Errorf("no supported compositors found (niri or Hyprland required)")
-	case 1:
-		return strings.ToLower(compositors[0]), nil
-	}
-
-	selected, err := greeter.PromptCompositorChoice(compositors)
-	if err != nil {
-		return "", err
-	}
-	return strings.ToLower(selected), nil
-}
-
-func runSetupDmsConfig(name string) error {
-	spec, ok := dmsConfigSpecs[name]
-	if !ok {
-		return fmt.Errorf("unknown config: %s", name)
-	}
-
-	compositor, err := detectCompositorForSetup()
-	if err != nil {
-		return err
-	}
-
-	var filename string
-	var contentFn func(string) string
-	switch compositor {
-	case "niri":
-		filename = spec.niriFile
-		contentFn = spec.niriContent
-	case "hyprland":
-		filename = spec.hyprFile
-		contentFn = spec.hyprContent
-	default:
-		return fmt.Errorf("unsupported compositor: %s", compositor)
-	}
-
-	if filename == "" {
-		return fmt.Errorf("%s is not supported for %s", name, compositor)
-	}
-
-	var dmsDir string
-	switch compositor {
-	case "niri":
-		dmsDir = filepath.Join(os.Getenv("HOME"), ".config", "niri", "dms")
-	case "hyprland":
-		dmsDir = filepath.Join(os.Getenv("HOME"), ".config", "hypr", "dms")
-	}
-
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		return fmt.Errorf("failed to create dms directory: %w", err)
-	}
-
-	path := filepath.Join(dmsDir, filename)
-	if info, err := os.Stat(path); err == nil && info.Size() > 0 {
-		return fmt.Errorf("%s already exists and is not empty: %s", name, path)
-	}
-
-	terminal := "ghostty"
-	if contentFn != nil && name == "binds" {
-		terminal, err = detectTerminal()
-		if err != nil {
-			return err
-		}
-	}
-
-	content := contentFn(terminal)
-	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
-		return fmt.Errorf("failed to write %s: %w", filename, err)
-	}
-
-	fmt.Printf("Deployed %s to %s\n", name, path)
-	return nil
-}
-
 func runSetup() error {
 	fmt.Println("=== DMS Configuration Setup ===")
 
-	ensureInputGroup()
-
 	wm, wmSelected := promptCompositor()
 	terminal, terminalSelected := promptTerminal()
 	useSystemd := promptSystemd()
@@ -344,37 +100,6 @@ func runSetup() error {
 	return nil
 }
 
-// Add user to the input group for the evdev manager for inut state tracking.
-// Caps Lock OSD and the Caps Lock bar indicator.
-func ensureInputGroup() {
-	if !utils.HasGroup("input") {
-		return
-	}
-	currentUser := os.Getenv("USER")
-	if currentUser == "" {
-		currentUser = os.Getenv("LOGNAME")
-	}
-	if currentUser == "" {
-		return
-	}
-	out, err := execGroups(currentUser)
-	if err == nil && strings.Contains(out, "input") {
-		fmt.Printf("✓ %s is already in the input group (Caps Lock OSD enabled)\n", currentUser)
-		return
-	}
-	fmt.Println("Adding user to input group for Caps Lock OSD support...")
-	if err := privesc.Run(context.Background(), "", "usermod", "-aG", "input", currentUser); err != nil {
-		fmt.Printf("⚠ Could not add %s to input group (Caps Lock OSD will be unavailable): %v\n", currentUser, err)
-	} else {
-		fmt.Printf("✓ Added %s to input group (logout/login required to take effect)\n", currentUser)
-	}
-}
-
-func execGroups(user string) (string, error) {
-	out, err := exec.Command("groups", user).Output()
-	return string(out), err
-}
-
 func promptCompositor() (deps.WindowManager, bool) {
 	fmt.Println("Select compositor:")
 	fmt.Println("1) Niri")

core/cmd/dms/commands_system.go

@@ -1,365 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/spf13/cobra"
-)
-
-var systemCmd = &cobra.Command{
-	Use:   "system",
-	Short: "System operations",
-	Long:  "System-level operations (updates, etc.). Runs against installed package managers directly; does not require the DMS server.",
-}
-
-var systemUpdateCmd = &cobra.Command{
-	Use:   "update",
-	Short: "Apply or list system updates",
-	Long: `Apply or list system updates across detected package managers.
-
-Default behavior is to apply available updates after prompting for confirmation.
-Use --check to list updates without applying.
-
-Examples:
-  dms system update --check                  # list available updates
-  dms system update                          # apply updates (interactive prompt)
-  dms system update --noconfirm              # apply updates without prompting
-  dms system update --dry                    # simulate without changing anything
-  dms system update --no-flatpak --noconfirm # apply system updates only
-  dms system update --interval 3600          # set the server poll interval to 1h`,
-	Run: runSystemUpdate,
-}
-
-var (
-	sysUpdateCheck      bool
-	sysUpdateNoConfirm  bool
-	sysUpdateDry        bool
-	sysUpdateJSON       bool
-	sysUpdateNoFlatpak  bool
-	sysUpdateNoAUR      bool
-	sysUpdateIntervalS  int
-	sysUpdateListPmTime = 5 * time.Minute
-)
-
-func init() {
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateCheck, "check", false, "List available updates without applying")
-	systemUpdateCmd.Flags().BoolVarP(&sysUpdateNoConfirm, "noconfirm", "y", false, "Apply updates without prompting")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateDry, "dry", false, "Simulate the upgrade without applying changes")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateJSON, "json", false, "Output as JSON (with --check)")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateNoFlatpak, "no-flatpak", false, "Skip the Flatpak overlay")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateNoAUR, "no-aur", false, "Skip the AUR (paru/yay only)")
-	systemUpdateCmd.Flags().IntVar(&sysUpdateIntervalS, "interval", -1, "Set the DMS server poll interval in seconds and exit (requires running server)")
-
-	systemCmd.AddCommand(systemUpdateCmd)
-}
-
-func runSystemUpdate(cmd *cobra.Command, args []string) {
-	switch {
-	case sysUpdateIntervalS >= 0:
-		runSystemUpdateSetInterval(sysUpdateIntervalS)
-	case sysUpdateCheck:
-		runSystemUpdateCheck()
-	default:
-		runSystemUpdateApply()
-	}
-}
-
-func selectBackends(ctx context.Context) []sysupdate.Backend {
-	sel := sysupdate.Select(ctx)
-	backends := sel.All()
-	if !sysUpdateNoFlatpak {
-		return backends
-	}
-	out := backends[:0]
-	for _, b := range backends {
-		if b.Repo() == sysupdate.RepoFlatpak {
-			continue
-		}
-		out = append(out, b)
-	}
-	return out
-}
-
-func runSystemUpdateCheck() {
-	ctx, cancel := context.WithTimeout(context.Background(), sysUpdateListPmTime)
-	defer cancel()
-
-	backends := selectBackends(ctx)
-	if len(backends) == 0 {
-		log.Fatal("No supported package manager found")
-	}
-
-	stopSpin := startSpinner("Checking for updates… ")
-	allPkgs, firstErr := collectUpdates(ctx, backends)
-	stopSpin()
-	allPkgs = filterUpdateTargets(allPkgs)
-
-	if sysUpdateJSON {
-		out, _ := json.MarshalIndent(map[string]any{
-			"backends": backendResults(backends, allPkgs),
-			"packages": allPkgs,
-			"error":    errOrEmpty(firstErr),
-			"count":    len(allPkgs),
-		}, "", "  ")
-		fmt.Println(string(out))
-		return
-	}
-
-	printBackends(backends)
-	fmt.Printf("Updates: %d\n", len(allPkgs))
-	if firstErr != nil {
-		fmt.Printf("Error:   %v\n", firstErr)
-	}
-	if len(allPkgs) == 0 {
-		return
-	}
-	fmt.Println()
-	for _, p := range allPkgs {
-		printPackage(p)
-	}
-}
-
-type backendResult struct {
-	ID       string              `json:"id"`
-	Display  string              `json:"displayName"`
-	Packages []sysupdate.Package `json:"packages"`
-}
-
-func backendResults(backends []sysupdate.Backend, pkgs []sysupdate.Package) []backendResult {
-	results := make([]backendResult, 0, len(backends))
-	for _, b := range backends {
-		var backendPkgs []sysupdate.Package
-		for _, p := range pkgs {
-			if sysupdate.BackendHasTargets(b, []sysupdate.Package{p}, true, true) {
-				backendPkgs = append(backendPkgs, p)
-			}
-		}
-		results = append(results, backendResult{ID: b.ID(), Display: b.DisplayName(), Packages: backendPkgs})
-	}
-	return results
-}
-
-func runSystemUpdateApply() {
-	checkCtx, checkCancel := context.WithTimeout(context.Background(), sysUpdateListPmTime)
-	defer checkCancel()
-
-	backends := selectBackends(checkCtx)
-	if len(backends) == 0 {
-		log.Fatal("No supported package manager found")
-	}
-
-	stopSpin := startSpinner("Checking for updates…")
-	pkgs, firstErr := collectUpdates(checkCtx, backends)
-	stopSpin()
-	pkgs = filterUpdateTargets(pkgs)
-	if firstErr != nil {
-		fmt.Printf("Warning: %v\n\n", firstErr)
-	}
-
-	printBackends(backends)
-	fmt.Printf("Updates: %d\n", len(pkgs))
-	if len(pkgs) == 0 {
-		fmt.Println("Nothing to upgrade.")
-		return
-	}
-	fmt.Println()
-	for _, p := range pkgs {
-		printPackage(p)
-	}
-	fmt.Println()
-
-	if !sysUpdateNoConfirm && !sysUpdateDry {
-		if !promptYesNo("Proceed with upgrade? [Y/n]: ") {
-			fmt.Println("Aborted.")
-			return
-		}
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
-	defer cancel()
-
-	opts := sysupdate.UpgradeOptions{
-		Targets:        pkgs,
-		IncludeFlatpak: !sysUpdateNoFlatpak,
-		IncludeAUR:     !sysUpdateNoAUR,
-		DryRun:         sysUpdateDry,
-		UseSudo:        true,
-	}
-	opts.AttachStdio = sysupdate.UpgradeNeedsPrivilege(backends, pkgs, opts)
-
-	onLine := func(line string) { fmt.Println(line) }
-	ran := false
-	for _, b := range backends {
-		if !sysupdate.BackendHasTargets(b, pkgs, opts.IncludeAUR, opts.IncludeFlatpak) {
-			continue
-		}
-		ran = true
-		fmt.Printf("\n== %s ==\n", b.DisplayName())
-		if err := b.Upgrade(ctx, opts, onLine); err != nil {
-			log.Fatalf("%s upgrade failed: %v", b.ID(), err)
-		}
-	}
-	if !ran {
-		fmt.Println("Nothing to upgrade.")
-		return
-	}
-	if sysUpdateDry {
-		fmt.Println("\nDry run complete (no changes applied).")
-		return
-	}
-	fmt.Println("\nUpgrade complete.")
-}
-
-func collectUpdates(ctx context.Context, backends []sysupdate.Backend) ([]sysupdate.Package, error) {
-	var all []sysupdate.Package
-	var firstErr error
-	for _, b := range backends {
-		pkgs, err := b.CheckUpdates(ctx)
-		if err != nil && firstErr == nil {
-			firstErr = fmt.Errorf("%s: %w", b.ID(), err)
-		}
-		all = append(all, pkgs...)
-	}
-	return all, firstErr
-}
-
-func filterUpdateTargets(pkgs []sysupdate.Package) []sysupdate.Package {
-	if !sysUpdateNoAUR {
-		return pkgs
-	}
-	out := pkgs[:0]
-	for _, p := range pkgs {
-		if p.Repo == sysupdate.RepoAUR {
-			continue
-		}
-		out = append(out, p)
-	}
-	return out
-}
-
-func runSystemUpdateSetInterval(seconds int) {
-	resp, err := sendServerRequest(models.Request{
-		ID:     1,
-		Method: "sysupdate.setInterval",
-		Params: map[string]any{"seconds": float64(seconds)},
-	})
-	if err != nil {
-		log.Fatalf("Failed: %v (is dms server running?)", err)
-	}
-	if resp.Error != "" {
-		log.Fatalf("Error: %s", resp.Error)
-	}
-	fmt.Printf("Interval set to %d seconds.\n", seconds)
-}
-
-func promptYesNo(prompt string) bool {
-	if !stdinIsTTY() {
-		log.Fatal("Refusing to apply updates non-interactively. Re-run with --noconfirm or --check.")
-	}
-	fmt.Print(prompt)
-	reader := bufio.NewReader(os.Stdin)
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		return false
-	}
-	switch strings.ToLower(strings.TrimSpace(line)) {
-	case "n", "no":
-		return false
-	default:
-		return true
-	}
-}
-
-func printBackends(backends []sysupdate.Backend) {
-	if len(backends) == 0 {
-		return
-	}
-	names := make([]string, 0, len(backends))
-	for _, b := range backends {
-		names = append(names, b.DisplayName())
-	}
-	fmt.Printf("Backends: %s\n", strings.Join(names, ", "))
-}
-
-func stdinIsTTY() bool {
-	fi, err := os.Stdin.Stat()
-	if err != nil {
-		return false
-	}
-	return (fi.Mode() & os.ModeCharDevice) != 0
-}
-
-func stdoutIsTTY() bool {
-	fi, err := os.Stdout.Stat()
-	if err != nil {
-		return false
-	}
-	return (fi.Mode() & os.ModeCharDevice) != 0
-}
-
-// startSpinner prints an animated spinner to stdout for progress indication
-func startSpinner(msg string) func() {
-	if !stdoutIsTTY() {
-		return func() {}
-	}
-	frames := []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}
-	done := make(chan struct{})
-	go func() {
-		for i := 0; ; i++ {
-			select {
-			case <-done:
-				fmt.Print("\r\033[K")
-				return
-			case <-time.After(80 * time.Millisecond):
-				fmt.Printf("\r%s %s", frames[i%len(frames)], msg)
-			}
-		}
-	}()
-	return func() { close(done) }
-}
-
-var (
-	styleRepo  = lipgloss.NewStyle().Foreground(lipgloss.Color("244")).Bold(false)
-	styleName  = lipgloss.NewStyle().Foreground(lipgloss.Color("39")).Bold(true)
-	styleFrom  = lipgloss.NewStyle().Foreground(lipgloss.Color("243"))
-	styleArrow = lipgloss.NewStyle().Foreground(lipgloss.Color("244"))
-	styleTo    = lipgloss.NewStyle().Foreground(lipgloss.Color("76")).Bold(true)
-)
-
-func printPackage(p sysupdate.Package) {
-	if !stdoutIsTTY() {
-		fmt.Printf("  [%s] %s  %s -> %s\n", p.Repo, p.Name, defaultIfEmpty(p.FromVersion, "?"), defaultIfEmpty(p.ToVersion, "?"))
-		return
-	}
-	fmt.Printf("  %s %s  %s %s %s\n",
-		styleRepo.Render("["+string(p.Repo)+"]"),
-		styleName.Render(p.Name),
-		styleFrom.Render(defaultIfEmpty(p.FromVersion, "?")),
-		styleArrow.Render("->"),
-		styleTo.Render(defaultIfEmpty(p.ToVersion, "?")),
-	)
-}
-
-func errOrEmpty(err error) string {
-	if err == nil {
-		return ""
-	}
-	return err.Error()
-}
-
-func defaultIfEmpty(s, def string) string {
-	if s == "" {
-		return def
-	}
-	return s
-}

core/cmd/dms/commands_trash.go

@@ -1,122 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/trash"
-	"github.com/spf13/cobra"
-)
-
-var trashCmd = &cobra.Command{
-	Use:   "trash",
-	Short: "Manage the user's trash (XDG Trash spec 1.0)",
-}
-
-var trashPutCmd = &cobra.Command{
-	Use:   "put <path...>",
-	Short: "Move files or directories into the trash",
-	Args:  cobra.MinimumNArgs(1),
-	Run:   runTrashPut,
-}
-
-var trashListCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List trashed items across all known trash directories",
-	Run:   runTrashList,
-}
-
-var trashCountCmd = &cobra.Command{
-	Use:   "count",
-	Short: "Print the total number of trashed items",
-	Run:   runTrashCount,
-}
-
-var trashEmptyCmd = &cobra.Command{
-	Use:   "empty",
-	Short: "Permanently delete every trashed item",
-	Run:   runTrashEmpty,
-}
-
-var trashRestoreCmd = &cobra.Command{
-	Use:   "restore <name>",
-	Short: "Restore a trashed item to its original location",
-	Args:  cobra.ExactArgs(1),
-	Run:   runTrashRestore,
-}
-
-var (
-	trashJSONOutput bool
-	trashRestoreDir string
-)
-
-func init() {
-	trashListCmd.Flags().BoolVar(&trashJSONOutput, "json", false, "Output as JSON")
-	trashRestoreCmd.Flags().StringVar(&trashRestoreDir, "trash-dir", "", "Trash directory containing the item (default: home trash)")
-	trashCmd.AddCommand(trashPutCmd, trashListCmd, trashCountCmd, trashEmptyCmd, trashRestoreCmd)
-}
-
-func runTrashPut(cmd *cobra.Command, args []string) {
-	var failed int
-	for _, p := range args {
-		if _, err := trash.Put(p); err != nil {
-			log.Errorf("trash %s: %v", p, err)
-			failed++
-			continue
-		}
-		fmt.Println(p)
-	}
-	if failed > 0 {
-		os.Exit(1)
-	}
-}
-
-func runTrashList(cmd *cobra.Command, args []string) {
-	entries, err := trash.List()
-	if err != nil {
-		log.Fatalf("list trash: %v", err)
-	}
-
-	if trashJSONOutput {
-		if entries == nil {
-			entries = []trash.Entry{}
-		}
-		out, _ := json.MarshalIndent(entries, "", "  ")
-		fmt.Println(string(out))
-		return
-	}
-
-	if len(entries) == 0 {
-		fmt.Println("Trash is empty")
-		return
-	}
-	for _, e := range entries {
-		marker := "F"
-		if e.IsDir {
-			marker = "D"
-		}
-		fmt.Printf("%s  %s  %s  %s\n", marker, e.DeletionDate, e.Name, e.OriginalPath)
-	}
-}
-
-func runTrashCount(cmd *cobra.Command, args []string) {
-	n, err := trash.Count()
-	if err != nil {
-		log.Fatalf("count trash: %v", err)
-	}
-	fmt.Println(n)
-}
-
-func runTrashEmpty(cmd *cobra.Command, args []string) {
-	if err := trash.Empty(); err != nil {
-		log.Fatalf("empty trash: %v", err)
-	}
-}
-
-func runTrashRestore(cmd *cobra.Command, args []string) {
-	if err := trash.Restore(args[0], trashRestoreDir); err != nil {
-		log.Fatalf("restore: %v", err)
-	}
-}

core/cmd/dms/commands_windowrules.go

@@ -1,338 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules/providers"
-	"github.com/spf13/cobra"
-)
-
-var windowrulesCmd = &cobra.Command{
-	Use:   "windowrules",
-	Short: "Manage window rules",
-}
-
-var windowrulesListCmd = &cobra.Command{
-	Use:   "list [compositor]",
-	Short: "List all window rules",
-	Long:  "List all window rules from compositor config file. Returns JSON with rules and DMS status.",
-	Args:  cobra.MaximumNArgs(1),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		if len(args) == 0 {
-			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	},
-	Run: runWindowrulesList,
-}
-
-var windowrulesAddCmd = &cobra.Command{
-	Use:   "add <compositor> '<json>'",
-	Short: "Add a window rule to DMS file",
-	Long:  "Add a new window rule to the DMS-managed rules file.",
-	Args:  cobra.ExactArgs(2),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		if len(args) == 0 {
-			// ! disabled hyprland return []string{"hyprland", "niri"}, cobra.ShellCompDirectiveNoFileComp
-			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	},
-	Run: runWindowrulesAdd,
-}
-
-var windowrulesUpdateCmd = &cobra.Command{
-	Use:   "update <compositor> <id> '<json>'",
-	Short: "Update a window rule in DMS file",
-	Long:  "Update an existing window rule in the DMS-managed rules file.",
-	Args:  cobra.ExactArgs(3),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		if len(args) == 0 {
-			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	},
-	Run: runWindowrulesUpdate,
-}
-
-var windowrulesRemoveCmd = &cobra.Command{
-	Use:   "remove <compositor> <id>",
-	Short: "Remove a window rule from DMS file",
-	Long:  "Remove a window rule from the DMS-managed rules file.",
-	Args:  cobra.ExactArgs(2),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		if len(args) == 0 {
-			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	},
-	Run: runWindowrulesRemove,
-}
-
-var windowrulesReorderCmd = &cobra.Command{
-	Use:   "reorder <compositor> '<json-array-of-ids>'",
-	Short: "Reorder window rules in DMS file",
-	Long:  "Reorder window rules by providing a JSON array of rule IDs in the desired order.",
-	Args:  cobra.ExactArgs(2),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		if len(args) == 0 {
-			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
-		}
-		return nil, cobra.ShellCompDirectiveNoFileComp
-	},
-	Run: runWindowrulesReorder,
-}
-
-func init() {
-	configCmd.AddCommand(windowrulesCmd)
-	windowrulesCmd.AddCommand(windowrulesListCmd)
-	windowrulesCmd.AddCommand(windowrulesAddCmd)
-	windowrulesCmd.AddCommand(windowrulesUpdateCmd)
-	windowrulesCmd.AddCommand(windowrulesRemoveCmd)
-	windowrulesCmd.AddCommand(windowrulesReorderCmd)
-}
-
-type WindowRulesListResult struct {
-	Rules     []windowrules.WindowRule    `json:"rules"`
-	DMSStatus *windowrules.DMSRulesStatus `json:"dmsStatus,omitempty"`
-}
-
-type WindowRuleWriteResult struct {
-	Success bool   `json:"success"`
-	ID      string `json:"id,omitempty"`
-	Path    string `json:"path,omitempty"`
-	Error   string `json:"error,omitempty"`
-}
-
-func getCompositor(args []string) string {
-	if len(args) > 0 {
-		return strings.ToLower(args[0])
-	}
-	if os.Getenv("NIRI_SOCKET") != "" {
-		return "niri"
-	}
-	// if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
-	// 	return "hyprland"
-	// }
-	return ""
-}
-
-func writeRuleError(errMsg string) {
-	result := WindowRuleWriteResult{Success: false, Error: errMsg}
-	output, _ := json.Marshal(result)
-	fmt.Fprintln(os.Stdout, string(output))
-	os.Exit(1)
-}
-
-func writeRuleSuccess(id, path string) {
-	result := WindowRuleWriteResult{Success: true, ID: id, Path: path}
-	output, _ := json.Marshal(result)
-	fmt.Fprintln(os.Stdout, string(output))
-}
-
-func runWindowrulesList(cmd *cobra.Command, args []string) {
-	compositor := getCompositor(args)
-	if compositor == "" {
-		log.Fatalf("Could not detect compositor. Please specify: hyprland or niri")
-	}
-
-	var result WindowRulesListResult
-
-	switch compositor {
-	case "niri":
-		configDir, err := utils.ExpandPath("$HOME/.config/niri")
-		if err != nil {
-			log.Fatalf("Failed to expand niri config path: %v", err)
-		}
-
-		parseResult, err := providers.ParseNiriWindowRules(configDir)
-		if err != nil {
-			log.Fatalf("Failed to parse niri window rules: %v", err)
-		}
-
-		allRules := providers.ConvertNiriRulesToWindowRules(parseResult.Rules)
-
-		provider := providers.NewNiriWritableProvider(configDir)
-		dmsRulesPath := provider.GetOverridePath()
-		dmsRules, _ := provider.LoadDMSRules()
-
-		dmsRuleMap := make(map[int]windowrules.WindowRule)
-		for i, dr := range dmsRules {
-			dmsRuleMap[i] = dr
-		}
-
-		dmsIdx := 0
-		for i, r := range allRules {
-			if r.Source == dmsRulesPath {
-				if dmr, ok := dmsRuleMap[dmsIdx]; ok {
-					allRules[i].ID = dmr.ID
-					allRules[i].Name = dmr.Name
-				}
-				dmsIdx++
-			}
-		}
-
-		result.Rules = allRules
-		result.DMSStatus = parseResult.DMSStatus
-
-	case "hyprland":
-		log.Fatalf("Hyprland support is currently disabled.") // ! disabled hyprland
-		configDir, err := utils.ExpandPath("$HOME/.config/hypr")
-		if err != nil {
-			log.Fatalf("Failed to expand hyprland config path: %v", err)
-		}
-
-		parseResult, err := providers.ParseHyprlandWindowRules(configDir)
-		if err != nil {
-			log.Fatalf("Failed to parse hyprland window rules: %v", err)
-		}
-
-		allRules := providers.ConvertHyprlandRulesToWindowRules(parseResult.Rules)
-
-		provider := providers.NewHyprlandWritableProvider(configDir)
-		dmsRulesPath := provider.GetOverridePath()
-		dmsRules, _ := provider.LoadDMSRules()
-
-		dmsRuleMap := make(map[int]windowrules.WindowRule)
-		for i, dr := range dmsRules {
-			dmsRuleMap[i] = dr
-		}
-
-		dmsIdx := 0
-		for i, r := range allRules {
-			if r.Source == dmsRulesPath {
-				if dmr, ok := dmsRuleMap[dmsIdx]; ok {
-					allRules[i].ID = dmr.ID
-					allRules[i].Name = dmr.Name
-				}
-				dmsIdx++
-			}
-		}
-
-		result.Rules = allRules
-		result.DMSStatus = parseResult.DMSStatus
-
-	default:
-		log.Fatalf("Unknown compositor: %s", compositor)
-	}
-
-	output, _ := json.Marshal(result)
-	fmt.Fprintln(os.Stdout, string(output))
-}
-
-func runWindowrulesAdd(cmd *cobra.Command, args []string) {
-	compositor := strings.ToLower(args[0])
-	ruleJSON := args[1]
-
-	var rule windowrules.WindowRule
-	if err := json.Unmarshal([]byte(ruleJSON), &rule); err != nil {
-		writeRuleError(fmt.Sprintf("Invalid JSON: %v", err))
-	}
-
-	if rule.ID == "" {
-		rule.ID = generateRuleID()
-	}
-	rule.Enabled = true
-
-	provider := getWindowRulesProvider(compositor)
-	if provider == nil {
-		writeRuleError(fmt.Sprintf("Unknown compositor: %s", compositor))
-	}
-
-	if err := provider.SetRule(rule); err != nil {
-		writeRuleError(err.Error())
-	}
-
-	writeRuleSuccess(rule.ID, provider.GetOverridePath())
-}
-
-func runWindowrulesUpdate(cmd *cobra.Command, args []string) {
-	compositor := strings.ToLower(args[0])
-	ruleID := args[1]
-	ruleJSON := args[2]
-
-	var rule windowrules.WindowRule
-	if err := json.Unmarshal([]byte(ruleJSON), &rule); err != nil {
-		writeRuleError(fmt.Sprintf("Invalid JSON: %v", err))
-	}
-
-	rule.ID = ruleID
-
-	provider := getWindowRulesProvider(compositor)
-	if provider == nil {
-		writeRuleError(fmt.Sprintf("Unknown compositor: %s", compositor))
-	}
-
-	if err := provider.SetRule(rule); err != nil {
-		writeRuleError(err.Error())
-	}
-
-	writeRuleSuccess(rule.ID, provider.GetOverridePath())
-}
-
-func runWindowrulesRemove(cmd *cobra.Command, args []string) {
-	compositor := strings.ToLower(args[0])
-	ruleID := args[1]
-
-	provider := getWindowRulesProvider(compositor)
-	if provider == nil {
-		writeRuleError(fmt.Sprintf("Unknown compositor: %s", compositor))
-	}
-
-	if err := provider.RemoveRule(ruleID); err != nil {
-		writeRuleError(err.Error())
-	}
-
-	writeRuleSuccess(ruleID, provider.GetOverridePath())
-}
-
-func runWindowrulesReorder(cmd *cobra.Command, args []string) {
-	compositor := strings.ToLower(args[0])
-	idsJSON := args[1]
-
-	var ids []string
-	if err := json.Unmarshal([]byte(idsJSON), &ids); err != nil {
-		writeRuleError(fmt.Sprintf("Invalid JSON array: %v", err))
-	}
-
-	provider := getWindowRulesProvider(compositor)
-	if provider == nil {
-		writeRuleError(fmt.Sprintf("Unknown compositor: %s", compositor))
-	}
-
-	if err := provider.ReorderRules(ids); err != nil {
-		writeRuleError(err.Error())
-	}
-
-	writeRuleSuccess("", provider.GetOverridePath())
-}
-
-func getWindowRulesProvider(compositor string) windowrules.WritableProvider {
-	switch compositor {
-	case "niri":
-		configDir, err := utils.ExpandPath("$HOME/.config/niri")
-		if err != nil {
-			return nil
-		}
-		return providers.NewNiriWritableProvider(configDir)
-	case "hyprland":
-		configDir, err := utils.ExpandPath("$HOME/.config/hypr")
-		if err != nil {
-			return nil
-		}
-		return providers.NewHyprlandWritableProvider(configDir)
-	default:
-		return nil
-	}
-}
-
-func generateRuleID() string {
-	return fmt.Sprintf("wr_%d", time.Now().UnixNano())
-}

core/cmd/dms/dpms_client.go

@@ -87,14 +87,20 @@ func newDPMSClient() (*dpmsClient, error) {
 		switch e.Interface {
 		case wlr_output_power.ZwlrOutputPowerManagerV1InterfaceName:
 			powerMgr := wlr_output_power.NewZwlrOutputPowerManagerV1(c.ctx)
-			version := min(e.Version, 1)
+			version := e.Version
+			if version > 1 {
+				version = 1
+			}
 			if err := registry.Bind(e.Name, e.Interface, version, powerMgr); err == nil {
 				c.powerMgr = powerMgr
 			}
 
 		case "wl_output":
 			output := wlclient.NewOutput(c.ctx)
-			version := min(e.Version, 4)
+			version := e.Version
+			if version > 4 {
+				version = 4
+			}
 			if err := registry.Bind(e.Name, e.Interface, version, output); err == nil {
 				outputID := fmt.Sprintf("output-%d", output.ID())
 				state := &outputState{

core/cmd/dms/immutable_policy.go

@@ -1,285 +0,0 @@
-package main
-
-import (
-	"bufio"
-	_ "embed"
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/privesc"
-	"github.com/spf13/cobra"
-)
-
-const (
-	cliPolicyPackagedPath = "/usr/share/dms/cli-policy.json"
-	cliPolicyAdminPath    = "/etc/dms/cli-policy.json"
-)
-
-var (
-	immutablePolicyOnce sync.Once
-	immutablePolicy     immutableCommandPolicy
-	immutablePolicyErr  error
-)
-
-//go:embed assets/cli-policy.default.json
-var defaultCLIPolicyJSON []byte
-
-type immutableCommandPolicy struct {
-	ImmutableSystem bool
-	ImmutableReason string
-	BlockedCommands []string
-	Message         string
-}
-
-type cliPolicyFile struct {
-	PolicyVersion   int       `json:"policy_version"`
-	ImmutableSystem *bool     `json:"immutable_system"`
-	BlockedCommands *[]string `json:"blocked_commands"`
-	Message         *string   `json:"message"`
-}
-
-func normalizeCommandSpec(raw string) string {
-	normalized := strings.ToLower(strings.TrimSpace(raw))
-	normalized = strings.TrimPrefix(normalized, "dms ")
-	return strings.Join(strings.Fields(normalized), " ")
-}
-
-func normalizeBlockedCommands(raw []string) []string {
-	normalized := make([]string, 0, len(raw))
-	seen := make(map[string]bool)
-
-	for _, cmd := range raw {
-		spec := normalizeCommandSpec(cmd)
-		if spec == "" || seen[spec] {
-			continue
-		}
-		seen[spec] = true
-		normalized = append(normalized, spec)
-	}
-
-	return normalized
-}
-
-func commandBlockedByPolicy(commandPath string, blocked []string) bool {
-	normalizedPath := normalizeCommandSpec(commandPath)
-	if normalizedPath == "" {
-		return false
-	}
-
-	for _, entry := range blocked {
-		spec := normalizeCommandSpec(entry)
-		if spec == "" {
-			continue
-		}
-		if normalizedPath == spec || strings.HasPrefix(normalizedPath, spec+" ") {
-			return true
-		}
-	}
-
-	return false
-}
-
-func loadPolicyFile(path string) (*cliPolicyFile, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("failed to read %s: %w", path, err)
-	}
-
-	var policy cliPolicyFile
-	if err := json.Unmarshal(data, &policy); err != nil {
-		return nil, fmt.Errorf("failed to parse %s: %w", path, err)
-	}
-
-	return &policy, nil
-}
-
-func mergePolicyFile(base *immutableCommandPolicy, path string) error {
-	policyFile, err := loadPolicyFile(path)
-	if err != nil {
-		return err
-	}
-	if policyFile == nil {
-		return nil
-	}
-
-	if policyFile.ImmutableSystem != nil {
-		base.ImmutableSystem = *policyFile.ImmutableSystem
-	}
-	if policyFile.BlockedCommands != nil {
-		base.BlockedCommands = normalizeBlockedCommands(*policyFile.BlockedCommands)
-	}
-	if policyFile.Message != nil {
-		msg := strings.TrimSpace(*policyFile.Message)
-		if msg != "" {
-			base.Message = msg
-		}
-	}
-
-	return nil
-}
-
-func readOSReleaseMap(path string) map[string]string {
-	values := make(map[string]string)
-
-	file, err := os.Open(path)
-	if err != nil {
-		return values
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		if line == "" || strings.HasPrefix(line, "#") {
-			continue
-		}
-		parts := strings.SplitN(line, "=", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		key := strings.ToUpper(strings.TrimSpace(parts[0]))
-		value := strings.Trim(strings.TrimSpace(parts[1]), "\"")
-		values[key] = strings.ToLower(value)
-	}
-
-	return values
-}
-
-func hasAnyToken(text string, tokens ...string) bool {
-	if text == "" {
-		return false
-	}
-	for _, token := range tokens {
-		if strings.Contains(text, token) {
-			return true
-		}
-	}
-	return false
-}
-
-func detectImmutableSystem() (bool, string) {
-	if _, err := os.Stat("/run/ostree-booted"); err == nil {
-		return true, "/run/ostree-booted is present"
-	}
-
-	osRelease := readOSReleaseMap("/etc/os-release")
-	if len(osRelease) == 0 {
-		return false, ""
-	}
-
-	id := osRelease["ID"]
-	idLike := osRelease["ID_LIKE"]
-	variantID := osRelease["VARIANT_ID"]
-	name := osRelease["NAME"]
-	prettyName := osRelease["PRETTY_NAME"]
-
-	immutableIDs := map[string]bool{
-		"bluefin":       true,
-		"bazzite":       true,
-		"silverblue":    true,
-		"kinoite":       true,
-		"sericea":       true,
-		"onyx":          true,
-		"aurora":        true,
-		"fedora-iot":    true,
-		"fedora-coreos": true,
-	}
-	if immutableIDs[id] {
-		return true, "os-release ID=" + id
-	}
-
-	markers := []string{"silverblue", "kinoite", "sericea", "onyx", "bazzite", "bluefin", "aurora", "ostree", "atomic"}
-	if hasAnyToken(variantID, markers...) {
-		return true, "os-release VARIANT_ID=" + variantID
-	}
-	if hasAnyToken(idLike, "ostree", "rpm-ostree") {
-		return true, "os-release ID_LIKE=" + idLike
-	}
-	if hasAnyToken(name, markers...) || hasAnyToken(prettyName, markers...) {
-		return true, "os-release identifies an atomic/ostree variant"
-	}
-
-	return false, ""
-}
-
-func getImmutablePolicy() (*immutableCommandPolicy, error) {
-	immutablePolicyOnce.Do(func() {
-		detectedImmutable, reason := detectImmutableSystem()
-		immutablePolicy = immutableCommandPolicy{
-			ImmutableSystem: detectedImmutable,
-			ImmutableReason: reason,
-			BlockedCommands: []string{"greeter install", "greeter enable", "setup"},
-			Message:         "This command is disabled on immutable/image-based systems. Use your distro-native workflow for system-level changes.",
-		}
-
-		var defaultPolicy cliPolicyFile
-		if err := json.Unmarshal(defaultCLIPolicyJSON, &defaultPolicy); err != nil {
-			immutablePolicyErr = fmt.Errorf("failed to parse embedded default CLI policy: %w", err)
-			return
-		}
-		if defaultPolicy.BlockedCommands != nil {
-			immutablePolicy.BlockedCommands = normalizeBlockedCommands(*defaultPolicy.BlockedCommands)
-		}
-		if defaultPolicy.Message != nil {
-			msg := strings.TrimSpace(*defaultPolicy.Message)
-			if msg != "" {
-				immutablePolicy.Message = msg
-			}
-		}
-
-		if err := mergePolicyFile(&immutablePolicy, cliPolicyPackagedPath); err != nil {
-			immutablePolicyErr = err
-			return
-		}
-		if err := mergePolicyFile(&immutablePolicy, cliPolicyAdminPath); err != nil {
-			immutablePolicyErr = err
-			return
-		}
-	})
-
-	if immutablePolicyErr != nil {
-		return nil, immutablePolicyErr
-	}
-	return &immutablePolicy, nil
-}
-
-func requireMutableSystemCommand(cmd *cobra.Command, _ []string) error {
-	policy, err := getImmutablePolicy()
-	if err != nil {
-		return err
-	}
-	if !policy.ImmutableSystem {
-		return nil
-	}
-
-	commandPath := normalizeCommandSpec(cmd.CommandPath())
-	if !commandBlockedByPolicy(commandPath, policy.BlockedCommands) {
-		return nil
-	}
-
-	reason := ""
-	if policy.ImmutableReason != "" {
-		reason = "Detected immutable system: " + policy.ImmutableReason + "\n"
-	}
-
-	return fmt.Errorf("%s%s\nCommand: dms %s\nPolicy files:\n  %s\n  %s", reason, policy.Message, commandPath, cliPolicyPackagedPath, cliPolicyAdminPath)
-}
-
-// preRunPrivileged combines the immutable-system check with a privesc tool
-// selection prompt (shown only when multiple tools are available and the
-// $DMS_PRIVESC env var isn't set).
-func preRunPrivileged(cmd *cobra.Command, args []string) error {
-	if err := requireMutableSystemCommand(cmd, args); err != nil {
-		return err
-	}
-	if _, err := privesc.PromptCLI(os.Stdout, os.Stdin); err != nil {
-		return err
-	}
-	return nil
-}

core/cmd/dms/main.go

@@ -5,7 +5,6 @@ package main
 import (
 	"os"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 )
 
@@ -15,27 +14,27 @@ func init() {
 	runCmd.Flags().BoolP("daemon", "d", false, "Run in daemon mode")
 	runCmd.Flags().Bool("daemon-child", false, "Internal flag for daemon child process")
 	runCmd.Flags().Bool("session", false, "Session managed (like as a systemd unit)")
-	runCmd.Flags().String("log-level", "", "Log level: debug, info, warn, error, fatal (overrides DMS_LOG_LEVEL)")
-	runCmd.Flags().String("log-file", "", "Append logs to this file in addition to stderr (overrides DMS_LOG_FILE)")
 	runCmd.Flags().MarkHidden("daemon-child")
 
-	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd, greeterUninstallCmd)
+	// Add subcommands to greeter
-	authCmd.AddCommand(authSyncCmd)
+	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd)
-	setupCmd.AddCommand(setupBindsCmd, setupLayoutCmd, setupColorsCmd, setupAlttabCmd, setupOutputsCmd, setupCursorCmd, setupWindowrulesCmd)
+
+	// Add subcommands to update
 	updateCmd.AddCommand(updateCheckCmd)
+
+	// Add subcommands to plugins
 	pluginsCmd.AddCommand(pluginsBrowseCmd, pluginsListCmd, pluginsInstallCmd, pluginsUninstallCmd, pluginsUpdateCmd)
+
+	// Add common commands to root
 	rootCmd.AddCommand(getCommonCommands()...)
 
-	rootCmd.AddCommand(authCmd)
 	rootCmd.AddCommand(updateCmd)
 
 	rootCmd.SetHelpTemplate(getHelpTemplate())
 }
 
 func main() {
-	clipboard.MaybeServeAndExit()
+	if os.Geteuid() == 0 {
-
-	if os.Geteuid() == 0 && !isReadOnlyCommand(os.Args) {
 		log.Fatal("This program should not be run as root. Exiting.")
 	}
 

core/cmd/dms/main_distro.go

@@ -5,34 +5,33 @@ package main
 import (
 	"os"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 )
 
 var Version = "dev"
 
 func init() {
+	// Add flags
 	runCmd.Flags().BoolP("daemon", "d", false, "Run in daemon mode")
 	runCmd.Flags().Bool("daemon-child", false, "Internal flag for daemon child process")
 	runCmd.Flags().Bool("session", false, "Session managed (like as a systemd unit)")
-	runCmd.Flags().String("log-level", "", "Log level: debug, info, warn, error, fatal (overrides DMS_LOG_LEVEL)")
-	runCmd.Flags().String("log-file", "", "Append logs to this file in addition to stderr (overrides DMS_LOG_FILE)")
 	runCmd.Flags().MarkHidden("daemon-child")
 
-	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd, greeterUninstallCmd)
+	// Add subcommands to greeter
-	authCmd.AddCommand(authSyncCmd)
+	greeterCmd.AddCommand(greeterSyncCmd, greeterEnableCmd, greeterStatusCmd)
-	setupCmd.AddCommand(setupBindsCmd, setupLayoutCmd, setupColorsCmd, setupAlttabCmd, setupOutputsCmd, setupCursorCmd, setupWindowrulesCmd)
+
+	// Add subcommands to plugins
 	pluginsCmd.AddCommand(pluginsBrowseCmd, pluginsListCmd, pluginsInstallCmd, pluginsUninstallCmd, pluginsUpdateCmd)
+
+	// Add common commands to root
 	rootCmd.AddCommand(getCommonCommands()...)
-	rootCmd.AddCommand(authCmd)
 
 	rootCmd.SetHelpTemplate(getHelpTemplate())
 }
 
 func main() {
-	clipboard.MaybeServeAndExit()
+	// Block root
-
+	if os.Geteuid() == 0 {
-	if os.Geteuid() == 0 && !isReadOnlyCommand(os.Args) {
 		log.Fatal("This program should not be run as root. Exiting.")
 	}
 

core/cmd/dms/randr_client.go

@@ -1,172 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management"
-	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-)
-
-type randrOutput struct {
-	Name    string  `json:"name"`
-	Scale   float64 `json:"scale"`
-	Width   int32   `json:"width"`
-	Height  int32   `json:"height"`
-	Refresh int32   `json:"refresh"`
-	Enabled bool    `json:"enabled"`
-}
-
-type randrHead struct {
-	name          string
-	enabled       bool
-	scale         float64
-	currentModeID uint32
-	modeIDs       []uint32
-}
-
-type randrMode struct {
-	width   int32
-	height  int32
-	refresh int32
-}
-
-type randrClient struct {
-	display *wlclient.Display
-	ctx     *wlclient.Context
-	manager *wlr_output_management.ZwlrOutputManagerV1
-	heads   map[uint32]*randrHead
-	modes   map[uint32]*randrMode
-	done    bool
-	err     error
-}
-
-func queryRandr() ([]randrOutput, error) {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect to Wayland: %w", err)
-	}
-
-	c := &randrClient{
-		display: display,
-		ctx:     display.Context(),
-		heads:   make(map[uint32]*randrHead),
-		modes:   make(map[uint32]*randrMode),
-	}
-	defer c.ctx.Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get registry: %w", err)
-	}
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		if e.Interface == wlr_output_management.ZwlrOutputManagerV1InterfaceName {
-			mgr := wlr_output_management.NewZwlrOutputManagerV1(c.ctx)
-			version := min(e.Version, 4)
-
-			mgr.SetHeadHandler(func(e wlr_output_management.ZwlrOutputManagerV1HeadEvent) {
-				c.handleHead(e)
-			})
-
-			mgr.SetDoneHandler(func(e wlr_output_management.ZwlrOutputManagerV1DoneEvent) {
-				c.done = true
-			})
-
-			if err := registry.Bind(e.Name, e.Interface, version, mgr); err == nil {
-				c.manager = mgr
-			}
-		}
-	})
-
-	// First roundtrip: discover globals and bind manager
-	syncCallback, err := display.Sync()
-	if err != nil {
-		return nil, fmt.Errorf("failed to sync display: %w", err)
-	}
-	syncCallback.SetDoneHandler(func(e wlclient.CallbackDoneEvent) {
-		if c.manager == nil {
-			c.err = fmt.Errorf("zwlr_output_manager_v1 protocol not supported by compositor")
-			c.done = true
-		}
-		// Otherwise wait for manager's DoneHandler
-	})
-
-	for !c.done {
-		if err := c.ctx.Dispatch(); err != nil {
-			return nil, fmt.Errorf("dispatch error: %w", err)
-		}
-	}
-
-	if c.err != nil {
-		return nil, c.err
-	}
-
-	return c.buildOutputs(), nil
-}
-
-func (c *randrClient) handleHead(e wlr_output_management.ZwlrOutputManagerV1HeadEvent) {
-	handle := e.Head
-	headID := handle.ID()
-
-	head := &randrHead{
-		modeIDs: make([]uint32, 0),
-	}
-	c.heads[headID] = head
-
-	handle.SetNameHandler(func(e wlr_output_management.ZwlrOutputHeadV1NameEvent) {
-		head.name = e.Name
-	})
-
-	handle.SetEnabledHandler(func(e wlr_output_management.ZwlrOutputHeadV1EnabledEvent) {
-		head.enabled = e.Enabled != 0
-	})
-
-	handle.SetScaleHandler(func(e wlr_output_management.ZwlrOutputHeadV1ScaleEvent) {
-		head.scale = e.Scale
-	})
-
-	handle.SetCurrentModeHandler(func(e wlr_output_management.ZwlrOutputHeadV1CurrentModeEvent) {
-		head.currentModeID = e.Mode.ID()
-	})
-
-	handle.SetModeHandler(func(e wlr_output_management.ZwlrOutputHeadV1ModeEvent) {
-		modeHandle := e.Mode
-		modeID := modeHandle.ID()
-
-		head.modeIDs = append(head.modeIDs, modeID)
-
-		mode := &randrMode{}
-		c.modes[modeID] = mode
-
-		modeHandle.SetSizeHandler(func(e wlr_output_management.ZwlrOutputModeV1SizeEvent) {
-			mode.width = e.Width
-			mode.height = e.Height
-		})
-
-		modeHandle.SetRefreshHandler(func(e wlr_output_management.ZwlrOutputModeV1RefreshEvent) {
-			mode.refresh = e.Refresh
-		})
-	})
-}
-
-func (c *randrClient) buildOutputs() []randrOutput {
-	outputs := make([]randrOutput, 0, len(c.heads))
-
-	for _, head := range c.heads {
-		out := randrOutput{
-			Name:    head.name,
-			Scale:   head.scale,
-			Enabled: head.enabled,
-		}
-
-		if mode, ok := c.modes[head.currentModeID]; ok {
-			out.Width = mode.width
-			out.Height = mode.height
-			out.Refresh = mode.refresh
-		}
-
-		outputs = append(outputs, out)
-	}
-
-	return outputs
-}

core/cmd/dms/server_client.go

@@ -1,114 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-)
-
-func sendServerRequest(req models.Request) (*models.Response[any], error) {
-	socketPath := getServerSocketPath()
-
-	conn, err := net.Dial("unix", socketPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect to server (is it running?): %w", err)
-	}
-	defer conn.Close()
-
-	scanner := bufio.NewScanner(conn)
-	scanner.Scan() // discard initial capabilities message
-
-	reqData, err := json.Marshal(req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal request: %w", err)
-	}
-
-	if _, err := conn.Write(reqData); err != nil {
-		return nil, fmt.Errorf("failed to write request: %w", err)
-	}
-
-	if _, err := conn.Write([]byte("\n")); err != nil {
-		return nil, fmt.Errorf("failed to write newline: %w", err)
-	}
-
-	if !scanner.Scan() {
-		return nil, fmt.Errorf("failed to read response")
-	}
-
-	var resp models.Response[any]
-	if err := json.Unmarshal(scanner.Bytes(), &resp); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal response: %w", err)
-	}
-
-	return &resp, nil
-}
-
-// sendServerRequestFireAndForget sends a request without waiting for a response.
-// Useful for commands that trigger UI or async operations.
-func sendServerRequestFireAndForget(req models.Request) error {
-	socketPath := getServerSocketPath()
-
-	conn, err := net.Dial("unix", socketPath)
-	if err != nil {
-		return fmt.Errorf("failed to connect to server (is it running?): %w", err)
-	}
-	defer conn.Close()
-
-	scanner := bufio.NewScanner(conn)
-	scanner.Scan() // discard initial capabilities message
-
-	reqData, err := json.Marshal(req)
-	if err != nil {
-		return fmt.Errorf("failed to marshal request: %w", err)
-	}
-
-	if _, err := conn.Write(reqData); err != nil {
-		return fmt.Errorf("failed to write request: %w", err)
-	}
-
-	if _, err := conn.Write([]byte("\n")); err != nil {
-		return fmt.Errorf("failed to write newline: %w", err)
-	}
-
-	return nil
-}
-
-// tryServerRequest attempts to send a request but returns false if server unavailable.
-// Does not log errors - caller can decide what to do on failure.
-func tryServerRequest(req models.Request) (*models.Response[any], bool) {
-	resp, err := sendServerRequest(req)
-	if err != nil {
-		return nil, false
-	}
-	return resp, true
-}
-
-func getServerSocketPath() string {
-	runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
-	if runtimeDir == "" {
-		runtimeDir = os.TempDir()
-	}
-
-	entries, err := os.ReadDir(runtimeDir)
-	if err != nil {
-		return filepath.Join(runtimeDir, "danklinux.sock")
-	}
-
-	for _, entry := range entries {
-		name := entry.Name()
-		if name == "danklinux.sock" {
-			return filepath.Join(runtimeDir, name)
-		}
-		if len(name) > 10 && name[:10] == "danklinux-" && filepath.Ext(name) == ".sock" {
-			return filepath.Join(runtimeDir, name)
-		}
-	}
-
-	return server.GetSocketPath()
-}

core/cmd/dms/shell.go

@@ -7,10 +7,8 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
-	"slices"
 	"strconv"
 	"strings"
-	"sync"
 	"syscall"
 	"time"
 
@@ -20,25 +18,6 @@ import (
 
 type ipcTargets map[string]map[string][]string
 
-// getProcessExitCode returns the exit code from a ProcessState.
-// For normal exits, returns the exit code directly.
-// For signal termination, returns 128 + signal number (Unix convention).
-func getProcessExitCode(state *os.ProcessState) int {
-	if state == nil {
-		return 1
-	}
-	if code := state.ExitCode(); code != -1 {
-		return code
-	}
-	// Process was killed by signal - extract signal number
-	if status, ok := state.Sys().(syscall.WaitStatus); ok {
-		if status.Signaled() {
-			return 128 + int(status.Signal())
-		}
-	}
-	return 1
-}
-
 var isSessionManaged bool
 
 func execDetachedRestart(targetPID int) {
@@ -80,16 +59,6 @@ func getRuntimeDir() string {
 	return os.TempDir()
 }
 
-func appendLogEnv(env []string) []string {
-	if v := os.Getenv("DMS_LOG_LEVEL"); v != "" {
-		env = append(env, "DMS_LOG_LEVEL="+v)
-	}
-	if v := os.Getenv("DMS_LOG_FILE"); v != "" {
-		env = append(env, "DMS_LOG_FILE="+v)
-	}
-	return env
-}
-
 func hasSystemdRun() bool {
 	_, err := exec.LookPath("systemd-run")
 	return err == nil
@@ -196,11 +165,9 @@ func runShellInteractive(session bool) {
 
 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
 	cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
-	if os.Getenv("QT_LOGGING_RULES") == "" {
 	if qtRules := log.GetQtLoggingRules(); qtRules != "" {
 		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
 	}
-	}
 
 	if isSessionManaged && hasSystemdRun() {
 		cmd.Env = append(cmd.Env, "DMS_DEFAULT_LAUNCH_PREFIX=systemd-run --user --scope")
@@ -213,18 +180,6 @@ func runShellInteractive(session bool) {
 		}
 	}
 
-	if os.Getenv("QT_QPA_PLATFORMTHEME") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORMTHEME_QT6") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME_QT6=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORM") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland;xcb")
-	}
-
-	cmd.Env = appendLogEnv(cmd.Env)
-
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -259,28 +214,14 @@ func runShellInteractive(session bool) {
 	for {
 		select {
 		case sig := <-sigChan:
-			if sig == syscall.SIGUSR1 {
+			// Handle SIGUSR1 restart for non-session managed processes
-				if isSessionManaged {
+			if sig == syscall.SIGUSR1 && !isSessionManaged {
-					log.Infof("Received SIGUSR1, exiting for systemd restart...")
-					cancel()
-					cmd.Process.Signal(syscall.SIGTERM)
-					os.Remove(socketPath)
-					os.Exit(1)
-				}
 				log.Infof("Received SIGUSR1, spawning detached restart process...")
 				execDetachedRestart(os.Getpid())
+				// Exit immediately to avoid race conditions with detached restart
 				return
 			}
 
-			// Check if qs already crashed before we got SIGTERM (systemd sends SIGTERM when D-Bus name is released)
-			select {
-			case <-errChan:
-				cancel()
-				os.Remove(socketPath)
-				os.Exit(getProcessExitCode(cmd.ProcessState))
-			case <-time.After(500 * time.Millisecond):
-			}
-
 			log.Infof("\nReceived signal %v, shutting down...", sig)
 			cancel()
 			cmd.Process.Signal(syscall.SIGTERM)
@@ -294,7 +235,7 @@ func runShellInteractive(session bool) {
 				cmd.Process.Signal(syscall.SIGTERM)
 			}
 			os.Remove(socketPath)
-			os.Exit(getProcessExitCode(cmd.ProcessState))
+			os.Exit(1)
 		}
 	}
 }
@@ -387,7 +328,13 @@ func killShell() {
 
 func runShellDaemon(session bool) {
 	isSessionManaged = session
-	isDaemonChild := slices.Contains(os.Args, "--daemon-child")
+	isDaemonChild := false
+	for _, arg := range os.Args {
+		if arg == "--daemon-child" {
+			isDaemonChild = true
+			break
+		}
+	}
 
 	if !isDaemonChild {
 		fmt.Fprintf(os.Stderr, "dms %s\n", Version)
@@ -438,14 +385,9 @@ func runShellDaemon(session bool) {
 
 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
 	cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
-	if os.Getenv("QT_LOGGING_RULES") == "" {
 	if qtRules := log.GetQtLoggingRules(); qtRules != "" {
 		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
 	}
-	}
-
-	// ! TODO - remove when QS 0.3 is up and we can use the pragma
-	cmd.Env = append(cmd.Env, "QS_APP_ID=com.danklinux.dms")
 
 	if isSessionManaged && hasSystemdRun() {
 		cmd.Env = append(cmd.Env, "DMS_DEFAULT_LAUNCH_PREFIX=systemd-run --user --scope")
@@ -458,18 +400,6 @@ func runShellDaemon(session bool) {
 		}
 	}
 
-	if os.Getenv("QT_QPA_PLATFORMTHEME") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORMTHEME_QT6") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME_QT6=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORM") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland;xcb")
-	}
-
-	cmd.Env = appendLogEnv(cmd.Env)
-
 	devNull, err := os.OpenFile("/dev/null", os.O_RDWR, 0)
 	if err != nil {
 		log.Fatalf("Error opening /dev/null: %v", err)
@@ -510,28 +440,15 @@ func runShellDaemon(session bool) {
 	for {
 		select {
 		case sig := <-sigChan:
-			if sig == syscall.SIGUSR1 {
+			// Handle SIGUSR1 restart for non-session managed processes
-				if isSessionManaged {
+			if sig == syscall.SIGUSR1 && !isSessionManaged {
-					log.Infof("Received SIGUSR1, exiting for systemd restart...")
-					cancel()
-					cmd.Process.Signal(syscall.SIGTERM)
-					os.Remove(socketPath)
-					os.Exit(1)
-				}
 				log.Infof("Received SIGUSR1, spawning detached restart process...")
 				execDetachedRestart(os.Getpid())
+				// Exit immediately to avoid race conditions with detached restart
 				return
 			}
 
-			// Check if qs already crashed before we got SIGTERM (systemd sends SIGTERM when D-Bus name is released)
+			// All other signals: clean shutdown
-			select {
-			case <-errChan:
-				cancel()
-				os.Remove(socketPath)
-				os.Exit(getProcessExitCode(cmd.ProcessState))
-			case <-time.After(500 * time.Millisecond):
-			}
-
 			cancel()
 			cmd.Process.Signal(syscall.SIGTERM)
 			os.Remove(socketPath)
@@ -543,25 +460,17 @@ func runShellDaemon(session bool) {
 				cmd.Process.Signal(syscall.SIGTERM)
 			}
 			os.Remove(socketPath)
-			os.Exit(getProcessExitCode(cmd.ProcessState))
+			os.Exit(1)
 		}
 	}
 }
 
-var qsHasAnyDisplay = sync.OnceValue(func() bool {
-	out, err := exec.Command("qs", "ipc", "--help").Output()
-	if err != nil {
-		return false
-	}
-	return strings.Contains(string(out), "--any-display")
-})
-
 func parseTargetsFromIPCShowOutput(output string) ipcTargets {
 	targets := make(ipcTargets)
 	var currentTarget string
-	for line := range strings.SplitSeq(output, "\n") {
+	for _, line := range strings.Split(output, "\n") {
-		if after, ok := strings.CutPrefix(line, "target "); ok {
+		if strings.HasPrefix(line, "target ") {
-			currentTarget = strings.TrimSpace(after)
+			currentTarget = strings.TrimSpace(strings.TrimPrefix(line, "target "))
 			targets[currentTarget] = make(map[string][]string)
 		}
 		if strings.HasPrefix(line, "  function") && currentTarget != "" {
@@ -586,11 +495,7 @@ func parseTargetsFromIPCShowOutput(output string) ipcTargets {
 }
 
 func getShellIPCCompletions(args []string, _ string) []string {
-	cmdArgs := []string{"ipc"}
+	cmdArgs := []string{"-p", configPath, "ipc", "show"}
-	if qsHasAnyDisplay() {
-		cmdArgs = append(cmdArgs, "--any-display")
-	}
-	cmdArgs = append(cmdArgs, "-p", configPath, "show")
 	cmd := exec.Command("qs", cmdArgs...)
 	var targets ipcTargets
 
@@ -633,70 +538,18 @@ func getShellIPCCompletions(args []string, _ string) []string {
 	return nil
 }
 
-func getFirstDMSPID() (int, bool) {
-	dir := getRuntimeDir()
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		return 0, false
-	}
-
-	for _, entry := range entries {
-		if !strings.HasPrefix(entry.Name(), "danklinux-") || !strings.HasSuffix(entry.Name(), ".pid") {
-			continue
-		}
-
-		data, err := os.ReadFile(filepath.Join(dir, entry.Name()))
-		if err != nil {
-			continue
-		}
-
-		pid, err := strconv.Atoi(strings.TrimSpace(string(data)))
-		if err != nil {
-			continue
-		}
-
-		proc, err := os.FindProcess(pid)
-		if err != nil {
-			continue
-		}
-
-		if proc.Signal(syscall.Signal(0)) != nil {
-			continue
-		}
-
-		return pid, true
-	}
-
-	return 0, false
-}
-
 func runShellIPCCommand(args []string) {
 	if len(args) == 0 {
-		printIPCHelp()
+		log.Error("IPC command requires arguments")
-		return
+		log.Info("Usage: dms ipc <command> [args...]")
+		os.Exit(1)
 	}
 
 	if args[0] != "call" {
 		args = append([]string{"call"}, args...)
 	}
 
-	cmdArgs := []string{"ipc"}
+	cmdArgs := append([]string{"-p", configPath, "ipc"}, args...)
-
-	switch pid, ok := getFirstDMSPID(); {
-	case ok:
-		cmdArgs = append(cmdArgs, "--pid", strconv.Itoa(pid))
-	default:
-		if err := findConfig(nil, nil); err != nil {
-			log.Fatalf("Error finding config: %v", err)
-		}
-		// ! TODO - remove check when QS 0.3 is released
-		if qsHasAnyDisplay() {
-			cmdArgs = append(cmdArgs, "--any-display")
-		}
-		cmdArgs = append(cmdArgs, "-p", configPath)
-	}
-
-	cmdArgs = append(cmdArgs, args...)
 	cmd := exec.Command("qs", cmdArgs...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
@@ -706,45 +559,3 @@ func runShellIPCCommand(args []string) {
 		log.Fatalf("Error running IPC command: %v", err)
 	}
 }
-
-func printIPCHelp() {
-	fmt.Println("Usage: dms ipc <target> <function> [args...]")
-	fmt.Println()
-
-	cmdArgs := []string{"ipc"}
-	if qsHasAnyDisplay() {
-		cmdArgs = append(cmdArgs, "--any-display")
-	}
-	cmdArgs = append(cmdArgs, "-p", configPath, "show")
-	cmd := exec.Command("qs", cmdArgs...)
-
-	output, err := cmd.Output()
-	if err != nil {
-		fmt.Println("Could not retrieve available IPC targets (is DMS running?)")
-		return
-	}
-
-	targets := parseTargetsFromIPCShowOutput(string(output))
-	if len(targets) == 0 {
-		fmt.Println("No IPC targets available")
-		return
-	}
-
-	fmt.Println("Targets:")
-
-	targetNames := make([]string, 0, len(targets))
-	for name := range targets {
-		targetNames = append(targetNames, name)
-	}
-	slices.Sort(targetNames)
-
-	for _, targetName := range targetNames {
-		funcs := targets[targetName]
-		funcNames := make([]string, 0, len(funcs))
-		for fn := range funcs {
-			funcNames = append(funcNames, fn)
-		}
-		slices.Sort(funcNames)
-		fmt.Printf("  %-16s %s\n", targetName, strings.Join(funcNames, ", "))
-	}
-}

core/cmd/dms/utils.go

@@ -3,24 +3,15 @@ package main
 import (
 	"fmt"
 	"os/exec"
-	"slices"
 	"strings"
 )
 
-// isReadOnlyCommand returns true if the CLI args indicate a command that is
+func findCommandPath(cmd string) (string, error) {
-// safe to run as root (e.g. shell completion, help).
+	path, err := exec.LookPath(cmd)
-func isReadOnlyCommand(args []string) bool {
+	if err != nil {
-	for _, arg := range args[1:] {
+		return "", fmt.Errorf("command '%s' not found in PATH", cmd)
-		if strings.HasPrefix(arg, "-") {
-			continue
 	}
-		switch arg {
+	return path, nil
-		case "completion", "help", "__complete", "system":
-			return true
-		}
-		return false
-	}
-	return false
 }
 
 func isArchPackageInstalled(packageName string) bool {
@@ -45,7 +36,13 @@ func checkSystemdServiceEnabled(serviceName string) (string, bool, error) {
 
 	if err != nil {
 		knownStates := []string{"disabled", "masked", "masked-runtime", "not-found", "enabled", "enabled-runtime", "static", "indirect", "alias"}
-		isKnownState := slices.Contains(knownStates, stateStr)
+		isKnownState := false
+		for _, known := range knownStates {
+			if stateStr == known {
+				isKnownState = true
+				break
+			}
+		}
 
 		if !isKnownState {
 			return stateStr, false, fmt.Errorf("systemctl is-enabled failed: %w (output: %s)", err, stateStr)

core/go.mod

@@ -1,103 +1,70 @@
 module github.com/AvengeMedia/DankMaterialShell/core
 
-go 1.26.1
+go 1.24.6
 
 require (
 	github.com/Wifx/gonetworkmanager/v2 v2.2.0
-	github.com/alecthomas/chroma/v2 v2.24.1
+	github.com/charmbracelet/bubbles v0.21.0
-	github.com/charmbracelet/bubbles v1.0.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/log v1.0.0
+	github.com/charmbracelet/log v0.4.2
-	github.com/fsnotify/fsnotify v1.10.1
+	github.com/fsnotify/fsnotify v1.9.0
-	github.com/godbus/dbus/v5 v5.2.2
+	github.com/godbus/dbus/v5 v5.2.0
-	github.com/holoplot/go-evdev v0.0.0-20260504100651-66d1748fe847
+	github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83
 	github.com/pilebones/go-udev v0.9.1
-	github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6
+	github.com/sblinch/kdl-go v0.0.0-20250930225324-bf4099d4614a
-	github.com/spf13/cobra v1.10.2
+	github.com/spf13/cobra v1.10.1
 	github.com/stretchr/testify v1.11.1
-	github.com/yeqown/go-qrcode/v2 v2.2.5
+	golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39
-	github.com/yeqown/go-qrcode/writer/standard v1.3.0
-	github.com/yuin/goldmark v1.8.2
-	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
-	go.etcd.io/bbolt v1.4.3
-	go4.org/mem v0.0.0-20240501181205-ae6ca9944745
-	golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
-	golang.org/x/image v0.39.0
-	tailscale.com v1.96.5
 )
 
 require (
-	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.4.1 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
-	github.com/akutz/memconn v0.1.0 // indirect
+	github.com/clipperhouse/displaywidth v0.6.0 // indirect
-	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
-	github.com/cloudflare/circl v1.6.3 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/coder/websocket v1.8.14 // indirect
 	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
-	github.com/dblohm7/wingoes v0.0.0-20250822163801-6d8e6105c62d // indirect
-	github.com/dlclark/regexp2 v1.12.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fogleman/gg v1.3.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.2 // indirect
 	github.com/go-git/gcfg/v2 v2.0.2 // indirect
-	github.com/go-git/go-billy/v6 v6.0.0-20260504142752-cb8e9d337266 // indirect
+	github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0 // indirect
-	github.com/go-json-experiment/json v0.0.0-20260430182902-b6187a392ed4 // indirect
 	github.com/go-logfmt/logfmt v0.6.1 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/kevinburke/ssh_config v1.4.0 // indirect
-	github.com/hdevalence/ed25519consensus v0.2.0 // indirect
-	github.com/jsimonetti/rtnetlink v1.4.2 // indirect
-	github.com/kevinburke/ssh_config v1.6.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
-	github.com/mdlayher/netlink v1.11.1 // indirect
+	github.com/pjbgf/sha1cd v0.5.0 // indirect
-	github.com/mdlayher/socket v0.6.0 // indirect
-	github.com/mitchellh/go-ps v1.0.0 // indirect
-	github.com/pjbgf/sha1cd v0.6.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/stretchr/objx v0.5.3 // indirect
-	github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/net v0.47.0 // indirect
-	github.com/yeqown/reedsolomon v1.0.0 // indirect
-	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.50.0 // indirect
-	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.zx2c4.com/wireguard/windows v1.0.1 // indirect
 )
 
 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/charmbracelet/colorprofile v0.4.3 // indirect
+	github.com/charmbracelet/colorprofile v0.3.3 // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.11.7 // indirect
+	github.com/charmbracelet/x/ansi v0.11.2 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/go-git/go-git/v6 v6.0.0-alpha.2
+	github.com/go-git/go-git/v6 v6.0.0-20251128074608-48f817f57805
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.4.0
+	github.com/lucasb-eyer/go-colorful v1.3.0
-	github.com/mattn/go-isatty v0.0.22
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.23 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/termenv v0.16.0
+	github.com/muesli/termenv v0.16.0 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/afero v1.15.0
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/sys v0.43.0
+	golang.org/x/sys v0.38.0
-	golang.org/x/text v0.36.0
+	golang.org/x/text v0.31.0
-	gopkg.in/yaml.v3 v3.0.1
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-// v0.0.1 tag is missing a LICENSE file; master has it.
-// See: https://github.com/mattn/go-localereader/issues/2
-replace github.com/mattn/go-localereader v0.0.1 => github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75

core/go.sum

@@ -1,21 +1,9 @@
-filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
-filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
-github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/Wifx/gonetworkmanager/v2 v2.2.0 h1:kPstgsQtY8CmDOOFZd81ytM9Gi3f6ImzPCKF7nNhQ2U=
 github.com/Wifx/gonetworkmanager/v2 v2.2.0/go.mod h1:fMDb//SHsKWxyDUAwXvCqurV3npbIyyaQWenGpZ/uXg=
-github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=
-github.com/akutz/memconn v0.1.0/go.mod h1:Jo8rI7m0NieZyLI5e2CDlRdRqRRB4S7Xp77ukDjH+Fw=
-github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
-github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
-github.com/alecthomas/chroma/v2 v2.24.1 h1:m5ffpfZbIb++k8AqFEKy9uVgY12xIQtBsQlc6DfZJQM=
-github.com/alecthomas/chroma/v2 v2.24.1/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI=
-github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
-github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
-github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -24,99 +12,72 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
-github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
+github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
-github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
+github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
 github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
 github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
-github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
+github.com/charmbracelet/colorprofile v0.3.3 h1:DjJzJtLP6/NZ8p7Cgjno0CKGr7wwRJGxWUwh2IyhfAI=
-github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/colorprofile v0.3.3/go.mod h1:nB1FugsAbzq284eJcjfah2nhdSLppN2NqvfotkfRYP4=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/log v1.0.0 h1:HVVVMmfOorfj3BA9i8X8UL69Hoz9lI0PYwXfJvOdRc4=
+github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
-github.com/charmbracelet/log v1.0.0/go.mod h1:uYgY3SmLpwJWxmlrPwXvzVYujxis1vAKRV/0VQB7yWA=
+github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
-github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
+github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=
-github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
+github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=
-github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
+github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4=
-github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
+github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
 github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
-github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=
+github.com/clipperhouse/displaywidth v0.6.0 h1:k32vueaksef9WIKCNcoqRNyKbyvkvkysNYnAWz2fN4s=
-github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=
+github.com/clipperhouse/displaywidth v0.6.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
-github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
-github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
-github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
+github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
-github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
-github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
-github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
-github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
-github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/creachadair/taskgroup v0.13.2 h1:3KyqakBuFsm3KkXi/9XIb0QcA8tEzLHLgaoidf0MdVc=
-github.com/creachadair/taskgroup v0.13.2/go.mod h1:i3V1Zx7H8RjwljUEeUWYT30Lmb9poewSb2XI1yTwD0g=
 github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
 github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
-github.com/dblohm7/wingoes v0.0.0-20250822163801-6d8e6105c62d h1:QRKpU+9ZBDs62LyBfwhZkJdB5DJX2Sm3p4kUh7l1aA0=
-github.com/dblohm7/wingoes v0.0.0-20250822163801-6d8e6105c62d/go.mod h1:SUxUaAK/0UG5lYyZR1L1nC4AaYYvSSYTWQSH3FPcxKU=
-github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8=
-github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
-github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
-github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
-github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=
-github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/gaissmai/bart v0.26.1 h1:+w4rnLGNlA2GDVn382Tfe3jOsK5vOr5n4KmigJ9lbTo=
-github.com/gaissmai/bart v0.26.1/go.mod h1:GREWQfTLRWz/c5FTOsIw+KkscuFkIV5t8Rp7Nd1Td5c=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
 github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
-github.com/go-git/go-billy/v6 v6.0.0-20260504142752-cb8e9d337266 h1:wH21vHuv323v9x78JNFNJ6P7HEAsdwr9yq2k9/o4zEE=
+github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0 h1:eY5aB2GXiVdgTueBcqsBt53WuJTRZAuCdIS/86Pcq5c=
-github.com/go-git/go-billy/v6 v6.0.0-20260504142752-cb8e9d337266/go.mod h1:CdBVp7CXl9l3sOyNEog46cP1Pvx/hjCe9AD0mtaIUYU=
+github.com/go-git/go-billy/v6 v6.0.0-20251126203821-7f9c95185ee0/go.mod h1:0NjwVNrwtVFZBReAp5OoGklGJIgJFEbVyHneAr4lc8k=
-github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0 h1:XoTsdvaghuVfIr7HpNTmFDLu2nz3I2iGqyn6Uk6MkJc=
+github.com/go-git/go-git-fixtures/v5 v5.1.1 h1:OH8i1ojV9bWfr0ZfasfpgtUXQHQyVS8HXik/V1C099w=
-github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0/go.mod h1:1Lr7/vYEYyl6Ir9Ku0tKrCIRreM5zovv0Jdx2MPSM4s=
+github.com/go-git/go-git-fixtures/v5 v5.1.1/go.mod h1:Altk43lx3b1ks+dVoAG2300o5WWUnktvfY3VI6bcaXU=
-github.com/go-git/go-git/v6 v6.0.0-alpha.2 h1:T3loNtDuAixNzXtlQxZhnYiYpaQ3CA4vn9RssAniEeI=
+github.com/go-git/go-git/v6 v6.0.0-20251128074608-48f817f57805 h1:jxQ3BzYeErNRvlI/4+0mpwqMzvB4g97U+ksfgvrUEbY=
-github.com/go-git/go-git/v6 v6.0.0-alpha.2/go.mod h1:oCD3i19CTz7gBpeb11ZZqL91WzqbMq9avn5KpUYy/Ak=
+github.com/go-git/go-git/v6 v6.0.0-20251128074608-48f817f57805/go.mod h1:dIwT3uWK1ooHInyVnK2JS5VfQ3peVGYaw2QPqX7uFvs=
-github.com/go-json-experiment/json v0.0.0-20260430182902-b6187a392ed4 h1:2WmHkJINIjgXXYDGik8d3oJvFA3DAwPy00csDJ3vo+o=
-github.com/go-json-experiment/json v0.0.0-20260430182902-b6187a392ed4/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
 github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=
 github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
+github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8=
-github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
+github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU=
+github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83 h1:B+A58zGFuDrvEZpPN+yS6swJA0nzqgZvDzgl/OPyefU=
-github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo=
+github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83/go.mod h1:iHAf8OIncO2gcQ8XOjS7CMJ2aPbX2Bs0wl5pZyanEqk=
-github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
-github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/holoplot/go-evdev v0.0.0-20260504100651-66d1748fe847 h1:1rQ5UQXFm02DXEtsIpotfA32WJ9KceS6t8w5K8QtFqc=
-github.com/holoplot/go-evdev v0.0.0-20260504100651-66d1748fe847/go.mod h1:iHAf8OIncO2gcQ8XOjS7CMJ2aPbX2Bs0wl5pZyanEqk=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jsimonetti/rtnetlink v1.4.2 h1:Df9w9TZ3npHTyDn0Ev9e1uzmN2odmXd0QX+J5GTEn90=
+github.com/kevinburke/ssh_config v1.4.0 h1:6xxtP5bZ2E4NF5tuQulISpTO2z8XbtH8cg1PWkxoFkQ=
-github.com/jsimonetti/rtnetlink v1.4.2/go.mod h1:92s6LJdE+1iOrw+F2/RO7LYI2Qd8pPpFNNUYW06gcoM=
+github.com/kevinburke/ssh_config v1.4.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
-github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=
-github.com/kevinburke/ssh_config v1.6.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -126,20 +87,14 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
+github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
-github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 h1:P8UmIzZMYDR+NGImiFvErt6VWfIRPuGM+vyjiEdkmIw=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
-github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
-github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mdlayher/netlink v1.11.1 h1:T136gDS6Gkt+hLncaBwKdW5GpEC8Z0ykqimOebVoal0=
-github.com/mdlayher/netlink v1.11.1/go.mod h1:ao4LjamyK4Uq9L8+fQzqFYpAncbeCdwbvd9Edv/pYnc=
-github.com/mdlayher/socket v0.6.0 h1:ScZPaAGyO1icQnbFrhPM8mnXyMu9qukC1K4ZoM2IQKU=
-github.com/mdlayher/socket v0.6.0/go.mod h1:q7vozUAnxSqnjHc12Fik5yUKIzfZ8ITCfMkhOtE9z18=
-github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
-github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -148,26 +103,23 @@ github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pilebones/go-udev v0.9.1 h1:uN72M1C1fgzhsVmBGEM8w9RD1JY4iVsPZpr+Z6rb3O8=
 github.com/pilebones/go-udev v0.9.1/go.mod h1:Bgcl07crebF3JSeS4+nuaRvhWFdCeFoBhXXeAp93XNo=
-github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
+github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
-github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
+github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6 h1:JsjzqC6ymELkN4XlTjZPSahSAem21GySugLbKz6uF5E=
+github.com/sblinch/kdl-go v0.0.0-20250930225324-bf4099d4614a h1:8ZZwZWIQKC0YVMyaCkbrdeI8faTjD1QBrRAAWc1TjMI=
-github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28=
+github.com/sblinch/kdl-go v0.0.0-20250930225324-bf4099d4614a/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28=
 github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
 github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
-github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
-github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -175,65 +127,29 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
 github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 h1:Gzfnfk2TWrk8Jj4P4c1a3CtQyMaTVCznlkLZI++hok4=
-github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55/go.mod h1:4k4QO+dQ3R5FofL+SanAUZe+/QfeK0+OIuwDIRu2vSg=
-github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da h1:jVRUZPRs9sqyKlYHHzHjAqKN+6e/Vog6NpHYeNPJqOw=
-github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4=
-github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
-github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-github.com/yeqown/go-qrcode/v2 v2.2.5 h1:HCOe2bSjkhZyYoyyNaXNzh4DJZll6inVJQQw+8228Zk=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-github.com/yeqown/go-qrcode/v2 v2.2.5/go.mod h1:uHpt9CM0V1HeXLz+Wg5MN50/sI/fQhfkZlOM+cOTHxw=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-github.com/yeqown/go-qrcode/writer/standard v1.3.0 h1:chdyhEfRtUPgQtuPeaWVGQ/TQx4rE1PqeoW3U+53t34=
+golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 h1:DHNhtq3sNNzrvduZZIiFyXWOL9IWaDPHqTnLJp+rCBY=
-github.com/yeqown/go-qrcode/writer/standard v1.3.0/go.mod h1:O4MbzsotGCvy8upYPCR91j81dr5XLT7heuljcNXW+oQ=
+golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
-github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
-github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
-github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ=
-github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
-go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
-go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
-go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4hOxG5YpKCzkek=
-go4.org/mem v0.0.0-20240501181205-ae6ca9944745/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g=
-go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
-go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
-golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
-golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
-golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww=
-golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA=
-golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8=
-golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-tailscale.com v1.96.5 h1:gNkfA/KSZAl6jCH9cj8urq00HRWItDDTtGsyATI89jA=
-tailscale.com v1.96.5/go.mod h1:/3lnZBYb2UEwnN0MNu2SDXUtT06AGd5k0s+OWx3WmcY=

core/install.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -e
 
@@ -22,13 +22,13 @@ fi
 # Detect architecture
 ARCH=$(uname -m)
 case "$ARCH" in
-x86_64)
+    x86_64)
         ARCH="amd64"
         ;;
-aarch64)
+    aarch64)
         ARCH="arm64"
         ;;
-*)
+    *)
         printf "%bError: Unsupported architecture: %s%b\n" "$RED" "$ARCH" "$NC"
         printf "This installer only supports x86_64 (amd64) and aarch64 (arm64) architectures\n"
         exit 1
@@ -55,7 +55,7 @@ curl -L "https://github.com/AvengeMedia/DankMaterialShell/releases/download/$LAT
 curl -L "https://github.com/AvengeMedia/DankMaterialShell/releases/download/$LATEST_VERSION/dankinstall-$ARCH.gz.sha256" -o "expected.sha256"
 
 # Get the expected checksum
-EXPECTED_CHECKSUM=$(awk '{print $1}' expected.sha256)
+EXPECTED_CHECKSUM=$(cat expected.sha256 | awk '{print $1}')
 
 # Calculate actual checksum
 printf "%bVerifying checksum...%b\n" "$GREEN" "$NC"
@@ -67,7 +67,7 @@ if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
     printf "Expected: %s\n" "$EXPECTED_CHECKSUM"
     printf "Got:      %s\n" "$ACTUAL_CHECKSUM"
     printf "The downloaded file may be corrupted or tampered with\n"
-    cd - >/dev/null
+    cd - > /dev/null
     rm -rf "$TEMP_DIR"
     exit 1
 fi
@@ -82,5 +82,5 @@ printf "%bRunning installer...%b\n" "$GREEN" "$NC"
 ./installer
 
 # Cleanup
-cd - >/dev/null
+cd - > /dev/null
 rm -rf "$TEMP_DIR" 

core/internal/blur/probe.go

@@ -1,35 +0,0 @@
-package blur
-
-import (
-	wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client"
-	client "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-)
-
-const extBackgroundEffectInterface = "ext_background_effect_manager_v1"
-
-func ProbeSupport() (bool, error) {
-	display, err := client.Connect("")
-	if err != nil {
-		return false, err
-	}
-	defer display.Context().Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return false, err
-	}
-
-	found := false
-	registry.SetGlobalHandler(func(e client.RegistryGlobalEvent) {
-		switch e.Interface {
-		case extBackgroundEffectInterface:
-			found = true
-		}
-	})
-
-	if err := wlhelpers.Roundtrip(display, display.Context()); err != nil {
-		return false, err
-	}
-
-	return found, nil
-}

core/internal/clipboard/clipboard.go

@@ -1,630 +0,0 @@
-package clipboard
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"syscall"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/ext_data_control"
-	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-)
-
-const envServe = "_DMS_CLIPBOARD_SERVE"
-const envMime = "_DMS_CLIPBOARD_MIME"
-const envPasteOnce = "_DMS_CLIPBOARD_PASTE_ONCE"
-const envCacheFile = "_DMS_CLIPBOARD_CACHE"
-
-// MaybeServeAndExit intercepts before cobra when re-exec'd as a clipboard
-// child. Reads source data into memory, deletes any cache file, then serves.
-func MaybeServeAndExit() {
-	if os.Getenv(envServe) == "" {
-		return
-	}
-
-	mimeType := os.Getenv(envMime)
-	pasteOnce := os.Getenv(envPasteOnce) == "1"
-	cachePath := os.Getenv(envCacheFile)
-
-	var data []byte
-	var err error
-
-	switch {
-	case cachePath != "":
-		data, err = os.ReadFile(cachePath)
-		os.Remove(cachePath)
-	default:
-		data, err = io.ReadAll(os.Stdin)
-	}
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "clipboard: read source: %v\n", err)
-		os.Exit(1)
-	}
-
-	if err := serveClipboard(data, mimeType, pasteOnce); err != nil {
-		fmt.Fprintf(os.Stderr, "clipboard: serve: %v\n", err)
-		os.Exit(1)
-	}
-	os.Exit(0)
-}
-
-func Copy(data []byte, mimeType string) error {
-	return copyForkCached(data, mimeType, false)
-}
-
-func CopyOpts(data []byte, mimeType string, foreground, pasteOnce bool) error {
-	if foreground {
-		return serveClipboard(data, mimeType, pasteOnce)
-	}
-	return copyForkCached(data, mimeType, pasteOnce)
-}
-
-func CopyReader(data io.Reader, mimeType string, foreground, pasteOnce bool) error {
-	if foreground {
-		buf, err := io.ReadAll(data)
-		if err != nil {
-			return fmt.Errorf("read source: %w", err)
-		}
-		return serveClipboard(buf, mimeType, pasteOnce)
-	}
-	return copyFork(data, mimeType, pasteOnce)
-}
-
-func newForkCmd(mimeType string, pasteOnce bool, extra ...string) *exec.Cmd {
-	cmd := exec.Command(os.Args[0])
-	cmd.Stderr = nil
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
-	cmd.Env = append(os.Environ(),
-		envServe+"=1",
-		envMime+"="+mimeType,
-	)
-	if pasteOnce {
-		cmd.Env = append(cmd.Env, envPasteOnce+"=1")
-	}
-	cmd.Env = append(cmd.Env, extra...)
-	return cmd
-}
-
-func waitReady(cmd *exec.Cmd) error {
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return fmt.Errorf("stdout pipe: %w", err)
-	}
-	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("start: %w", err)
-	}
-	var buf [1]byte
-	if _, err := stdout.Read(buf[:]); err != nil {
-		return fmt.Errorf("waiting for clipboard ready: %w", err)
-	}
-	return nil
-}
-
-func copyForkCached(data []byte, mimeType string, pasteOnce bool) error {
-	cacheFile, err := createClipboardCacheFile()
-	if err != nil {
-		return fmt.Errorf("create cache file: %w", err)
-	}
-	cachePath := cacheFile.Name()
-
-	if _, err := cacheFile.Write(data); err != nil {
-		cacheFile.Close()
-		os.Remove(cachePath)
-		return fmt.Errorf("write cache file: %w", err)
-	}
-	if err := cacheFile.Close(); err != nil {
-		os.Remove(cachePath)
-		return fmt.Errorf("close cache file: %w", err)
-	}
-
-	cmd := newForkCmd(mimeType, pasteOnce, envCacheFile+"="+cachePath)
-	cmd.Stdin = nil
-	if err := waitReady(cmd); err != nil {
-		os.Remove(cachePath)
-		return err
-	}
-	return nil
-}
-
-func copyFork(data io.Reader, mimeType string, pasteOnce bool) error {
-	cmd := newForkCmd(mimeType, pasteOnce)
-
-	switch src := data.(type) {
-	case *os.File:
-		cmd.Stdin = src
-		return waitReady(cmd)
-
-	default:
-		stdin, err := cmd.StdinPipe()
-		if err != nil {
-			return fmt.Errorf("stdin pipe: %w", err)
-		}
-
-		stdout, err := cmd.StdoutPipe()
-		if err != nil {
-			return fmt.Errorf("stdout pipe: %w", err)
-		}
-
-		if err := cmd.Start(); err != nil {
-			return fmt.Errorf("start: %w", err)
-		}
-		if _, err := io.Copy(stdin, data); err != nil {
-			stdin.Close()
-			return fmt.Errorf("write stdin: %w", err)
-		}
-		if err := stdin.Close(); err != nil {
-			return fmt.Errorf("close stdin: %w", err)
-		}
-
-		var buf [1]byte
-		if _, err := stdout.Read(buf[:]); err != nil {
-			return fmt.Errorf("waiting for clipboard ready: %w", err)
-		}
-		return nil
-	}
-}
-
-func signalReady() {
-	if os.Getenv(envServe) == "" {
-		return
-	}
-	os.Stdout.Write([]byte{1})
-}
-
-func createClipboardCacheFile() (*os.File, error) {
-	preferredDirs := []string{}
-
-	if cacheDir, err := os.UserCacheDir(); err == nil {
-		preferredDirs = append(preferredDirs, filepath.Join(cacheDir, "dms", "clipboard"))
-	}
-	preferredDirs = append(preferredDirs, "/var/tmp/dms/clipboard")
-
-	for _, dir := range preferredDirs {
-		if err := os.MkdirAll(dir, 0o700); err != nil {
-			continue
-		}
-		cachedData, err := os.CreateTemp(dir, "dms-clipboard-*")
-		if err == nil {
-			return cachedData, nil
-		}
-	}
-	return os.CreateTemp("", "dms-clipboard-*")
-}
-
-func serveClipboard(data []byte, mimeType string, pasteOnce bool) error {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return fmt.Errorf("wayland connect: %w", err)
-	}
-	defer display.Destroy()
-
-	ctx := display.Context()
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return fmt.Errorf("get registry: %w", err)
-	}
-	defer registry.Destroy()
-
-	var dataControlMgr *ext_data_control.ExtDataControlManagerV1
-	var seat *wlclient.Seat
-	var bindErr error
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case "ext_data_control_manager_v1":
-			dataControlMgr = ext_data_control.NewExtDataControlManagerV1(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, dataControlMgr); err != nil {
-				bindErr = err
-			}
-		case "wl_seat":
-			if seat != nil {
-				return
-			}
-			seat = wlclient.NewSeat(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, seat); err != nil {
-				bindErr = err
-			}
-		}
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	if bindErr != nil {
-		return fmt.Errorf("registry bind: %w", bindErr)
-	}
-	if dataControlMgr == nil {
-		return fmt.Errorf("compositor does not support ext_data_control_manager_v1")
-	}
-	defer dataControlMgr.Destroy()
-	if seat == nil {
-		return fmt.Errorf("no seat available")
-	}
-
-	device, err := dataControlMgr.GetDataDevice(seat)
-	if err != nil {
-		return fmt.Errorf("get data device: %w", err)
-	}
-	defer device.Destroy()
-
-	source, err := dataControlMgr.CreateDataSource()
-	if err != nil {
-		return fmt.Errorf("create data source: %w", err)
-	}
-
-	if err := source.Offer(mimeType); err != nil {
-		return fmt.Errorf("offer mime type: %w", err)
-	}
-	if mimeType == "text/plain;charset=utf-8" || mimeType == "text/plain" {
-		if err := source.Offer("text/plain"); err != nil {
-			return fmt.Errorf("offer text/plain: %w", err)
-		}
-		if err := source.Offer("text/plain;charset=utf-8"); err != nil {
-			return fmt.Errorf("offer text/plain;charset=utf-8: %w", err)
-		}
-		if err := source.Offer("UTF8_STRING"); err != nil {
-			return fmt.Errorf("offer UTF8_STRING: %w", err)
-		}
-		if err := source.Offer("STRING"); err != nil {
-			return fmt.Errorf("offer STRING: %w", err)
-		}
-		if err := source.Offer("TEXT"); err != nil {
-			return fmt.Errorf("offer TEXT: %w", err)
-		}
-	}
-
-	cancelled := make(chan struct{})
-	pasted := make(chan struct{}, 1)
-
-	source.SetSendHandler(func(e ext_data_control.ExtDataControlSourceV1SendEvent) {
-		_ = syscall.SetNonblock(e.Fd, false)
-		file := os.NewFile(uintptr(e.Fd), "pipe")
-		defer file.Close()
-		_, _ = file.Write(data)
-		select {
-		case pasted <- struct{}{}:
-		default:
-		}
-	})
-
-	source.SetCancelledHandler(func(e ext_data_control.ExtDataControlSourceV1CancelledEvent) {
-		close(cancelled)
-	})
-
-	if err := device.SetSelection(source); err != nil {
-		return fmt.Errorf("set selection: %w", err)
-	}
-
-	display.Roundtrip()
-	signalReady()
-
-	for {
-		select {
-		case <-cancelled:
-			return nil
-		case <-pasted:
-			if pasteOnce {
-				return nil
-			}
-		default:
-			if err := ctx.Dispatch(); err != nil {
-				return nil
-			}
-		}
-	}
-}
-
-func CopyText(text string) error {
-	return Copy([]byte(text), "text/plain;charset=utf-8")
-}
-
-func Paste() ([]byte, string, error) {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return nil, "", fmt.Errorf("wayland connect: %w", err)
-	}
-	defer display.Destroy()
-
-	ctx := display.Context()
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return nil, "", fmt.Errorf("get registry: %w", err)
-	}
-	defer registry.Destroy()
-
-	var dataControlMgr *ext_data_control.ExtDataControlManagerV1
-	var seat *wlclient.Seat
-	var bindErr error
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case "ext_data_control_manager_v1":
-			dataControlMgr = ext_data_control.NewExtDataControlManagerV1(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, dataControlMgr); err != nil {
-				bindErr = err
-			}
-		case "wl_seat":
-			if seat != nil {
-				return
-			}
-			seat = wlclient.NewSeat(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, seat); err != nil {
-				bindErr = err
-			}
-		}
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	if bindErr != nil {
-		return nil, "", fmt.Errorf("registry bind: %w", bindErr)
-	}
-
-	if dataControlMgr == nil {
-		return nil, "", fmt.Errorf("compositor does not support ext_data_control_manager_v1")
-	}
-	defer dataControlMgr.Destroy()
-
-	if seat == nil {
-		return nil, "", fmt.Errorf("no seat available")
-	}
-
-	device, err := dataControlMgr.GetDataDevice(seat)
-	if err != nil {
-		return nil, "", fmt.Errorf("get data device: %w", err)
-	}
-	defer device.Destroy()
-
-	offerMimeTypes := make(map[*ext_data_control.ExtDataControlOfferV1][]string)
-
-	device.SetDataOfferHandler(func(e ext_data_control.ExtDataControlDeviceV1DataOfferEvent) {
-		if e.Id == nil {
-			return
-		}
-		offerMimeTypes[e.Id] = nil
-		e.Id.SetOfferHandler(func(me ext_data_control.ExtDataControlOfferV1OfferEvent) {
-			offerMimeTypes[e.Id] = append(offerMimeTypes[e.Id], me.MimeType)
-		})
-	})
-
-	var selectionOffer *ext_data_control.ExtDataControlOfferV1
-	gotSelection := false
-
-	device.SetSelectionHandler(func(e ext_data_control.ExtDataControlDeviceV1SelectionEvent) {
-		selectionOffer = e.Id
-		gotSelection = true
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	if !gotSelection || selectionOffer == nil {
-		return nil, "", fmt.Errorf("no clipboard data")
-	}
-
-	mimeTypes := offerMimeTypes[selectionOffer]
-	selectedMime := selectPreferredMimeType(mimeTypes)
-	if selectedMime == "" {
-		return nil, "", fmt.Errorf("no supported mime type")
-	}
-
-	r, w, err := os.Pipe()
-	if err != nil {
-		return nil, "", fmt.Errorf("create pipe: %w", err)
-	}
-	defer r.Close()
-
-	if err := selectionOffer.Receive(selectedMime, int(w.Fd())); err != nil {
-		w.Close()
-		return nil, "", fmt.Errorf("receive: %w", err)
-	}
-	w.Close()
-
-	display.Roundtrip()
-
-	data, err := io.ReadAll(r)
-	if err != nil {
-		return nil, "", fmt.Errorf("read: %w", err)
-	}
-
-	return data, selectedMime, nil
-}
-
-func PasteText() (string, error) {
-	data, _, err := Paste()
-	if err != nil {
-		return "", err
-	}
-	return string(data), nil
-}
-
-func selectPreferredMimeType(mimes []string) string {
-	preferred := []string{
-		"text/plain;charset=utf-8",
-		"text/plain",
-		"UTF8_STRING",
-		"STRING",
-		"TEXT",
-		"image/png",
-		"image/jpeg",
-	}
-
-	for _, pref := range preferred {
-		for _, mime := range mimes {
-			if mime == pref {
-				return mime
-			}
-		}
-	}
-
-	if len(mimes) > 0 {
-		return mimes[0]
-	}
-	return ""
-}
-
-func IsImageMimeType(mime string) bool {
-	return len(mime) > 6 && mime[:6] == "image/"
-}
-
-type Offer struct {
-	MimeType string
-	Data     []byte
-}
-
-func CopyMulti(offers []Offer, foreground, pasteOnce bool) error {
-	if !foreground {
-		return copyMultiFork(offers, pasteOnce)
-	}
-	return copyMultiServe(offers, pasteOnce)
-}
-
-func copyMultiFork(offers []Offer, pasteOnce bool) error {
-	args := []string{os.Args[0], "cl", "copy", "--foreground", "--type", "__multi__"}
-	if pasteOnce {
-		args = append(args, "--paste-once")
-	}
-
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Stdin = nil
-	cmd.Stdout = nil
-	cmd.Stderr = nil
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
-
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return fmt.Errorf("stdin pipe: %w", err)
-	}
-
-	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("start: %w", err)
-	}
-
-	for _, offer := range offers {
-		fmt.Fprintf(stdin, "%s\x00%d\x00", offer.MimeType, len(offer.Data))
-		if _, err := stdin.Write(offer.Data); err != nil {
-			stdin.Close()
-			return fmt.Errorf("write offer data: %w", err)
-		}
-	}
-	stdin.Close()
-
-	return nil
-}
-
-func copyMultiServe(offers []Offer, pasteOnce bool) error {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return fmt.Errorf("wayland connect: %w", err)
-	}
-	defer display.Destroy()
-
-	ctx := display.Context()
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return fmt.Errorf("get registry: %w", err)
-	}
-	defer registry.Destroy()
-
-	var dataControlMgr *ext_data_control.ExtDataControlManagerV1
-	var seat *wlclient.Seat
-	var bindErr error
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case "ext_data_control_manager_v1":
-			dataControlMgr = ext_data_control.NewExtDataControlManagerV1(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, dataControlMgr); err != nil {
-				bindErr = err
-			}
-		case "wl_seat":
-			if seat != nil {
-				return
-			}
-			seat = wlclient.NewSeat(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, seat); err != nil {
-				bindErr = err
-			}
-		}
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	if bindErr != nil {
-		return fmt.Errorf("registry bind: %w", bindErr)
-	}
-	if dataControlMgr == nil {
-		return fmt.Errorf("compositor does not support ext_data_control_manager_v1")
-	}
-	defer dataControlMgr.Destroy()
-	if seat == nil {
-		return fmt.Errorf("no seat available")
-	}
-
-	device, err := dataControlMgr.GetDataDevice(seat)
-	if err != nil {
-		return fmt.Errorf("get data device: %w", err)
-	}
-	defer device.Destroy()
-
-	source, err := dataControlMgr.CreateDataSource()
-	if err != nil {
-		return fmt.Errorf("create data source: %w", err)
-	}
-
-	offerMap := make(map[string][]byte)
-	for _, offer := range offers {
-		if err := source.Offer(offer.MimeType); err != nil {
-			return fmt.Errorf("offer %s: %w", offer.MimeType, err)
-		}
-		offerMap[offer.MimeType] = offer.Data
-	}
-
-	cancelled := make(chan struct{})
-	pasted := make(chan struct{}, 1)
-
-	source.SetSendHandler(func(e ext_data_control.ExtDataControlSourceV1SendEvent) {
-		_ = syscall.SetNonblock(e.Fd, false)
-		file := os.NewFile(uintptr(e.Fd), "pipe")
-		defer file.Close()
-
-		if data, ok := offerMap[e.MimeType]; ok {
-			_, _ = file.Write(data)
-		}
-
-		select {
-		case pasted <- struct{}{}:
-		default:
-		}
-	})
-
-	source.SetCancelledHandler(func(e ext_data_control.ExtDataControlSourceV1CancelledEvent) {
-		close(cancelled)
-	})
-
-	if err := device.SetSelection(source); err != nil {
-		return fmt.Errorf("set selection: %w", err)
-	}
-
-	display.Roundtrip()
-
-	for {
-		select {
-		case <-cancelled:
-			return nil
-		case <-pasted:
-			if pasteOnce {
-				return nil
-			}
-		default:
-			if err := ctx.Dispatch(); err != nil {
-				return nil
-			}
-		}
-	}
-}

core/internal/clipboard/store.go

@@ -1,248 +0,0 @@
-package clipboard
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"image"
-	_ "image/gif"
-	_ "image/jpeg"
-	_ "image/png"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	_ "golang.org/x/image/bmp"
-	_ "golang.org/x/image/tiff"
-	"hash/fnv"
-
-	bolt "go.etcd.io/bbolt"
-)
-
-type StoreConfig struct {
-	MaxHistory   int
-	MaxEntrySize int64
-}
-
-func DefaultStoreConfig() StoreConfig {
-	return StoreConfig{
-		MaxHistory:   100,
-		MaxEntrySize: 5 * 1024 * 1024,
-	}
-}
-
-type Entry struct {
-	ID        uint64
-	Data      []byte
-	MimeType  string
-	Preview   string
-	Size      int
-	Timestamp time.Time
-	IsImage   bool
-	Hash      uint64
-}
-
-func Store(data []byte, mimeType string) error {
-	return StoreWithConfig(data, mimeType, DefaultStoreConfig())
-}
-
-func StoreWithConfig(data []byte, mimeType string, cfg StoreConfig) error {
-	if len(data) == 0 {
-		return nil
-	}
-	if int64(len(data)) > cfg.MaxEntrySize {
-		return fmt.Errorf("data too large: %d > %d", len(data), cfg.MaxEntrySize)
-	}
-
-	dbPath, err := GetDBPath()
-	if err != nil {
-		return fmt.Errorf("get db path: %w", err)
-	}
-
-	db, err := bolt.Open(dbPath, 0o644, &bolt.Options{Timeout: 1 * time.Second})
-	if err != nil {
-		return fmt.Errorf("open db: %w", err)
-	}
-	defer db.Close()
-
-	entry := Entry{
-		Data:      data,
-		MimeType:  mimeType,
-		Size:      len(data),
-		Timestamp: time.Now(),
-		IsImage:   IsImageMimeType(mimeType),
-		Hash:      computeHash(data),
-	}
-
-	switch {
-	case entry.IsImage:
-		entry.Preview = imagePreview(data, mimeType)
-	default:
-		entry.Preview = textPreview(data)
-	}
-
-	return db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucketIfNotExists([]byte("clipboard"))
-		if err != nil {
-			return err
-		}
-
-		if err := deduplicateInTx(b, entry.Hash); err != nil {
-			return err
-		}
-
-		id, err := b.NextSequence()
-		if err != nil {
-			return err
-		}
-		entry.ID = id
-
-		encoded, err := encodeEntry(entry)
-		if err != nil {
-			return err
-		}
-
-		if err := b.Put(itob(id), encoded); err != nil {
-			return err
-		}
-
-		return trimLengthInTx(b, cfg.MaxHistory)
-	})
-}
-
-func GetDBPath() (string, error) {
-	cacheDir, err := os.UserCacheDir()
-	if err != nil {
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		cacheDir = filepath.Join(homeDir, ".cache")
-	}
-
-	newDir := filepath.Join(cacheDir, "DankMaterialShell", "clipboard")
-	newPath := filepath.Join(newDir, "db")
-
-	if _, err := os.Stat(newPath); err == nil {
-		return newPath, nil
-	}
-
-	oldDir := filepath.Join(cacheDir, "dms-clipboard")
-	oldPath := filepath.Join(oldDir, "db")
-
-	if _, err := os.Stat(oldPath); err == nil {
-		if err := os.MkdirAll(newDir, 0o700); err != nil {
-			return "", err
-		}
-		if err := os.Rename(oldPath, newPath); err != nil {
-			return "", err
-		}
-		os.Remove(oldDir)
-		return newPath, nil
-	}
-
-	if err := os.MkdirAll(newDir, 0o700); err != nil {
-		return "", err
-	}
-	return newPath, nil
-}
-
-func deduplicateInTx(b *bolt.Bucket, hash uint64) error {
-	c := b.Cursor()
-	for k, v := c.Last(); k != nil; k, v = c.Prev() {
-		if extractHash(v) != hash {
-			continue
-		}
-		if err := b.Delete(k); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func trimLengthInTx(b *bolt.Bucket, maxHistory int) error {
-	c := b.Cursor()
-	var count int
-	for k, _ := c.Last(); k != nil; k, _ = c.Prev() {
-		if count < maxHistory {
-			count++
-			continue
-		}
-		if err := b.Delete(k); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func encodeEntry(e Entry) ([]byte, error) {
-	buf := new(bytes.Buffer)
-
-	binary.Write(buf, binary.BigEndian, e.ID)
-	binary.Write(buf, binary.BigEndian, uint32(len(e.Data)))
-	buf.Write(e.Data)
-	binary.Write(buf, binary.BigEndian, uint32(len(e.MimeType)))
-	buf.WriteString(e.MimeType)
-	binary.Write(buf, binary.BigEndian, uint32(len(e.Preview)))
-	buf.WriteString(e.Preview)
-	binary.Write(buf, binary.BigEndian, int32(e.Size))
-	binary.Write(buf, binary.BigEndian, e.Timestamp.Unix())
-	if e.IsImage {
-		buf.WriteByte(1)
-	} else {
-		buf.WriteByte(0)
-	}
-	binary.Write(buf, binary.BigEndian, e.Hash)
-
-	return buf.Bytes(), nil
-}
-
-func itob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func computeHash(data []byte) uint64 {
-	h := fnv.New64a()
-	h.Write(data)
-	return h.Sum64()
-}
-
-func extractHash(data []byte) uint64 {
-	if len(data) < 8 {
-		return 0
-	}
-	return binary.BigEndian.Uint64(data[len(data)-8:])
-}
-
-func textPreview(data []byte) string {
-	text := string(data)
-	text = strings.TrimSpace(text)
-	text = strings.Join(strings.Fields(text), " ")
-
-	if len(text) > 100 {
-		return text[:100] + "…"
-	}
-	return text
-}
-
-func imagePreview(data []byte, format string) string {
-	config, imgFmt, err := image.DecodeConfig(bytes.NewReader(data))
-	if err != nil {
-		return fmt.Sprintf("[[ image %s %s ]]", sizeStr(len(data)), format)
-	}
-	return fmt.Sprintf("[[ image %s %s %dx%d ]]", sizeStr(len(data)), imgFmt, config.Width, config.Height)
-}
-
-func sizeStr(size int) string {
-	units := []string{"B", "KiB", "MiB"}
-	var i int
-	fsize := float64(size)
-	for fsize >= 1024 && i < len(units)-1 {
-		fsize /= 1024
-		i++
-	}
-	return fmt.Sprintf("%.0f %s", fsize, units[i])
-}

core/internal/clipboard/watch.go

@@ -1,303 +0,0 @@
-package clipboard
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/ext_data_control"
-	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-)
-
-type ClipboardChange struct {
-	Data      []byte
-	MimeType  string
-	MimeTypes []string
-}
-
-func Watch(ctx context.Context, callback func(data []byte, mimeType string)) error {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return fmt.Errorf("wayland connect: %w", err)
-	}
-	defer display.Destroy()
-
-	wlCtx := display.Context()
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return fmt.Errorf("get registry: %w", err)
-	}
-	defer registry.Destroy()
-
-	var dataControlMgr *ext_data_control.ExtDataControlManagerV1
-	var seat *wlclient.Seat
-	var bindErr error
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case "ext_data_control_manager_v1":
-			dataControlMgr = ext_data_control.NewExtDataControlManagerV1(wlCtx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, dataControlMgr); err != nil {
-				bindErr = err
-			}
-		case "wl_seat":
-			if seat != nil {
-				return
-			}
-			seat = wlclient.NewSeat(wlCtx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, seat); err != nil {
-				bindErr = err
-			}
-		}
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	if bindErr != nil {
-		return fmt.Errorf("registry bind: %w", bindErr)
-	}
-
-	if dataControlMgr == nil {
-		return fmt.Errorf("compositor does not support ext_data_control_manager_v1")
-	}
-	defer dataControlMgr.Destroy()
-
-	if seat == nil {
-		return fmt.Errorf("no seat available")
-	}
-
-	device, err := dataControlMgr.GetDataDevice(seat)
-	if err != nil {
-		return fmt.Errorf("get data device: %w", err)
-	}
-	defer device.Destroy()
-
-	offerMimeTypes := make(map[*ext_data_control.ExtDataControlOfferV1][]string)
-
-	device.SetDataOfferHandler(func(e ext_data_control.ExtDataControlDeviceV1DataOfferEvent) {
-		if e.Id == nil {
-			return
-		}
-		offerMimeTypes[e.Id] = nil
-		e.Id.SetOfferHandler(func(me ext_data_control.ExtDataControlOfferV1OfferEvent) {
-			offerMimeTypes[e.Id] = append(offerMimeTypes[e.Id], me.MimeType)
-		})
-	})
-
-	device.SetSelectionHandler(func(e ext_data_control.ExtDataControlDeviceV1SelectionEvent) {
-		if e.Id == nil {
-			return
-		}
-
-		mimes := offerMimeTypes[e.Id]
-		selectedMime := selectPreferredMimeType(mimes)
-		if selectedMime == "" {
-			return
-		}
-
-		r, w, err := os.Pipe()
-		if err != nil {
-			return
-		}
-
-		if err := e.Id.Receive(selectedMime, int(w.Fd())); err != nil {
-			w.Close()
-			r.Close()
-			return
-		}
-		w.Close()
-
-		go func() {
-			defer r.Close()
-			data, err := io.ReadAll(r)
-			if err != nil || len(data) == 0 {
-				return
-			}
-			callback(data, selectedMime)
-		}()
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-			if err := wlCtx.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-				return fmt.Errorf("set read deadline: %w", err)
-			}
-			if err := wlCtx.Dispatch(); err != nil {
-				if isTimeoutError(err) {
-					continue
-				}
-				return fmt.Errorf("dispatch: %w", err)
-			}
-		}
-	}
-}
-
-func WatchAll(ctx context.Context, callback func(data []byte, mimeType string, allMimeTypes []string)) error {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return fmt.Errorf("wayland connect: %w", err)
-	}
-	defer display.Destroy()
-
-	wlCtx := display.Context()
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return fmt.Errorf("get registry: %w", err)
-	}
-	defer registry.Destroy()
-
-	var dataControlMgr *ext_data_control.ExtDataControlManagerV1
-	var seat *wlclient.Seat
-	var bindErr error
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case "ext_data_control_manager_v1":
-			dataControlMgr = ext_data_control.NewExtDataControlManagerV1(wlCtx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, dataControlMgr); err != nil {
-				bindErr = err
-			}
-		case "wl_seat":
-			if seat != nil {
-				return
-			}
-			seat = wlclient.NewSeat(wlCtx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, seat); err != nil {
-				bindErr = err
-			}
-		}
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	if bindErr != nil {
-		return fmt.Errorf("registry bind: %w", bindErr)
-	}
-	if dataControlMgr == nil {
-		return fmt.Errorf("compositor does not support ext_data_control_manager_v1")
-	}
-	defer dataControlMgr.Destroy()
-	if seat == nil {
-		return fmt.Errorf("no seat available")
-	}
-
-	device, err := dataControlMgr.GetDataDevice(seat)
-	if err != nil {
-		return fmt.Errorf("get data device: %w", err)
-	}
-	defer device.Destroy()
-
-	offerMimeTypes := make(map[*ext_data_control.ExtDataControlOfferV1][]string)
-
-	device.SetDataOfferHandler(func(e ext_data_control.ExtDataControlDeviceV1DataOfferEvent) {
-		if e.Id == nil {
-			return
-		}
-		offerMimeTypes[e.Id] = nil
-		e.Id.SetOfferHandler(func(me ext_data_control.ExtDataControlOfferV1OfferEvent) {
-			offerMimeTypes[e.Id] = append(offerMimeTypes[e.Id], me.MimeType)
-		})
-	})
-
-	device.SetSelectionHandler(func(e ext_data_control.ExtDataControlDeviceV1SelectionEvent) {
-		if e.Id == nil {
-			return
-		}
-
-		mimes := offerMimeTypes[e.Id]
-		selectedMime := selectPreferredMimeType(mimes)
-		if selectedMime == "" {
-			return
-		}
-
-		mimesCopy := make([]string, len(mimes))
-		copy(mimesCopy, mimes)
-
-		r, w, err := os.Pipe()
-		if err != nil {
-			return
-		}
-
-		if err := e.Id.Receive(selectedMime, int(w.Fd())); err != nil {
-			w.Close()
-			r.Close()
-			return
-		}
-		w.Close()
-
-		go func() {
-			defer r.Close()
-			data, err := io.ReadAll(r)
-			if err != nil || len(data) == 0 {
-				return
-			}
-			callback(data, selectedMime, mimesCopy)
-		}()
-	})
-
-	display.Roundtrip()
-	display.Roundtrip()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-			if err := wlCtx.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-				return fmt.Errorf("set read deadline: %w", err)
-			}
-			if err := wlCtx.Dispatch(); err != nil {
-				if isTimeoutError(err) {
-					continue
-				}
-				return fmt.Errorf("dispatch: %w", err)
-			}
-		}
-	}
-}
-
-func isTimeoutError(err error) bool {
-	if err == nil {
-		return false
-	}
-	if errors.Is(err, os.ErrDeadlineExceeded) {
-		return true
-	}
-	if netErr, ok := err.(interface{ Timeout() bool }); ok && netErr.Timeout() {
-		return true
-	}
-	return false
-}
-
-func WatchChan(ctx context.Context) (<-chan ClipboardChange, <-chan error) {
-	ch := make(chan ClipboardChange, 16)
-	errCh := make(chan error, 1)
-
-	go func() {
-		defer close(ch)
-		err := Watch(ctx, func(data []byte, mimeType string) {
-			select {
-			case ch <- ClipboardChange{Data: data, MimeType: mimeType}:
-			default:
-			}
-		})
-		if err != nil && err != context.Canceled {
-			errCh <- err
-		}
-		close(errCh)
-	}()
-
-	time.Sleep(50 * time.Millisecond)
-	return ch, errCh
-}

core/internal/colorpicker/picker.go

@@ -39,10 +39,11 @@ type LayerSurface struct {
 	wlSurface   *client.Surface
 	layerSurf   *wlr_layer_shell.ZwlrLayerSurfaceV1
 	viewport    *wp_viewporter.WpViewport
-	wlPools     [2]*client.ShmPool
+	wlPool      *client.ShmPool
-	wlBuffers   [2]*client.Buffer
+	wlBuffer    *client.Buffer
-	slotBusy    [2]bool
+	bufferBusy  bool
-	needsRedraw bool
+	oldPool     *client.ShmPool
+	oldBuffer   *client.Buffer
 	scopyBuffer *client.Buffer
 	configured  bool
 	hidden      bool
@@ -135,7 +136,6 @@ func (p *Picker) Run() (*Color, error) {
 			break
 		}
 
-		p.flushRedraws()
 		p.checkDone()
 	}
 
@@ -164,15 +164,6 @@ func (p *Picker) checkDone() {
 	}
 }
 
-func (p *Picker) flushRedraws() {
-	for _, ls := range p.surfaces {
-		if !ls.needsRedraw {
-			continue
-		}
-		p.redrawSurface(ls)
-	}
-}
-
 func (p *Picker) connect() error {
 	display, err := client.Connect("")
 	if err != nil {
@@ -230,7 +221,10 @@ func (p *Picker) handleGlobal(e client.RegistryGlobalEvent) {
 
 	case client.OutputInterfaceName:
 		output := client.NewOutput(p.ctx)
-		version := min(e.Version, 4)
+		version := e.Version
+		if version > 4 {
+			version = 4
+		}
 		if err := p.registry.Bind(e.Name, e.Interface, version, output); err == nil {
 			p.outputsMu.Lock()
 			p.outputs[e.Name] = &Output{
@@ -245,14 +239,20 @@ func (p *Picker) handleGlobal(e client.RegistryGlobalEvent) {
 
 	case wlr_layer_shell.ZwlrLayerShellV1InterfaceName:
 		layerShell := wlr_layer_shell.NewZwlrLayerShellV1(p.ctx)
-		version := min(e.Version, 4)
+		version := e.Version
+		if version > 4 {
+			version = 4
+		}
 		if err := p.registry.Bind(e.Name, e.Interface, version, layerShell); err == nil {
 			p.layerShell = layerShell
 		}
 
 	case wlr_screencopy.ZwlrScreencopyManagerV1InterfaceName:
 		screencopy := wlr_screencopy.NewZwlrScreencopyManagerV1(p.ctx)
-		version := min(e.Version, 3)
+		version := e.Version
+		if version > 3 {
+			version = 3
+		}
 		if err := p.registry.Bind(e.Name, e.Interface, version, screencopy); err == nil {
 			p.screencopy = screencopy
 		}
@@ -516,45 +516,47 @@ func (p *Picker) captureForSurface(ls *LayerSurface) {
 }
 
 func (p *Picker) redrawSurface(ls *LayerSurface) {
-	slot := ls.state.FrontIndex()
-	if ls.slotBusy[slot] {
-		ls.needsRedraw = true
-		return
-	}
-
 	var renderBuf *ShmBuffer
-	switch {
+	if ls.hidden {
-	case ls.hidden:
 		renderBuf = ls.state.RedrawScreenOnly()
-	default:
+	} else {
 		renderBuf = ls.state.Redraw()
 	}
 	if renderBuf == nil {
 		return
 	}
 
-	ls.needsRedraw = false
+	if ls.oldBuffer != nil {
+		ls.oldBuffer.Destroy()
+		ls.oldBuffer = nil
+	}
+	if ls.oldPool != nil {
+		ls.oldPool.Destroy()
+		ls.oldPool = nil
+	}
+
+	ls.oldPool = ls.wlPool
+	ls.oldBuffer = ls.wlBuffer
+	ls.wlPool = nil
+	ls.wlBuffer = nil
 
-	if ls.wlPools[slot] == nil {
 	pool, err := p.shm.CreatePool(renderBuf.Fd(), int32(renderBuf.Size()))
 	if err != nil {
 		return
 	}
-		ls.wlPools[slot] = pool
+	ls.wlPool = pool
 
 	wlBuffer, err := pool.CreateBuffer(0, int32(renderBuf.Width), int32(renderBuf.Height), int32(renderBuf.Stride), uint32(ls.state.ScreenFormat()))
 	if err != nil {
 		return
 	}
-		ls.wlBuffers[slot] = wlBuffer
+	ls.wlBuffer = wlBuffer
 
-		s := slot
+	lsRef := ls
 	wlBuffer.SetReleaseHandler(func(e client.BufferReleaseEvent) {
-			ls.slotBusy[s] = false
+		lsRef.bufferBusy = false
 	})
-	}
+	ls.bufferBusy = true
-
-	ls.slotBusy[slot] = true
 
 	logicalW, logicalH := ls.state.LogicalSize()
 	if logicalW == 0 || logicalH == 0 {
@@ -573,7 +575,7 @@ func (p *Picker) redrawSurface(ls *LayerSurface) {
 		}
 		_ = ls.wlSurface.SetBufferScale(bufferScale)
 	}
-	_ = ls.wlSurface.Attach(ls.wlBuffers[slot], 0, 0)
+	_ = ls.wlSurface.Attach(wlBuffer, 0, 0)
 	_ = ls.wlSurface.Damage(0, 0, int32(logicalW), int32(logicalH))
 	_ = ls.wlSurface.Commit()
 
@@ -641,7 +643,7 @@ func (p *Picker) setupPointerHandlers() {
 		}
 
 		p.activeSurface.state.OnPointerMotion(e.SurfaceX, e.SurfaceY)
-		p.activeSurface.needsRedraw = true
+		p.redrawSurface(p.activeSurface)
 	})
 
 	p.pointer.SetLeaveHandler(func(e client.PointerLeaveEvent) {
@@ -662,7 +664,7 @@ func (p *Picker) setupPointerHandlers() {
 			return
 		}
 		p.activeSurface.state.OnPointerMotion(e.SurfaceX, e.SurfaceY)
-		p.activeSurface.needsRedraw = true
+		p.redrawSurface(p.activeSurface)
 	})
 
 	p.pointer.SetButtonHandler(func(e client.PointerButtonEvent) {
@@ -686,13 +688,17 @@ func (p *Picker) cleanup() {
 		if ls.scopyBuffer != nil {
 			ls.scopyBuffer.Destroy()
 		}
-		for i := range ls.wlBuffers {
+		if ls.oldBuffer != nil {
-			if ls.wlBuffers[i] != nil {
+			ls.oldBuffer.Destroy()
-				ls.wlBuffers[i].Destroy()
 		}
-			if ls.wlPools[i] != nil {
+		if ls.oldPool != nil {
-				ls.wlPools[i].Destroy()
+			ls.oldPool.Destroy()
 		}
+		if ls.wlBuffer != nil {
+			ls.wlBuffer.Destroy()
+		}
+		if ls.wlPool != nil {
+			ls.wlPool.Destroy()
 		}
 		if ls.viewport != nil {
 			ls.viewport.Destroy()

core/internal/colorpicker/state.go

@@ -274,12 +274,6 @@ func (s *SurfaceState) FrontRenderBuffer() *ShmBuffer {
 	return s.renderBufs[s.front]
 }
 
-func (s *SurfaceState) FrontIndex() int {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.front
-}
-
 func (s *SurfaceState) SwapBuffers() {
 	s.mu.Lock()
 	s.front ^= 1
@@ -1163,7 +1157,7 @@ func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color,
 		rOff, bOff = 2, 0
 	}
 
-	for row := range fontH {
+	for row := 0; row < fontH; row++ {
 		yy := y + row
 		if yy < 0 || yy >= height {
 			continue
@@ -1171,7 +1165,7 @@ func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color,
 		rowPattern := g[row]
 		dstRowOff := yy * stride
 
-		for colIdx := range fontW {
+		for colIdx := 0; colIdx < fontW; colIdx++ {
 			if (rowPattern & (1 << (fontW - 1 - colIdx))) == 0 {
 				continue
 			}