gamma: fix initial night mode enablement

.github/workflows/release.yml

@@ -1,16 +1,19 @@
 name: Release
 
 on:
-  push:
-    tags:
-      - "v*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to release (e.g., v1.0.1)'
+        required: true
+        type: string
 
 permissions:
   contents: write
   actions: write
 
 concurrency:
-  group: release-${{ github.ref_name }}
+  group: release-${{ inputs.tag }}
   cancel-in-progress: true
 
 jobs:
@@ -24,10 +27,14 @@ jobs:
       run:
         working-directory: core
 
+    env:
+      TAG: ${{ inputs.tag }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.tag }}
           fetch-depth: 0
 
       - name: Set up Go
@@ -54,7 +61,7 @@ jobs:
         run: |
           set -eux
           cd cmd/dankinstall
-          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+          go build -trimpath -ldflags "-s -w -X main.Version=${TAG}" \
             -o ../../dankinstall-${{ matrix.arch }}
           cd ../..
           gzip -9 -k dankinstall-${{ matrix.arch }}
@@ -68,7 +75,7 @@ jobs:
         run: |
           set -eux
           cd cmd/dms
-          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+          go build -trimpath -ldflags "-s -w -X main.Version=${TAG}" \
             -o ../../dms-${{ matrix.arch }}
           cd ../..
           gzip -9 -k dms-${{ matrix.arch }}
@@ -91,7 +98,7 @@ jobs:
         run: |
           set -eux
           cd cmd/dms
-          go build -trimpath -tags distro_binary -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+          go build -trimpath -tags distro_binary -ldflags "-s -w -X main.Version=${TAG}" \
             -o ../../dms-distropkg-${{ matrix.arch }}
           cd ../..
           gzip -9 -k dms-distropkg-${{ matrix.arch }}
@@ -171,17 +178,18 @@ jobs:
     runs-on: ubuntu-24.04
     needs: [build-core] #, update-versions]
     env:
-      TAG: ${{ github.ref_name }}
+      TAG: ${{ inputs.tag }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.tag }}
           fetch-depth: 0
 
       - name: Fetch updated tag after version bump
         run: |
-          git fetch origin --force tag ${{ github.ref_name }}
-          git checkout ${{ github.ref_name }}
+          git fetch origin --force tag ${TAG}
+          git checkout ${TAG}
 
       - name: Download core artifacts
         uses: actions/download-artifact@v4
@@ -391,9 +399,13 @@ jobs:
   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: |
@@ -413,16 +425,19 @@ jobs:
 
       - name: Update OBS packages
         run: |
-          VERSION="${{ github.ref_name }}"
           cd distro
-          bash scripts/obs-upload.sh dms "Update to $VERSION"
+          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: |
@@ -446,7 +461,6 @@ jobs:
 
       - name: Upload to PPA
         run: |
-          VERSION="${{ github.ref_name }}"
           cd distro/ubuntu/ppa
           bash create-and-upload.sh ../dms dms questing
 
@@ -454,11 +468,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: release
     env:
-      TAG: ${{ github.ref_name }}
+      TAG: ${{ inputs.tag }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.tag }}
 
       - name: Determine version
         id: version

core/cmd/dms/shell.go

@@ -155,6 +155,7 @@ func runShellInteractive(session bool) {
 				errChan <- fmt.Errorf("server panic: %v", r)
 			}
 		}()
+		server.CLIVersion = Version
 		if err := server.Start(false); err != nil {
 			errChan <- fmt.Errorf("server error: %w", err)
 		}

core/internal/distros/arch.go

@@ -344,7 +344,7 @@ func (a *ArchDistribution) InstallPackages(ctx context.Context, dependencies []d
 		a.log(fmt.Sprintf("Warning: failed to write window manager config: %v", err))
 	}
 
-	if err := a.EnableDMSService(ctx); err != nil {
+	if err := a.EnableDMSService(ctx, wm); err != nil {
 		a.log(fmt.Sprintf("Warning: failed to enable dms service: %v", err))
 	}
 

core/internal/distros/base.go

@@ -597,12 +597,24 @@ TERMINAL=%s
 	return nil
 }
 
