core: remove ascii art from version

core/cmd/dms/commands_common.go

@@ -171,8 +171,7 @@ var pluginsUpdateCmd = &cobra.Command{
 }
 
 func runVersion(cmd *cobra.Command, args []string) {
-	printASCII()
-	fmt.Printf("%s\n", formatVersion(Version))
+	fmt.Printf("%s", formatVersion(Version))
 }
 
 // Git builds: dms (git) v0.6.2-XXXX

core/internal/server/wlroutput/manager.go

@@ -241,6 +241,7 @@ func (m *Manager) handleHead(e wlr_output_management.ZwlrOutputManagerV1HeadEven
 	handle.SetAdaptiveSyncHandler(func(e wlr_output_management.ZwlrOutputHeadV1AdaptiveSyncEvent) {
 		log.Debugf("WlrOutput: Head %d adaptive sync: %d", headID, e.State)
 		head.adaptiveSync = e.State
+		head.adaptiveSyncSupported = true
 		m.post(func() {
 			m.updateState()
 		})
@@ -360,22 +361,23 @@ func (m *Manager) updateState() {
 		}
 
 		output := Output{
-			Name:           head.name,
-			Description:    head.description,
-			Make:           head.make,
-			Model:          head.model,
-			SerialNumber:   head.serialNumber,
-			PhysicalWidth:  head.physicalWidth,
-			PhysicalHeight: head.physicalHeight,
-			Enabled:        head.enabled,
-			X:              head.x,
-			Y:              head.y,
-			Transform:      head.transform,
-			Scale:          head.scale,
-			CurrentMode:    currentMode,
-			Modes:          modes,
-			AdaptiveSync:   head.adaptiveSync,
-			ID:             head.id,
+			Name:                  head.name,
+			Description:           head.description,
+			Make:                  head.make,
+			Model:                 head.model,
+			SerialNumber:          head.serialNumber,
+			PhysicalWidth:         head.physicalWidth,
+			PhysicalHeight:        head.physicalHeight,
+			Enabled:               head.enabled,
+			X:                     head.x,
+			Y:                     head.y,
+			Transform:             head.transform,
+			Scale:                 head.scale,
+			CurrentMode:           currentMode,
+			Modes:                 modes,
+			AdaptiveSync:          head.adaptiveSync,
+			AdaptiveSyncSupported: head.adaptiveSyncSupported,
+			ID:                    head.id,
 		}
 		outputs = append(outputs, output)
 		return true

core/internal/server/wlroutput/types.go

@@ -17,22 +17,23 @@ type OutputMode struct {
 }
 
 type Output struct {
-	Name           string       `json:"name"`
-	Description    string       `json:"description"`
-	Make           string       `json:"make"`
-	Model          string       `json:"model"`
-	SerialNumber   string       `json:"serialNumber"`
-	PhysicalWidth  int32        `json:"physicalWidth"`
-	PhysicalHeight int32        `json:"physicalHeight"`
-	Enabled        bool         `json:"enabled"`
-	X              int32        `json:"x"`
-	Y              int32        `json:"y"`
-	Transform      int32        `json:"transform"`
-	Scale          float64      `json:"scale"`
-	CurrentMode    *OutputMode  `json:"currentMode"`
-	Modes          []OutputMode `json:"modes"`
-	AdaptiveSync   uint32       `json:"adaptiveSync"`
-	ID             uint32       `json:"id"`
+	Name                  string       `json:"name"`
+	Description           string       `json:"description"`
+	Make                  string       `json:"make"`
+	Model                 string       `json:"model"`
+	SerialNumber          string       `json:"serialNumber"`
+	PhysicalWidth         int32        `json:"physicalWidth"`
+	PhysicalHeight        int32        `json:"physicalHeight"`
+	Enabled               bool         `json:"enabled"`
+	X                     int32        `json:"x"`
+	Y                     int32        `json:"y"`
+	Transform             int32        `json:"transform"`
+	Scale                 float64      `json:"scale"`
+	CurrentMode           *OutputMode  `json:"currentMode"`
+	Modes                 []OutputMode `json:"modes"`
+	AdaptiveSync          uint32       `json:"adaptiveSync"`
+	AdaptiveSyncSupported bool         `json:"adaptiveSyncSupported"`
+	ID                    uint32       `json:"id"`
 }
 
 type State struct {
@@ -72,25 +73,26 @@ type Manager struct {
 }
 
 type headState struct {
-	id             uint32
-	handle         *wlr_output_management.ZwlrOutputHeadV1
-	name           string
-	description    string
-	make           string
-	model          string
-	serialNumber   string
-	physicalWidth  int32
-	physicalHeight int32
-	enabled        bool
-	x              int32
-	y              int32
-	transform      int32
-	scale          float64
-	currentModeID  uint32
-	modeIDs        []uint32
-	adaptiveSync   uint32
-	finished       bool
-	ready          bool
+	id                    uint32
+	handle                *wlr_output_management.ZwlrOutputHeadV1
+	name                  string
+	description           string
+	make                  string
+	model                 string
+	serialNumber          string
+	physicalWidth         int32
+	physicalHeight        int32
+	enabled               bool
+	x                     int32
+	y                     int32
+	transform             int32
+	scale                 float64
+	currentModeID         uint32
+	modeIDs               []uint32
+	adaptiveSync          uint32
+	adaptiveSyncSupported bool
+	finished              bool
+	ready                 bool
 }
 
 type modeState struct {
@@ -169,7 +171,7 @@ func stateChanged(old, new *State) bool {
 		if oldOut.Transform != newOut.Transform || oldOut.Scale != newOut.Scale {
 			return true
 		}
-		if oldOut.AdaptiveSync != newOut.AdaptiveSync {
+		if oldOut.AdaptiveSync != newOut.AdaptiveSync || oldOut.AdaptiveSyncSupported != newOut.AdaptiveSyncSupported {
 			return true
 		}
 		if (oldOut.CurrentMode == nil) != (newOut.CurrentMode == nil) {

distro/ubuntu/danklinux/danksearch/debian/changelog

@@ -1,5 +0,0 @@
-danksearch (0.0.7ppa3) questing; urgency=medium
-
-  * Rebuild for packaging fixes (ppa3)
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Fri, 21 Nov 2025 14:19:58 -0500

distro/ubuntu/danklinux/danksearch/debian/control

@@ -1,24 +0,0 @@
-Source: danksearch
-Section: utils
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/danksearch
-Vcs-Browser: https://github.com/AvengeMedia/danksearch
-Vcs-Git: https://github.com/AvengeMedia/danksearch.git
-
-Package: danksearch
-Architecture: amd64 arm64
-Depends: ${misc:Depends}
-Description: Fast file search utility for DMS
- DankSearch is a fast file search utility designed for DankMaterialShell.
- It provides efficient file and content search capabilities with minimal
- dependencies. This package contains the pre-built binary from the official
- GitHub release.
- .
- Features include:
-  - Fast file searching
-  - Lightweight and efficient
-  - Designed for DMS integration
-  - Minimal resource usage

distro/ubuntu/danklinux/danksearch/debian/copyright

@@ -1,24 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: danksearch
-Upstream-Contact: Avenge Media LLC <AvengeMedia.US@gmail.com>
-Source: https://github.com/AvengeMedia/danksearch
-
-Files: *
-Copyright: 2025 Avenge Media LLC
-License: GPL-3.0-only
-
-License: GPL-3.0-only
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 3 as
- published by the Free Software Foundation.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

distro/ubuntu/danklinux/danksearch/debian/rules

@@ -1,33 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-# Detect architecture for selecting correct binary
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-# Map Debian arch to binary filename
-ifeq ($(DEB_HOST_ARCH),amd64)
-    BINARY_FILE := dsearch-amd64
-else ifeq ($(DEB_HOST_ARCH),arm64)
-    BINARY_FILE := dsearch-arm64
-else
-    $(error Unsupported architecture: $(DEB_HOST_ARCH))
-endif
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	# Binary is already included in source package (native format)
-	# Downloaded by build-source.sh before upload
-	# Just verify it exists and is executable
-	test -f $(BINARY_FILE) || (echo "ERROR: $(BINARY_FILE) not found!" && exit 1)
-	chmod +x $(BINARY_FILE)
-
-override_dh_auto_install:
-	# Install binary as danksearch
-	install -Dm755 $(BINARY_FILE) debian/danksearch/usr/bin/danksearch
-
-override_dh_auto_clean:
-	# Don't delete binaries - they're part of the source package (native format)
-	dh_auto_clean

distro/ubuntu/danklinux/danksearch/debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

distro/ubuntu/danklinux/dgop/debian/changelog

@@ -1,9 +0,0 @@
-dgop (0.1.11ppa2) questing; urgency=medium
-
-  * Rebuild for Questing (25.10) - Ubuntu 25.10+ only
-  * Stateless CPU/GPU monitoring tool
-  * Support for NVIDIA and AMD GPUs
-  * JSON output for integration
-  * Pre-built binary package for amd64 and arm64
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Sun, 16 Nov 2025 22:50:00 -0500

distro/ubuntu/danklinux/dgop/debian/control

@@ -1,27 +0,0 @@
-Source: dgop
-Section: utils
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13),
-               wget,
-               gzip
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/dgop
-Vcs-Browser: https://github.com/AvengeMedia/dgop
-Vcs-Git: https://github.com/AvengeMedia/dgop.git
-
-Package: dgop
-Architecture: amd64 arm64
-Depends: ${misc:Depends}
-Description: Stateless CPU/GPU monitor for DankMaterialShell
- DGOP is a stateless system monitoring tool that provides CPU, GPU,
- memory, and network statistics. Designed for integration with
- DankMaterialShell but can be used standalone.
- .
- Features:
-  - CPU usage monitoring
-  - GPU usage and temperature (NVIDIA, AMD)
-  - Memory and swap statistics
-  - Network traffic monitoring
-  - Zero-state design (no background processes)
-  - JSON output for easy integration

distro/ubuntu/danklinux/dgop/debian/copyright

@@ -1,27 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: dgop
-Upstream-Contact: Avenge Media LLC <AvengeMedia.US@gmail.com>
-Source: https://github.com/AvengeMedia/dgop
-
-Files: *
-Copyright: 2025 Avenge Media LLC
-License: MIT
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.

distro/ubuntu/danklinux/dgop/debian/rules

@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-# Extract version from debian/changelog
-DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
-# Get upstream version (strip -1ppa1 suffix)
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-
-# Detect architecture for downloading correct binary
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-# Map Debian arch to GitHub release arch names
-ifeq ($(DEB_HOST_ARCH),amd64)
-    GITHUB_ARCH := amd64
-else ifeq ($(DEB_HOST_ARCH),arm64)
-    GITHUB_ARCH := arm64
-else
-    $(error Unsupported architecture: $(DEB_HOST_ARCH))
-endif
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	# Binary is already included in source package (native format)
-	# Just verify it exists and is executable
-	test -f dgop || (echo "ERROR: dgop binary not found!" && exit 1)
-	chmod +x dgop
-
-override_dh_auto_install:
-	# Install binary
-	install -Dm755 dgop debian/dgop/usr/bin/dgop
-
-override_dh_auto_clean:
-	# Don't delete dgop binary - it's part of the source package (native format)
-	rm -f dgop.gz
-	dh_auto_clean

distro/ubuntu/danklinux/dgop/debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

quickshell/Common/ModalManager.qml

@@ -8,6 +8,9 @@ Singleton {
     id: modalManager
 
     signal closeAllModalsExcept(var excludedModal)
+    signal modalChanged
+
+    property var currentModalsByScreen: ({})
 
     function openModal(modal) {
         if (!modal.allowStacking) {
@@ -17,5 +20,17 @@ Singleton {
             PopoutManager.closeAllPopouts();
         }
         TrayMenuManager.closeAllMenus();
+
+        const screenName = modal.effectiveScreen?.name ?? "unknown";
+        currentModalsByScreen[screenName] = modal;
+        modalChanged();
+    }
+
+    function closeModal(modal) {
+        const screenName = modal.effectiveScreen?.name ?? "unknown";
+        if (currentModalsByScreen[screenName] === modal) {
+            delete currentModalsByScreen[screenName];
+            modalChanged();
+        }
     }
 }

quickshell/Common/SettingsData.qml

@@ -715,7 +715,42 @@ Singleton {
     }
 
     function detectAvailableIconThemes() {
-        Processes.detectIcons();
+        const xdgDataDirs = Quickshell.env("XDG_DATA_DIRS") || "";
+        const localData = Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericDataLocation));
+        const homeDir = Paths.strip(StandardPaths.writableLocation(StandardPaths.HomeLocation));
+
+        const dataDirs = xdgDataDirs.trim() !== "" ? xdgDataDirs.split(":").concat([localData]) : ["/usr/share", "/usr/local/share", localData];
+
+        const iconPaths = dataDirs.map(d => d + "/icons").concat([homeDir + "/.icons"]);
+        const pathsArg = iconPaths.join(" ");
+
+        const script = `
+            echo "SYSDEFAULT:$(gsettings get org.gnome.desktop.interface icon-theme 2>/dev/null | sed "s/'//g" || echo '')"
+            for dir in ${pathsArg}; do
+                [ -d "$dir" ] || continue
+                for theme in "$dir"/*/; do
+                    [ -d "$theme" ] || continue
+                    basename "$theme"
+                done
+            done | grep -v '^icons$' | grep -v '^default$' | grep -v '^hicolor$' | grep -v '^locolor$' | sort -u
+        `;
+
+        Proc.runCommand("detectIconThemes", ["sh", "-c", script], (output, exitCode) => {
+            const themes = ["System Default"];
+            if (output && output.trim()) {
+                const lines = output.trim().split('\n');
+                for (let i = 0; i < lines.length; i++) {
+                    const line = lines[i].trim();
+                    if (line.startsWith("SYSDEFAULT:")) {
+                        systemDefaultIconTheme = line.substring(11).trim();
+                        continue;
+                    }
+                    if (line)
+                        themes.push(line);
+                }
+            }
+            availableIconThemes = themes;
+        });
     }
 
     function getEffectiveTimeFormat() {

quickshell/Common/settings/Processes.qml

@@ -1,5 +1,4 @@
 pragma Singleton
-
 pragma ComponentBehavior: Bound
 
 import QtQuick
@@ -11,61 +10,20 @@ Singleton {
 
     property var settingsRoot: null
 
-    function detectIcons() {
-        systemDefaultDetectionProcess.running = true
-    }
-
     function detectQtTools() {
-        qtToolsDetectionProcess.running = true
+        qtToolsDetectionProcess.running = true;
     }
 
     function detectFprintd() {
-        fprintdDetectionProcess.running = true
+        fprintdDetectionProcess.running = true;
     }
 
     function checkPluginSettings() {
-        pluginSettingsCheckProcess.running = true
+        pluginSettingsCheckProcess.running = true;
     }
 
     function checkDefaultSettings() {
-        defaultSettingsCheckProcess.running = true
-    }
-
-    property var systemDefaultDetectionProcess: Process {
-        command: ["sh", "-c", "gsettings get org.gnome.desktop.interface icon-theme 2>/dev/null | sed \"s/'//g\" || echo ''"]
-        running: false
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
-            if (exitCode === 0 && stdout && stdout.length > 0) {
-                settingsRoot.systemDefaultIconTheme = stdout.trim();
-            } else {
-                settingsRoot.systemDefaultIconTheme = "";
-            }
-            iconThemeDetectionProcess.running = true;
-        }
-    }
-
-    property var iconThemeDetectionProcess: Process {
-
-        command: ["sh", "-c", "find /usr/share/icons ~/.local/share/icons ~/.icons -maxdepth 1 -type d 2>/dev/null | sed 's|.*/||' | grep -v '^icons$' | sort -u"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!settingsRoot) return
-                var detectedThemes = ["System Default"]
-                if (text && text.trim()) {
-                    var themes = text.trim().split('\n')
-                    for (var i = 0; i < themes.length; i++) {
-                        var theme = themes[i].trim()
-                        if (theme && theme !== "" && theme !== "default" && theme !== "hicolor" && theme !== "locolor") {
-                            detectedThemes.push(theme)
-                        }
-                    }
-                }
-                settingsRoot.availableIconThemes = detectedThemes
-            }
-        }
+        defaultSettingsCheckProcess.running = true;
     }
 
     property var qtToolsDetectionProcess: Process {
@@ -74,7 +32,8 @@ Singleton {
 
         stdout: StdioCollector {
             onStreamFinished: {
-                if (!settingsRoot) return;
+                if (!settingsRoot)
+                    return;
                 if (text && text.trim()) {
                     var lines = text.trim().split('\n');
                     for (var i = 0; i < lines.length; i++) {
@@ -95,8 +54,9 @@ Singleton {
     property var defaultSettingsCheckProcess: Process {
         command: ["sh", "-c", "CONFIG_DIR=\"" + (settingsRoot?._configDir || "") + "/DankMaterialShell\"; if [ -f \"$CONFIG_DIR/default-settings.json\" ] && [ ! -f \"$CONFIG_DIR/settings.json\" ]; then cp --no-preserve=mode \"$CONFIG_DIR/default-settings.json\" \"$CONFIG_DIR/settings.json\" && echo 'copied'; else echo 'not_found'; fi"]
         running: false
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
+        onExited: function (exitCode) {
+            if (!settingsRoot)
+                return;
             if (exitCode === 0) {
                 console.info("Copied default-settings.json to settings.json");
                 if (settingsRoot.settingsFile) {
@@ -113,8 +73,9 @@ Singleton {
     property var fprintdDetectionProcess: Process {
         command: ["sh", "-c", "command -v fprintd-list >/dev/null 2>&1"]
         running: false
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
+        onExited: function (exitCode) {
+            if (!settingsRoot)
+                return;
             settingsRoot.fprintdAvailable = (exitCode === 0);
         }
     }
@@ -123,8 +84,9 @@ Singleton {
         command: ["test", "-f", settingsRoot?.pluginSettingsPath || ""]
         running: false
 
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
+        onExited: function (exitCode) {
+            if (!settingsRoot)
+                return;
             settingsRoot.pluginSettingsFileExists = (exitCode === 0);
         }
     }

quickshell/Modals/Common/DankModal.qml

@@ -83,6 +83,7 @@ Item {
     function close() {
         shouldBeVisible = false;
         shouldHaveFocus = false;
+        ModalManager.closeModal(root);
         closeTimer.restart();
     }
 
@@ -90,6 +91,7 @@ Item {
         animationsEnabled = false;
         shouldBeVisible = false;
         shouldHaveFocus = false;
+        ModalManager.closeModal(root);
         closeTimer.stop();
         contentWindow.visible = false;
         if (useBackgroundWindow)

quickshell/Modules/BuiltinDesktopPlugins/DesktopClockWidget.qml

@@ -78,9 +78,11 @@ Item {
     readonly property color subtleTextColor: Theme.onSurfaceVariant
     readonly property color backgroundColor: Theme.withAlpha(Theme.surface, root.transparency)
 
+    readonly property bool needsSeconds: clockStyle === "analog" ? SettingsData.desktopClockShowAnalogSeconds : SettingsData.showSeconds
+
     SystemClock {
         id: systemClock
-        precision: SystemClock.Seconds
+        precision: root.needsSeconds ? SystemClock.Seconds : SystemClock.Minutes
     }
 
     Rectangle {

quickshell/Modules/Settings/DisplayConfig/DisplayConfigState.qml

@@ -431,7 +431,7 @@ Singleton {
                 "serial": output.serialNumber || "",
                 "modes": normalizedModes,
                 "current_mode": normalizedModes.findIndex(m => m.id === output.currentMode?.id),
-                "vrr_supported": output.adaptiveSync !== undefined,
+                "vrr_supported": output.adaptiveSyncSupported ?? false,
                 "vrr_enabled": output.adaptiveSync === 1,
                 "logical": {
                     "x": output.x ?? 0,

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -10,15 +10,11 @@ import qs.Modules.Settings.Widgets
 Item {
     id: themeColorsTab
 
-    property var cachedIconThemes: []
-    property var cachedMatugenSchemes: []
+    property var cachedIconThemes: SettingsData.availableIconThemes
+    property var cachedMatugenSchemes: Theme.availableMatugenSchemes.map(option => option.label)
 
     Component.onCompleted: {
         SettingsData.detectAvailableIconThemes();
-        cachedIconThemes = SettingsData.availableIconThemes;
-        cachedMatugenSchemes = Theme.availableMatugenSchemes.map(function (option) {
-            return option.label;
-        });
     }
 
     DankFlickable {

quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml

@@ -92,6 +92,7 @@ Scope {
                 readonly property bool shouldShowSpotlight: niriOverviewScope.searchActive && screen.name === niriOverviewScope.searchActiveScreen && !niriOverviewScope.isClosing
                 readonly property bool isSpotlightScreen: screen.name === niriOverviewScope.searchActiveScreen
                 property bool hasActivePopout: !!PopoutManager.currentPopoutsByScreen[screen.name]
+                property bool hasActiveModal: !!ModalManager.currentModalsByScreen[screen.name]
 
                 Connections {
                     target: PopoutManager
@@ -100,6 +101,13 @@ Scope {
                     }
                 }
 
+                Connections {
+                    target: ModalManager
+                    function onModalChanged() {
+                        overlayWindow.hasActiveModal = !!ModalManager.currentModalsByScreen[overlayWindow.screen.name];
+                    }
+                }
+
                 screen: modelData
                 visible: NiriService.inOverview || niriOverviewScope.isClosing
                 color: "transparent"
@@ -114,7 +122,7 @@ Scope {
                         return WlrKeyboardFocus.None;
                     if (niriOverviewScope.releaseKeyboard)
                         return WlrKeyboardFocus.None;
-                    if (hasActivePopout)
+                    if (hasActivePopout || hasActiveModal)
                         return WlrKeyboardFocus.None;
                     return WlrKeyboardFocus.Exclusive;
                 }

quickshell/matugen/vsix-build/extension.js

@@ -0,0 +1,86 @@
+const vscode = require("vscode");
+const path = require("path");
+const fs = require("fs");
+
+let watcher = null;
+let reloadTimeout = null;
+
+function activate(context) {
+  const themesDir = path.join(context.extensionPath, "themes");
+
+  try {
+    watcher = vscode.workspace.createFileSystemWatcher(
+      new vscode.RelativePattern(themesDir, "*.json")
+    );
+  } catch (e) {
+    return;
+  }
+
+  if (!watcher) return;
+
+  const reloadTheme = () => {
+    if (reloadTimeout) clearTimeout(reloadTimeout);
+
+    reloadTimeout = setTimeout(async () => {
+      const config = vscode.workspace.getConfiguration("workbench");
+      const currentTheme = config.get("colorTheme");
+
+      if (!currentTheme?.includes("DankShell")) return;
+
+      let themeFile;
+      switch (true) {
+        case currentTheme.includes("Light"):
+          themeFile = path.join(themesDir, "dankshell-light.json");
+          break;
+        case currentTheme.includes("Dark"):
+          themeFile = path.join(themesDir, "dankshell-dark.json");
+          break;
+        default:
+          themeFile = path.join(themesDir, "dankshell-default.json");
+      }
+
+      let themeData;
+      try {
+        const content = fs.readFileSync(themeFile, "utf8");
+        themeData = JSON.parse(content);
+      } catch (e) {
+        return;
+      }
+
+      const themeKey = `[${currentTheme}]`;
+
+      if (themeData.colors) {
+        const colorConfig = config.get("colorCustomizations") || {};
+        colorConfig[themeKey] = themeData.colors;
+        await config.update(
+          "colorCustomizations",
+          colorConfig,
+          vscode.ConfigurationTarget.Global
+        );
+      }
+
+      if (themeData.tokenColors) {
+        const editorConfig = vscode.workspace.getConfiguration("editor");
+        const tokenConfig = editorConfig.get("tokenColorCustomizations") || {};
+        tokenConfig[themeKey] = { textMateRules: themeData.tokenColors };
+        await editorConfig.update(
+          "tokenColorCustomizations",
+          tokenConfig,
+          vscode.ConfigurationTarget.Global
+        );
+      }
+    }, 150);
+  };
+
+  watcher.onDidChange(reloadTheme);
+  watcher.onDidCreate(reloadTheme);
+
+  context.subscriptions.push(watcher);
+}
+
+function deactivate() {
+  if (reloadTimeout) clearTimeout(reloadTimeout);
+  if (watcher) watcher.dispose();
+}
+
+module.exports = { activate, deactivate };

quickshell/matugen/vsix-build/package.json

@@ -7,6 +7,10 @@
   "engines": {
     "vscode": "^1.70.0"
   },
+  "main": "./extension.js",
+  "activationEvents": [
+    "onStartupFinished"
+  ],
   "categories": [
     "Themes"
   ],