-func (b *BaseDistribution) EnableDMSService(ctx context.Context) error {
+func (b *BaseDistribution) EnableDMSService(ctx context.Context, wm deps.WindowManager) error {
 	cmd := exec.CommandContext(ctx, "systemctl", "--user", "enable", "--now", "dms")
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("failed to enable dms service: %w", err)
 	}
 	b.log("Enabled dms systemd user service")
+
+	switch wm {
+	case deps.WindowManagerNiri:
+		if err := exec.CommandContext(ctx, "systemctl", "--user", "add-wants", "niri.service", "dms").Run(); err != nil {
+			b.log("Warning: failed to add dms as a want for niri.service")
+		}
+	case deps.WindowManagerHyprland:
+		if err := exec.CommandContext(ctx, "systemctl", "--user", "add-wants", "hyprland-session.target", "dms").Run(); err != nil {
+			b.log("Warning: failed to add dms as a want for hyprland-session.target")
+		}
+	}
+
 	return nil
 }
 

core/internal/distros/debian.go

@@ -312,7 +312,7 @@ func (d *DebianDistribution) InstallPackages(ctx context.Context, dependencies [
 		d.log(fmt.Sprintf("Warning: failed to write window manager config: %v", err))
 	}
 
-	if err := d.EnableDMSService(ctx); err != nil {
+	if err := d.EnableDMSService(ctx, wm); err != nil {
 		d.log(fmt.Sprintf("Warning: failed to enable dms service: %v", err))
 	}
 

core/internal/distros/fedora.go

@@ -353,7 +353,7 @@ func (f *FedoraDistribution) InstallPackages(ctx context.Context, dependencies [
 		f.log(fmt.Sprintf("Warning: failed to write window manager config: %v", err))
 	}
 
-	if err := f.EnableDMSService(ctx); err != nil {
+	if err := f.EnableDMSService(ctx, wm); err != nil {
 		f.log(fmt.Sprintf("Warning: failed to enable dms service: %v", err))
 	}
 

core/internal/distros/gentoo.go

@@ -410,7 +410,7 @@ func (g *GentooDistribution) InstallPackages(ctx context.Context, dependencies [
 		g.log(fmt.Sprintf("Warning: failed to write window manager config: %v", err))
 	}
 
-	if err := g.EnableDMSService(ctx); err != nil {
+	if err := g.EnableDMSService(ctx, wm); err != nil {
 		g.log(fmt.Sprintf("Warning: failed to enable dms service: %v", err))
 	}
 

core/internal/distros/opensuse.go

@@ -371,7 +371,7 @@ func (o *OpenSUSEDistribution) InstallPackages(ctx context.Context, dependencies
 		o.log(fmt.Sprintf("Warning: failed to write window manager config: %v", err))
 	}
 
-	if err := o.EnableDMSService(ctx); err != nil {
+	if err := o.EnableDMSService(ctx, wm); err != nil {
 		o.log(fmt.Sprintf("Warning: failed to enable dms service: %v", err))
 	}
 

core/internal/distros/ubuntu.go

@@ -331,7 +331,7 @@ func (u *UbuntuDistribution) InstallPackages(ctx context.Context, dependencies [
 		u.log(fmt.Sprintf("Warning: failed to write window manager config: %v", err))
 	}
 
-	if err := u.EnableDMSService(ctx); err != nil {
+	if err := u.EnableDMSService(ctx, wm); err != nil {
 		u.log(fmt.Sprintf("Warning: failed to enable dms service: %v", err))
 	}
 

core/internal/keybinds/providers/niri.go

@@ -6,6 +6,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds"
@@ -153,6 +154,7 @@ func (n *NiriProvider) convertKeybind(kb *NiriKeyBinding, subcategory string, co
 		Subcategory:   subcategory,
 		Source:        source,
 		HideOnOverlay: kb.HideOnOverlay,
+		CooldownMs:    kb.CooldownMs,
 	}
 
 	if source == "dms" && conflicts != nil {
@@ -310,7 +312,9 @@ func (n *NiriProvider) extractOptions(node *document.Node) map[string]any {
 		opts["repeat"] = val.String() == "true"
 	}
 	if val, ok := node.Properties.Get("cooldown-ms"); ok {
-		opts["cooldown-ms"] = val.String()
+		if ms, err := strconv.Atoi(val.String()); err == nil {
+			opts["cooldown-ms"] = ms
+		}
 	}
 	if val, ok := node.Properties.Get("allow-when-locked"); ok {
 		opts["allow-when-locked"] = val.String() == "true"
@@ -336,7 +340,14 @@ func (n *NiriProvider) buildBindNode(bind *overrideBind) *document.Node {
 			node.AddProperty("repeat", false, "")
 		}
 		if v, ok := bind.Options["cooldown-ms"]; ok {
-			node.AddProperty("cooldown-ms", v, "")
+			switch val := v.(type) {
+			case int:
+				node.AddProperty("cooldown-ms", val, "")
+			case string:
+				if ms, err := strconv.Atoi(val); err == nil {
+					node.AddProperty("cooldown-ms", ms, "")
+				}
+			}
 		}
 		if v, ok := bind.Options["allow-when-locked"]; ok && v == true {
 			node.AddProperty("allow-when-locked", true, "")

core/internal/keybinds/providers/niri_parser.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 
 	"github.com/sblinch/kdl-go"
@@ -17,6 +18,7 @@ type NiriKeyBinding struct {
 	Args          []string
 	Description   string
 	HideOnOverlay bool
+	CooldownMs    int
 	Source        string
 }
 
@@ -275,6 +277,7 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
 
 	var description string
 	var hideOnOverlay bool
+	var cooldownMs int
 	if node.Properties != nil {
 		if val, ok := node.Properties.Get("hotkey-overlay-title"); ok {
 			switch val.ValueString() {
@@ -284,6 +287,9 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
 				description = val.ValueString()
 			}
 		}
+		if val, ok := node.Properties.Get("cooldown-ms"); ok {
+			cooldownMs, _ = strconv.Atoi(val.String())
+		}
 	}
 
 	return &NiriKeyBinding{
@@ -293,6 +299,7 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
 		Args:          args,
 		Description:   description,
 		HideOnOverlay: hideOnOverlay,
+		CooldownMs:    cooldownMs,
 		Source:        p.currentSource,
 	}
 }

core/internal/keybinds/types.go

@@ -7,6 +7,7 @@ type Keybind struct {
 	Subcategory   string   `json:"subcat,omitempty"`
 	Source        string   `json:"source,omitempty"`
 	HideOnOverlay bool     `json:"hideOnOverlay,omitempty"`
+	CooldownMs    int      `json:"cooldownMs,omitempty"`
 	Conflict      *Keybind `json:"conflict,omitempty"`
 }
 

core/internal/server/wayland/manager.go

@@ -643,6 +643,16 @@ func (m *Manager) applyCurrentTemp() {
 		return
 	}
 
+	m.configMutex.RLock()
+	low, high := m.config.LowTemp, m.config.HighTemp
+	m.configMutex.RUnlock()
+
+	if low == high {
+		m.applyGamma(low)
+		m.updateStateFromSchedule()
+		return
+	}
+
 	if !m.hasValidSchedule() {
 		m.updateStateFromSchedule()
 		return

quickshell/Modals/Settings/SettingsModal.qml

@@ -59,7 +59,7 @@ FloatingWindow {
     title: I18n.tr("Settings", "settings window title")
     minimumSize: Qt.size(500, 400)
     implicitWidth: 800
-    implicitHeight: 940
+    implicitHeight: screen ? Math.min(940, screen.height - 100) : 940
     color: Theme.surfaceContainer
     visible: false
 

quickshell/Modules/DankBar/DankBarContent.qml

@@ -1088,6 +1088,7 @@ Item {
         id: layoutComponent
 
         DWLLayout {
+            id: layoutWidget
             layoutPopupVisible: layoutPopoutLoader.item ? layoutPopoutLoader.item.shouldBeVisible : false
             widgetThickness: barWindow.widgetThickness
             barThickness: barWindow.effectiveBarThickness
@@ -1100,14 +1101,19 @@ Item {
             parentScreen: barWindow.screen
             onToggleLayoutPopup: {
                 layoutPopoutLoader.active = true;
+                if (!layoutPopoutLoader.item)
+                    return;
                 const effectiveBarConfig = topBarContent.barConfig;
                 const barPosition = barWindow.axis?.edge === "left" ? 2 : (barWindow.axis?.edge === "right" ? 3 : (barWindow.axis?.edge === "top" ? 0 : 1));
-                if (layoutPopoutLoader.item && layoutPopoutLoader.item.setBarContext) {
-                    layoutPopoutLoader.item.setBarContext(barPosition, effectiveBarConfig?.bottomGap ?? 0);
-                }
-                if (layoutPopoutLoader.item) {
-                    PopoutManager.requestPopout(layoutPopoutLoader.item, undefined, "layout");
+
+                if (layoutPopoutLoader.item.setTriggerPosition) {
+                    const globalPos = layoutWidget.mapToGlobal(0, 0);
+                    const pos = SettingsData.getPopupTriggerPosition(globalPos, barWindow.screen, barWindow.effectiveBarThickness, layoutWidget.width, effectiveBarConfig?.spacing ?? 4, barPosition, effectiveBarConfig);
+                    const widgetSection = topBarContent.getWidgetSection(parent) || "center";
+                    layoutPopoutLoader.item.setTriggerPosition(pos.x, pos.y, pos.width, widgetSection, barWindow.screen, barPosition, barWindow.effectiveBarThickness, effectiveBarConfig?.spacing ?? 4, effectiveBarConfig);
                 }
+
+                PopoutManager.requestPopout(layoutPopoutLoader.item, undefined, "layout");
             }
         }
     }

quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Effects
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Hyprland
@@ -245,11 +246,14 @@ Item {
             if (!byApp[key]) {
                 const moddedId = Paths.moddedAppId(keyBase);
                 const isSteamApp = moddedId.toLowerCase().includes("steam_app");
-                const icon = isSteamApp ? "" : DesktopService.resolveIconPath(moddedId);
+                const isQuickshell = keyBase === "org.quickshell";
+                const desktopEntry = DesktopEntries.heuristicLookup(keyBase);
+                const icon = isSteamApp ? "" : Paths.getAppIcon(keyBase, desktopEntry);
                 byApp[key] = {
                     "type": "icon",
                     "icon": icon,
                     "isSteamApp": isSteamApp,
+                    "isQuickshell": isQuickshell,
                     "active": !!((w.activated || w.is_focused) || (CompositorService.isNiri && w.is_focused)),
                     "count": 1,
                     "windowId": w.address || w.id,
@@ -446,6 +450,7 @@ Item {
     readonly property real padding: Math.max(Theme.spacingXS, Theme.spacingS * (widgetHeight / 30))
     readonly property real visualWidth: isVertical ? widgetHeight : (workspaceRow.implicitWidth + padding * 2)
     readonly property real visualHeight: isVertical ? (workspaceRow.implicitHeight + padding * 2) : widgetHeight
+    readonly property real appIconSize: Theme.barIconSize(barThickness, -6)
 
     function getRealWorkspaces() {
         return root.workspaceList.filter(ws => {
@@ -719,14 +724,14 @@ Item {
                 readonly property real iconsExtraWidth: {
                     if (!root.isVertical && SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
                         const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                        return numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
+                        return numIcons * root.appIconSize + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
                     }
                     return 0;
                 }
                 readonly property real iconsExtraHeight: {
                     if (root.isVertical && SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
                         const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                        return numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
+                        return numIcons * root.appIconSize + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
                     }
                     return 0;
                 }
@@ -897,7 +902,7 @@ Item {
                                     Item {
                                         visible: loadedHasIcon && loadedIconData?.type === "icon"
                                         width: wsIcon.width + (isActive && loadedIcons.length > 0 ? 4 : 0)
-                                        height: 18
+                                        height: root.appIconSize
 
                                         DankIcon {
                                             id: wsIcon
@@ -912,7 +917,7 @@ Item {
                                     Item {
                                         visible: loadedHasIcon && loadedIconData?.type === "text"
                                         width: wsText.implicitWidth + (isActive && loadedIcons.length > 0 ? 4 : 0)
-                                        height: 18
+                                        height: root.appIconSize
 
                                         StyledText {
                                             id: wsText
@@ -927,7 +932,7 @@ Item {
                                     Item {
                                         visible: SettingsData.showWorkspaceIndex && !loadedHasIcon
                                         width: wsIndexText.implicitWidth + (isActive && loadedIcons.length > 0 ? 4 : 0)
-                                        height: 18
+                                        height: root.appIconSize
 
                                         StyledText {
                                             id: wsIndexText
@@ -944,48 +949,61 @@ Item {
                                             values: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
                                         }
                                         delegate: Item {
-                                            width: 18
-                                            height: 18
+                                            width: root.appIconSize
+                                            height: root.appIconSize
 
                                             IconImage {
-                                                id: appIcon
-                                                property var windowId: modelData.windowId
+                                                id: rowAppIcon
                                                 anchors.fill: parent
                                                 source: modelData.icon
-                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                                visible: !modelData.isSteamApp
+                                                opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: !modelData.isSteamApp && !modelData.isQuickshell
+                                            }
+
+                                            IconImage {
+                                                anchors.fill: parent
+                                                source: modelData.icon
+                                                opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: modelData.isQuickshell
+                                                layer.enabled: true
+                                                layer.effect: MultiEffect {
+                                                    saturation: 0
+                                                    colorization: 1
+                                                    colorizationColor: isActive ? Theme.primaryContainer : Theme.primary
+                                                }
                                             }
 
                                             DankIcon {
                                                 anchors.centerIn: parent
-                                                size: 18
+                                                size: root.appIconSize
                                                 name: "sports_esports"
                                                 color: Theme.widgetTextColor
-                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
+                                                opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
                                                 visible: modelData.isSteamApp
                                             }
 
                                             MouseArea {
-                                                id: appMouseArea
+                                                id: rowAppMouseArea
                                                 anchors.fill: parent
                                                 enabled: isActive
                                                 cursorShape: Qt.PointingHandCursor
                                                 onClicked: {
-                                                    if (!appIcon.windowId)
+                                                    const winId = modelData.windowId;
+                                                    if (!winId)
                                                         return;
                                                     if (CompositorService.isHyprland) {
-                                                        Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`);
+                                                        Hyprland.dispatch(`focuswindow address:${winId}`);
                                                     } else if (CompositorService.isNiri) {
-                                                        NiriService.focusWindow(appIcon.windowId);
+                                                        NiriService.focusWindow(winId);
                                                     }
                                                 }
                                             }
 
                                             Rectangle {
                                                 visible: modelData.count > 1 && !isActive
-                                                width: 12
-                                                height: 12
-                                                radius: 6
+                                                width: root.appIconSize * 0.67
+                                                height: root.appIconSize * 0.67
+                                                radius: root.appIconSize * 0.33
                                                 color: "black"
                                                 border.color: "white"
                                                 border.width: 1
@@ -996,7 +1014,7 @@ Item {
                                                 Text {
                                                     anchors.centerIn: parent
                                                     text: modelData.count
-                                                    font.pixelSize: 8
+                                                    font.pixelSize: root.appIconSize * 0.44
                                                     color: "white"
                                                 }
                                             }
@@ -1034,48 +1052,61 @@ Item {
                                             values: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
                                         }
                                         delegate: Item {
-                                            width: 18
-                                            height: 18
+                                            width: root.appIconSize
+                                            height: root.appIconSize
 
                                             IconImage {
-                                                id: appIcon
-                                                property var windowId: modelData.windowId
+                                                id: colAppIcon
                                                 anchors.fill: parent
                                                 source: modelData.icon
-                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                                visible: !modelData.isSteamApp
+                                                opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: !modelData.isSteamApp && !modelData.isQuickshell
+                                            }
+
+                                            IconImage {
+                                                anchors.fill: parent
+                                                source: modelData.icon
+                                                opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: modelData.isQuickshell
+                                                layer.enabled: true
+                                                layer.effect: MultiEffect {
+                                                    saturation: 0
+                                                    colorization: 1
+                                                    colorizationColor: isActive ? Theme.primaryContainer : Theme.primary
+                                                }
                                             }
 
                                             DankIcon {
                                                 anchors.centerIn: parent
-                                                size: 18
+                                                size: root.appIconSize
                                                 name: "sports_esports"
                                                 color: Theme.widgetTextColor
-                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
+                                                opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
                                                 visible: modelData.isSteamApp
                                             }
 
                                             MouseArea {
-                                                id: appMouseArea
+                                                id: colAppMouseArea
                                                 anchors.fill: parent
                                                 enabled: isActive
                                                 cursorShape: Qt.PointingHandCursor
                                                 onClicked: {
-                                                    if (!appIcon.windowId)
+                                                    const winId = modelData.windowId;
+                                                    if (!winId)
                                                         return;
                                                     if (CompositorService.isHyprland) {
-                                                        Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`);
+                                                        Hyprland.dispatch(`focuswindow address:${winId}`);
                                                     } else if (CompositorService.isNiri) {
-                                                        NiriService.focusWindow(appIcon.windowId);
+                                                        NiriService.focusWindow(winId);
                                                     }
                                                 }
                                             }
 
                                             Rectangle {
                                                 visible: modelData.count > 1 && !isActive
-                                                width: 12
-                                                height: 12
-                                                radius: 6
+                                                width: root.appIconSize * 0.67
+                                                height: root.appIconSize * 0.67
+                                                radius: root.appIconSize * 0.33
                                                 color: "black"
                                                 border.color: "white"
                                                 border.width: 1
@@ -1086,7 +1117,7 @@ Item {
                                                 Text {
                                                     anchors.centerIn: parent
                                                     text: modelData.count
-                                                    font.pixelSize: 8
+                                                    font.pixelSize: root.appIconSize * 0.44
                                                     color: "white"
                                                 }
                                             }

quickshell/Modules/Settings/PluginListItem.qml

@@ -28,6 +28,7 @@ StyledRect {
     property string pluginSettingsPath: pluginData ? (pluginData.settingsPath || "") : ""
     property var pluginPermissions: pluginData ? (pluginData.permissions || []) : []
     property bool hasSettings: pluginData && pluginData.settings !== undefined && pluginData.settings !== ""
+    property bool isSystemPlugin: pluginData ? (pluginData.source === "system") : false
     property bool isExpanded: expandedPluginId === pluginId
     property bool isLoaded: {
         PluginService.loadedPlugins;
@@ -116,7 +117,7 @@ StyledRect {
                     height: 28
                     radius: 14
                     color: updateArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent"
-                    visible: DMSService.dmsAvailable && root.isLoaded && root.hasUpdate
+                    visible: DMSService.dmsAvailable && root.isLoaded && root.hasUpdate && !root.isSystemPlugin
 
                     DankIcon {
                         anchors.centerIn: parent
@@ -160,7 +161,7 @@ StyledRect {
                     height: 28
                     radius: 14
                     color: uninstallArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent"
-                    visible: DMSService.dmsAvailable
+                    visible: DMSService.dmsAvailable && !root.isSystemPlugin
 
                     DankIcon {
                         anchors.centerIn: parent

quickshell/Services/KeybindsService.qml

@@ -314,7 +314,8 @@ Singleton {
                 const keyData = {
                     key: bind.key || "",
                     source: bind.source || "config",
-                    isOverride: bind.source === "dms"
+                    isOverride: bind.source === "dms",
+                    cooldownMs: bind.cooldownMs || 0
                 };
                 if (actionMap[action]) {
                     actionMap[action].keys.push(keyData);
@@ -378,6 +379,8 @@ Singleton {
         const cmd = ["dms", "keybinds", "set", currentProvider, bindData.key, bindData.action, "--desc", bindData.desc || ""];
         if (originalKey && originalKey !== bindData.key)
             cmd.push("--replace-key", originalKey);
+        if (bindData.cooldownMs > 0)
+            cmd.push("--cooldown-ms", String(bindData.cooldownMs));
         saveProcess.command = cmd;
         saveProcess.running = true;
         bindSaved(bindData.key);

quickshell/VERSION

@@ -1 +1 @@
-v1.0.0
+v1.0.1

quickshell/Widgets/KeybindItem.qml

@@ -23,6 +23,8 @@ Item {
     property string editKey: ""
     property string editAction: ""
     property string editDesc: ""
+    property int editCooldownMs: 0
+    property int _savedCooldownMs: -1
     property bool hasChanges: false
     property string _actionType: ""
     property bool addingNewKey: false
@@ -90,6 +92,12 @@ Item {
                 editKey = keyToFind;
                 editAction = bindData.action || "";
                 editDesc = bindData.desc || "";
+                if (_savedCooldownMs >= 0) {
+                    editCooldownMs = _savedCooldownMs;
+                    _savedCooldownMs = -1;
+                } else {
+                    editCooldownMs = keys[i].cooldownMs || 0;
+                }
                 hasChanges = false;
                 _actionType = Actions.getActionType(editAction);
                 useCustomCompositor = _actionType === "compositor" && editAction && !Actions.isKnownCompositorAction(editAction);
@@ -109,6 +117,7 @@ Item {
         editKey = editingKeyIndex >= 0 ? keys[editingKeyIndex].key : "";
         editAction = bindData.action || "";
         editDesc = bindData.desc || "";
+        editCooldownMs = editingKeyIndex >= 0 ? (keys[editingKeyIndex].cooldownMs || 0) : 0;
         hasChanges = false;
         _actionType = Actions.getActionType(editAction);
         useCustomCompositor = _actionType === "compositor" && editAction && !Actions.isKnownCompositorAction(editAction);
@@ -127,6 +136,7 @@ Item {
         addingNewKey = false;
         editingKeyIndex = index;
         editKey = keys[index].key;
+        editCooldownMs = keys[index].cooldownMs || 0;
         hasChanges = false;
     }
 
@@ -137,8 +147,11 @@ Item {
             editAction = changes.action;
         if (changes.desc !== undefined)
             editDesc = changes.desc;
+        if (changes.cooldownMs !== undefined)
+            editCooldownMs = changes.cooldownMs;
         const origKey = editingKeyIndex >= 0 && editingKeyIndex < keys.length ? keys[editingKeyIndex].key : "";
-        hasChanges = editKey !== origKey || editAction !== (bindData.action || "") || editDesc !== (bindData.desc || "");
+        const origCooldown = editingKeyIndex >= 0 && editingKeyIndex < keys.length ? (keys[editingKeyIndex].cooldownMs || 0) : 0;
+        hasChanges = editKey !== origKey || editAction !== (bindData.action || "") || editDesc !== (bindData.desc || "") || editCooldownMs !== origCooldown;
     }
 
     function canSave() {
@@ -156,10 +169,12 @@ Item {
         let desc = editDesc;
         if (expandedLoader.item?.currentTitle !== undefined)
             desc = expandedLoader.item.currentTitle;
+        _savedCooldownMs = editCooldownMs;
         saveBind(origKey, {
             key: editKey,
             action: editAction,
-            desc: desc
+            desc: desc,
+            cooldownMs: editCooldownMs
         });
         hasChanges = false;
         addingNewKey = false;
@@ -1431,6 +1446,57 @@ Item {
                     }
                 }
 
+                RowLayout {
+                    Layout.fillWidth: true
+                    spacing: Theme.spacingM
+
+                    StyledText {
+                        text: I18n.tr("Cooldown")
+                        font.pixelSize: Theme.fontSizeSmall
+                        font.weight: Font.Medium
+                        color: Theme.surfaceVariantText
+                        Layout.preferredWidth: 60
+                    }
+
+                    DankTextField {
+                        id: cooldownField
+                        Layout.preferredWidth: 100
+                        Layout.preferredHeight: 40
+                        placeholderText: "0"
+
+                        Connections {
+                            target: root
+                            function onEditCooldownMsChanged() {
+                                const newText = root.editCooldownMs > 0 ? String(root.editCooldownMs) : "";
+                                if (cooldownField.text !== newText)
+                                    cooldownField.text = newText;
+                            }
+                        }
+
+                        Component.onCompleted: {
+                            text = root.editCooldownMs > 0 ? String(root.editCooldownMs) : "";
+                        }
+
+                        onTextChanged: {
+                            const val = parseInt(text) || 0;
+                            if (val !== root.editCooldownMs)
+                                root.updateEdit({
+                                    cooldownMs: val
+                                });
+                        }
+                    }
+
+                    StyledText {
+                        text: I18n.tr("ms")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                    }
+
+                    Item {
+                        Layout.fillWidth: true
+                    }
+                }
+
                 Rectangle {
                     Layout.fillWidth: true
                     Layout.preferredHeight: 1