chore: bump version to v1.0.1

ci: switch to dispatch-based release flow
dankinstall: call add-wants for niri/hyprland with dms service
2026-05-04 19:42:08 -04:00 · 2025-12-12 10:04:47 -05:00 · 2025-12-12 10:04:20 -05:00 · 2025-12-12 10:04:20 -05:00 · 2025-12-12 10:04:20 -05:00 · 2025-12-12 10:04:20 -05:00
37 changed files with 358 additions and 625 deletions
--- a/.github/workflows/release.yml
+++ b/.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
@@ -272,9 +280,6 @@ jobs:
          # Create QML source package (exclude build artifacts and git files)
          # 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' \
@@ -394,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: |
@@ -416,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: |
@@ -449,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

@@ -457,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
--- a/.github/workflows/run-ppa.yml
+++ b/.github/workflows/run-ppa.yml
@@ -130,12 +130,6 @@ jobs:
        run: |
          PACKAGES="${{ steps.packages.outputs.packages }}"
          
-          # Export to ensure it's available to subprocesses
-          if [ -n "$REBUILD_RELEASE" ]; then
-            export REBUILD_RELEASE
-            echo "✓ Using rebuild release number: ppa$REBUILD_RELEASE"
-          fi
-          
          if [[ "$PACKAGES" == "all" ]]; then
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading dms to PPA..."
@@ -143,25 +137,25 @@ jobs:
              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
            fi
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms" dms questing
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms" dms questing
            
            echo ""
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading dms-git to PPA..."
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-git" dms-git questing
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-git" dms-git questing
            
            echo ""
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading dms-greeter to PPA..."
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-greeter" danklinux questing
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-greeter" danklinux questing
          else
            PPA_NAME="$PACKAGES"
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading $PACKAGES to PPA..."
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/$PACKAGES" "$PPA_NAME" questing
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/$PACKAGES" "$PPA_NAME" questing
          fi
      
      - name: Summary
--- a/core/internal/distros/arch.go
+++ b/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))
 	}

--- a/core/internal/distros/base.go
+++ b/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
 }

--- a/core/internal/distros/debian.go
+++ b/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))
 	}

--- a/core/internal/distros/fedora.go
+++ b/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))
 	}

--- a/core/internal/distros/gentoo.go
+++ b/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))
 	}

--- a/core/internal/distros/opensuse.go
+++ b/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))
 	}

--- a/core/internal/distros/ubuntu.go
+++ b/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))
 	}

--- a/core/internal/keybinds/providers/niri.go
+++ b/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, "")
--- a/core/internal/keybinds/providers/niri_parser.go
+++ b/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,
 	}
 }
--- a/core/internal/keybinds/types.go
+++ b/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"`
 }

--- a/distro/debian/dms-git/debian/changelog
+++ b/distro/debian/dms-git/debian/changelog
@@ -1,6 +1,5 @@
-dms-git (1.0.0+git2419.993f14a3) nightly; urgency=medium
+dms-git (0.6.2+git2419.993f14a3) nightly; urgency=medium

-  * Major stable release v1.0.0
  * widgets: make dank icon picker a popup
  * Previous updates included in build

--- a/distro/debian/dms/_service
+++ b/distro/debian/dms/_service
@@ -3,19 +3,19 @@
  <service name="download_url">
    <param name="protocol">https</param>
    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/archive/refs/tags/v1.0.0.tar.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/archive/refs/tags/v0.6.2.tar.gz</param>
    <param name="filename">dms-source.tar.gz</param>
  </service>
  <!-- Download amd64 binary -->
  <service name="download_url">
    <param name="protocol">https</param>
    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.0/dms-distropkg-amd64.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v0.6.2/dms-distropkg-amd64.gz</param>
  </service>
  <!-- Download arm64 binary -->
  <service name="download_url">
    <param name="protocol">https</param>
    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.0/dms-distropkg-arm64.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v0.6.2/dms-distropkg-arm64.gz</param>
  </service>
 </services>
--- a/distro/debian/dms/debian/changelog
+++ b/distro/debian/dms/debian/changelog
@@ -1,7 +1,6 @@
-dms (1.0.0) stable; urgency=medium
+dms (0.6.2) stable; urgency=medium

-  * Update to v1.0.0 release
-  * Major stable release
+  * Update to v0.6.2 release
  * Fix binary download paths for OBS builds
  * Native format: removed revisions

--- a/distro/debian/dms/debian/rules
+++ b/distro/debian/dms/debian/rules
@@ -42,10 +42,8 @@ override_dh_auto_build:
 		elif [ -f dms-source.tar.gz ]; then \
 			tar -xzf dms-source.tar.gz; \
 		fi; \
-		SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" ! -name "DankMaterialShell-$(UPSTREAM_VERSION)" | head -n1); \
-		if [ -n "$$SOURCE_DIR" ] && [ "$$SOURCE_DIR" != "./DankMaterialShell-$(UPSTREAM_VERSION)" ]; then \
-			echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(UPSTREAM_VERSION)"; \
-			mv "$$SOURCE_DIR" DankMaterialShell-$(UPSTREAM_VERSION); \
+		if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ] && [ -d DankMaterialShell-0.6.2 ]; then \
+			mv DankMaterialShell-0.6.2 DankMaterialShell-$(UPSTREAM_VERSION); \
 		fi; \
 	fi

@@ -55,12 +53,8 @@ override_dh_auto_install:

 	mkdir -p debian/dms/usr/share/quickshell/dms debian/dms/usr/lib/systemd/user
 	# Handle directory name mismatch again for install step if needed
-	if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \
-		SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" | head -n1); \
-		if [ -n "$$SOURCE_DIR" ]; then \
-			echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(UPSTREAM_VERSION) for install"; \
-			mv "$$SOURCE_DIR" DankMaterialShell-$(UPSTREAM_VERSION); \
-		fi; \
+	if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ] && [ -d DankMaterialShell-0.6.2 ]; then \
+		mv DankMaterialShell-0.6.2 DankMaterialShell-$(UPSTREAM_VERSION); \
 	fi
 	if [ -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \
 		cp -r DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \
--- a/distro/nix/common.nix
+++ b/distro/nix/common.nix
@@ -9,7 +9,17 @@ let
  cfg = config.programs.dankMaterialShell;
 in
 {
+  qmlPath = "${dmsPkgs.dms-shell}/share/quickshell/dms";
+
  packages = [
+    pkgs.material-symbols
+    pkgs.inter
+    pkgs.fira-code
+
+    pkgs.ddcutil
+    pkgs.libsForQt5.qt5ct
+    pkgs.kdePackages.qt6ct
+
    dmsPkgs.dms-shell
  ]
  ++ lib.optional cfg.enableSystemMonitoring dmsPkgs.dgop
@@ -21,11 +31,10 @@ in
    pkgs.glib
    pkgs.networkmanager
  ]
+  ++ lib.optional cfg.enableBrightnessControl pkgs.brightnessctl
+  ++ lib.optional cfg.enableColorPicker pkgs.hyprpicker
  ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
  ++ lib.optional cfg.enableAudioWavelength pkgs.cava
-  ++ lib.optional cfg.enableCalendarEvents pkgs.khal;
-
-  plugins = lib.mapAttrs (name: plugin: {
-    source = plugin.src;
-  }) (lib.filterAttrs (n: v: v.enable) cfg.plugins);
+  ++ lib.optional cfg.enableCalendarEvents pkgs.khal
+  ++ lib.optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia;
 }
--- a/distro/nix/greeter.nix
+++ b/distro/nix/greeter.nix
@@ -139,32 +139,10 @@ in
      )}

      if [ -f session.json ]; then
-          copy_wallpaper() {
-              local path=$(${jq} -r ".$1 // empty" session.json)
-              if [ -f "$path" ]; then
-                  cp "$path" "$2"
-                  ${jq} ".$1 = \"${cacheDir}/$2\"" session.json > session.tmp
-                  mv session.tmp session.json
-              fi
-          }
-
-          copy_monitor_wallpapers() {
-              ${jq} -r ".$1 // {} | to_entries[] | .key + \":\" + .value" session.json 2>/dev/null | while IFS=: read monitor path; do
-                  local dest="$2-$(echo "$monitor" | tr -c '[:alnum:]' '-')"
-                  if [ -f "$path" ]; then
-                      cp "$path" "$dest"
-                      ${jq} --arg m "$monitor" --arg p "${cacheDir}/$dest" ".$1[\$m] = \$p" session.json > session.tmp
-                      mv session.tmp session.json
-                  fi
-              done
-          }
-
-          copy_wallpaper "wallpaperPath" "wallpaper"
-          copy_wallpaper "wallpaperPathLight" "wallpaper-light"
-          copy_wallpaper "wallpaperPathDark" "wallpaper-dark"
-          copy_monitor_wallpapers "monitorWallpapers" "wallpaper-monitor"
-          copy_monitor_wallpapers "monitorWallpapersLight" "wallpaper-monitor-light"
-          copy_monitor_wallpapers "monitorWallpapersDark" "wallpaper-monitor-dark"
+          if cp "$(${jq} -r '.wallpaperPath' session.json)" wallpaper.jpg; then
+              mv session.json session.orig.json
+              ${jq} '.wallpaperPath = "${cacheDir}/wallpaper.jpg"' session.orig.json > session.json
+          fi
      fi

      if [ -f settings.json ]; then
--- a/distro/nix/home.nix
+++ b/distro/nix/home.nix
@@ -48,6 +48,7 @@ in
    plugins = lib.mkOption {
      type = attrsOf (
        types.submodule (
+          { config, ... }:
          {
            options = {
              enable = lib.mkOption {
@@ -72,6 +73,8 @@ in
    programs.quickshell = {
      enable = true;
      inherit (cfg.quickshell) package;
+
+      configs.dms = common.qmlPath;
    };

    systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
@@ -79,6 +82,7 @@ in
        Description = "DankMaterialShell";
        PartOf = [ config.wayland.systemd.target ];
        After = [ config.wayland.systemd.target ];
+        X-Restart-Triggers = lib.optional cfg.systemd.restartIfChanged common.qmlPath;
      };

      Service = {
--- a/distro/nix/niri.nix
+++ b/distro/nix/niri.nix
@@ -63,14 +63,6 @@ in
              allow-when-locked = true;
              action = dms-ipc "audio" "micmute";
            };
-            "XF86MonBrightnessUp" = {
-              allow-when-locked = true;
-              action = dms-ipc "brightness" "increment" "5" "";
-            };
-            "XF86MonBrightnessDown" = {
-              allow-when-locked = true;
-              action = dms-ipc "brightness" "decrement" "5" "";
-            };
            "Mod+Alt+N" = {
              allow-when-locked = true;
              action = dms-ipc "night" "toggle";
@@ -88,6 +80,16 @@ in
              action = dms-ipc "clipboard" "toggle";
              hotkey-overlay.title = "Toggle Clipboard Manager";
            };
+          }
+          // lib.attrsets.optionalAttrs cfg.enableBrightnessControl {
+            "XF86MonBrightnessUp" = {
+              allow-when-locked = true;
+              action = dms-ipc "brightness" "increment" "5" "";
+            };
+            "XF86MonBrightnessDown" = {
+              allow-when-locked = true;
+              action = dms-ipc "brightness" "decrement" "5" "";
+            };
          };
      })

--- a/distro/nix/nixos.nix
+++ b/distro/nix/nixos.nix
@@ -22,6 +22,8 @@ in
  ];

  config = lib.mkIf cfg.enable {
+    environment.etc."xdg/quickshell/dms".source = "${dmsPkgs.dms-shell}/share/quickshell/dms";
+
    systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
      description = "DankMaterialShell";
      path = lib.mkForce [ ];
@@ -29,7 +31,7 @@ in
      partOf = [ "graphical-session.target" ];
      after = [ "graphical-session.target" ];
      wantedBy = [ "graphical-session.target" ];
-      restartIfChanged = cfg.systemd.restartIfChanged;
+      restartTriggers = lib.optional cfg.systemd.restartIfChanged common.qmlPath;

      serviceConfig = {
        ExecStart = lib.getExe dmsPkgs.dms-shell + " run --session";
@@ -38,8 +40,5 @@ in
    };

    environment.systemPackages = [ cfg.quickshell.package ] ++ common.packages;
-
-    services.power-profiles-daemon.enable = lib.mkDefault true;
-    services.accounts-daemon.enable = lib.mkDefault true;
  };
 }
--- a/distro/nix/options.nix
+++ b/distro/nix/options.nix
@@ -5,24 +5,11 @@
 }:
 let
  inherit (lib) types;
-  path = [
-    "programs"
-    "dankMaterialShell"
-  ];
-
-  builtInRemovedMsg = "This is now built-in in DMS and doesn't need additional dependencies.";
 in
 {
-  imports = [
-    (lib.mkRemovedOptionModule (path ++ [ "enableBrightnessControl" ]) builtInRemovedMsg)
-    (lib.mkRemovedOptionModule (path ++ [ "enableColorPicker" ]) builtInRemovedMsg)
-    (lib.mkRemovedOptionModule (
-      path ++ [ "enableSystemSound" ]
-    ) "qtmultimedia is now included on dms-shell package.")
-  ];
-
  options.programs.dankMaterialShell = {
    enable = lib.mkEnableOption "DankMaterialShell";
+
    systemd = {
      enable = lib.mkEnableOption "DankMaterialShell systemd startup";
      restartIfChanged = lib.mkOption {
@@ -46,6 +33,16 @@ in
      default = true;
      description = "Add needed dependencies to use the VPN widget";
    };
+    enableBrightnessControl = lib.mkOption {
+      type = types.bool;
+      default = true;
+      description = "Add needed dependencies to have brightness/backlight support";
+    };
+    enableColorPicker = lib.mkOption {
+      type = types.bool;
+      default = true;
+      description = "Add needed dependencies to have color picking support";
+    };
    enableDynamicTheming = lib.mkOption {
      type = types.bool;
      default = true;
@@ -61,46 +58,15 @@ in
      default = true;
      description = "Add calendar events support via khal";
    };
+    enableSystemSound = lib.mkOption {
+      type = types.bool;
+      default = true;
+      description = "Add needed dependencies to have system sound support";
+    };
    quickshell = {
      package = lib.mkPackageOption dmsPkgs "quickshell" {
        extraDescription = "The quickshell package to use (defaults to be built from source, in the commit 26531f due to unreleased features used by DMS).";
      };
    };
-
-    plugins = lib.mkOption {
-      type = types.attrsOf (
-        types.submodule {
-          options = {
-            enable = lib.mkOption {
-              type = types.bool;
-              default = true;
-              description = "Whether to enable this plugin";
-            };
-            src = lib.mkOption {
-              type = types.package;
-              description = "Source of the plugin package or path";
-            };
-          };
-        }
-      );
-      default = { };
-      description = "DMS Plugins to install and enable";
-      example = lib.literalExpression ''
-        {
-          DockerManager = {
-            src = pkgs.fetchFromGitHub {
-              owner = "LuckShiba";
-              repo = "DmsDockerManager";
-              rev = "v1.2.0";
-              sha256 = "sha256-VoJCaygWnKpv0s0pqTOmzZnPM922qPDMHk4EPcgVnaU=";
-            };
-          };
-          AnotherPlugin = {
-            enable = true;
-            src = pkgs.another-plugin;
-          };
-        }
-      '';
-    };
  };
 }
--- a/distro/opensuse/dms.spec
+++ b/distro/opensuse/dms.spec
@@ -3,7 +3,7 @@
 %global debug_package %{nil}

 Name:           dms
-Version:        1.0.0
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        DankMaterialShell - Material 3 inspired shell for Wayland compositors

--- a/distro/scripts/copr-upload.sh
+++ b/distro/scripts/copr-upload.sh
@@ -1,228 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Build SRPM locally with correct tarball and upload to Copr
-# Usage: ./create-upload-copr.sh VERSION [RELEASE]
-# Example: ./create-upload-copr.sh 1.0.0 4
-
-VERSION="${1:-1.0.0}"
-RELEASE="${2:-1}"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-
-echo "Building DMS v${VERSION}-${RELEASE} SRPM for Copr..."
-
-# Setup build directories
-mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-cd ~/rpmbuild/SOURCES
-
-# Create the corrected QML tarball locally
-echo "Creating QML tarball with assets..."
-TEMP_DIR=$(mktemp -d)
-cd "$REPO_ROOT"
-
-# Copy quickshell contents to temp
-cp -r quickshell/* "$TEMP_DIR/"
-
-# Copy root LICENSE and CONTRIBUTING.md
-cp LICENSE CONTRIBUTING.md "$TEMP_DIR/"
-
-# Copy root assets directory (this is what was missing!)
-cp -r assets "$TEMP_DIR/"
-
-# Create tarball
-cd "$TEMP_DIR"
-tar --exclude='.git' \
-    --exclude='.github' \
-    --exclude='*.tar.gz' \
-    -czf ~/rpmbuild/SOURCES/dms-qml.tar.gz .
-
-cd ~/rpmbuild/SOURCES
-echo "Created dms-qml.tar.gz with md5sum: $(md5sum dms-qml.tar.gz | awk '{print $1}')"
-rm -rf "$TEMP_DIR"
-
-# Generate spec file
-echo "Generating spec file..."
-CHANGELOG_DATE="$(date '+%a %b %d %Y')"
-
-cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
-# Spec for DMS stable releases - Built locally
-
-%global debug_package %{nil}
-%global version VERSION_PLACEHOLDER
-%global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
-
-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:     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/download/v%{version}/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 locally with corrected tarball
-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
-
-# Build SRPM
-echo "Building SRPM..."
-cd ~/rpmbuild/SPECS
-rpmbuild -bs dms.spec
-
-SRPM=$(ls ~/rpmbuild/SRPMS/dms-${VERSION}-*.src.rpm | tail -n 1)
-if [ ! -f "$SRPM" ]; then
-    echo "Error: SRPM not found!"
-    exit 1
-fi
-
-echo "SRPM built successfully: $SRPM"
-
-# Check if copr-cli is installed
-if ! command -v copr-cli &> /dev/null; then
-    echo ""
-    echo "copr-cli is not installed. Install it with:"
-    echo "  pip install copr-cli"
-    echo ""
-    echo "Then configure it with your Copr API token in ~/.config/copr"
-    echo ""
-    echo "SRPM is ready at: $SRPM"
-    echo "Upload manually with: copr-cli build avengemedia/dms $SRPM"
-    exit 0
-fi
-
-# Upload to Copr
-echo ""
-echo "Uploading to Copr..."
-if copr-cli build avengemedia/dms "$SRPM" --nowait; then
-    echo ""
-    echo "Build submitted successfully! Check status at:"
-    echo "https://copr.fedorainfracloud.org/coprs/avengemedia/dms/builds/"
-else
-    echo ""
-    echo "Copr upload failed. You can manually upload the SRPM:"
-    echo "  copr-cli build avengemedia/dms $SRPM"
-    echo ""
-    echo "Or upload via web interface:"
-    echo "  https://copr.fedorainfracloud.org/coprs/avengemedia/dms/builds/"
-    echo ""
-    echo "SRPM location: $SRPM"
-    exit 1
-fi
--- a/distro/scripts/obs-upload.sh
+++ b/distro/scripts/obs-upload.sh
@@ -672,20 +672,7 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
        if [[ "$IS_MANUAL" == true ]]; then
            echo "==> Detected rebuild of same base version $CHANGELOG_BASE, incrementing version"
        
-            # If REBUILD_RELEASE is set, use that number directly
-            if [[ -n "${REBUILD_RELEASE:-}" ]]; then
-                if [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git([0-9]+)(\.[a-f0-9]+)?$ ]]; then
-                    BASE_VERSION="${BASH_REMATCH[1]}"
-                    GIT_NUM="${BASH_REMATCH[2]}"
-                    GIT_HASH="${BASH_REMATCH[3]}"
-                    NEW_VERSION="${BASE_VERSION}+git${GIT_NUM}${GIT_HASH}ppa${REBUILD_RELEASE}"
-                    echo "  Using REBUILD_RELEASE=$REBUILD_RELEASE: $CHANGELOG_VERSION -> $NEW_VERSION"
-                else
-                    BASE_VERSION=$(echo "$CHANGELOG_VERSION" | sed 's/ppa[0-9]*$//')
-                    NEW_VERSION="${BASE_VERSION}ppa${REBUILD_RELEASE}"
-                    echo "  Using REBUILD_RELEASE=$REBUILD_RELEASE: $CHANGELOG_VERSION -> $NEW_VERSION"
-                fi
-            elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git$ ]]; then
+            if [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git$ ]]; then
                BASE_VERSION="${BASH_REMATCH[1]}"
                NEW_VERSION="${BASE_VERSION}+gitppa1"
                echo "  Adding PPA number: $CHANGELOG_VERSION -> $NEW_VERSION"
@@ -717,27 +704,11 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
                fi
            elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)(-([0-9]+))?$ ]]; then
                BASE_VERSION="${BASH_REMATCH[1]}"
-                # Check if old DSC has ppa suffix even if changelog doesn't
-                if [[ "$OLD_DSC_VERSION" =~ ppa([0-9]+)$ ]]; then
-                    OLD_PPA_NUM="${BASH_REMATCH[1]}"
-                    NEW_PPA_NUM=$((OLD_PPA_NUM + 1))
-                    NEW_VERSION="${BASE_VERSION}ppa${NEW_PPA_NUM}"
-                    echo "  Incrementing PPA number from old DSC: $OLD_DSC_VERSION -> $NEW_VERSION"
-                else
-                    NEW_VERSION="${BASE_VERSION}ppa1"
-                    echo "  Adding PPA number: $CHANGELOG_VERSION -> $NEW_VERSION"
-                fi
+                NEW_VERSION="${BASE_VERSION}ppa1"
+                echo "  Warning: Native format cannot have Debian revision, converting to PPA format: $CHANGELOG_VERSION -> $NEW_VERSION"
            else
-                # Check if old DSC has ppa suffix for unknown formats
-                if [[ "$OLD_DSC_VERSION" =~ ppa([0-9]+)$ ]]; then
-                    OLD_PPA_NUM="${BASH_REMATCH[1]}"
-                    NEW_PPA_NUM=$((OLD_PPA_NUM + 1))
-                    NEW_VERSION="${CHANGELOG_VERSION}ppa${NEW_PPA_NUM}"
-                    echo "  Incrementing PPA number from old DSC: $OLD_DSC_VERSION -> $NEW_VERSION"
-                else
-                    NEW_VERSION="${CHANGELOG_VERSION}ppa1"
-                    echo "  Warning: Could not parse version format, appending ppa1: $CHANGELOG_VERSION -> $NEW_VERSION"
-                fi
+                NEW_VERSION="${CHANGELOG_VERSION}ppa1"
+                echo "  Warning: Could not parse version format, appending ppa1: $CHANGELOG_VERSION -> $NEW_VERSION"
            fi
            
            if [[ -z "$SOURCE_DIR" ]] || [[ ! -d "$SOURCE_DIR" ]] || [[ ! -d "$SOURCE_DIR/debian" ]]; then
@@ -792,15 +763,7 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
                    echo "    Renaming $EXTRACTED to $EXPECTED_SOURCE_DIR"
                    mv "$EXTRACTED" "$EXPECTED_SOURCE_DIR"
                    rm -f "$WORK_DIR/dms-source.tar.gz"
-                    if ! tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/dms-source.tar.gz" "$EXPECTED_SOURCE_DIR"; then
-                        echo "    Error: Failed to create dms-source.tar.gz"
-                        ls -lah "$EXPECTED_SOURCE_DIR" | head -20
-                        exit 1
-                    fi
-                    if [[ ! -f "$WORK_DIR/dms-source.tar.gz" ]]; then
-                        echo "    Error: dms-source.tar.gz was not created"
-                        exit 1
-                    fi
+                    tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/dms-source.tar.gz" "$EXPECTED_SOURCE_DIR"
                    ROOT_DIR=$(tar -tf "$WORK_DIR/dms-source.tar.gz" | head -1 | cut -d/ -f1)
                    if [[ "$ROOT_DIR" != "$EXPECTED_SOURCE_DIR" ]]; then
                        echo "    Error: Recreated tarball has wrong root directory: $ROOT_DIR (expected $EXPECTED_SOURCE_DIR)"
@@ -876,7 +839,11 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
                tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$COMBINED_TARBALL" "$TARBALL_BASE"
                cd "$REPO_ROOT"
            fi
-            
+        else
+            echo "==> Detected same version. Not a manual run, skipping Debian version increment."
+            echo "✅ No changes needed for Debian. Exiting."
+            exit 0
+        fi    
            TARBALL_SIZE=$(stat -c%s "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null || stat -f%z "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null)
            TARBALL_MD5=$(md5sum "$WORK_DIR/$COMBINED_TARBALL" | cut -d' ' -f1)
            
@@ -917,40 +884,15 @@ Files:
 $TARBALL_MD5 $TARBALL_SIZE $COMBINED_TARBALL
 EOF
            echo "  - Updated changelog and recreated tarball with version $NEW_VERSION"
-        else
-            echo "==> Detected same version. Not a manual run, skipping Debian version increment."
-            echo "✅ No changes needed for Debian. Exiting."
-            exit 0
-        fi
+
    fi
 fi

-# Ensure we're in WORK_DIR and it exists
-if [[ ! -d "$WORK_DIR" ]]; then
-    echo "ERROR: WORK_DIR does not exist: $WORK_DIR"
-    exit 1
-fi
-
-cd "$WORK_DIR" || {
-    echo "ERROR: Cannot cd to WORK_DIR: $WORK_DIR"
-    exit 1
-}
-
 find . -maxdepth 1 -type f \( -name "*.dsc" -o -name "*.spec" \) -exec grep -l "^<<<<<<< " {} \; 2>/dev/null | while read -r conflicted_file; do
    echo "  Removing conflicted text file: $conflicted_file"
    rm -f "$conflicted_file"
 done

-# Ensure we're STILL in WORK_DIR before running osc commands
-cd "$WORK_DIR" || {
-    echo "ERROR: Cannot cd to WORK_DIR: $WORK_DIR"
-    exit 1
-}
-echo "DEBUG: Current directory: $(pwd)"
-echo "DEBUG: WORK_DIR=$WORK_DIR"
-echo "DEBUG: Files in directory:"
-ls -la 2>&1 | head -20
-
 echo "==> Staging changes"
 echo "Files to upload:"
 if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$UPLOAD_OPENSUSE" == true ]]; then
--- a/distro/scripts/ppa-build.sh
+++ b/distro/scripts/ppa-build.sh
@@ -50,15 +50,9 @@ fi
 # Get absolute path
 PACKAGE_DIR=$(cd "$PACKAGE_DIR" && pwd)
 PACKAGE_NAME=$(basename "$PACKAGE_DIR")
-PACKAGE_PARENT=$(dirname "$PACKAGE_DIR")
-
-# Create temporary working directory (like OBS)
-TEMP_WORK_DIR=$(mktemp -d -t ppa_build_work_XXXXXX)
-trap "rm -rf '$TEMP_WORK_DIR'" EXIT

 info "Building source package for: $PACKAGE_NAME"
 info "Package directory: $PACKAGE_DIR"
-info "Working directory: $TEMP_WORK_DIR"
 info "Target Ubuntu series: $UBUNTU_SERIES"

 # Check for required files
@@ -125,13 +119,8 @@ elif [[ -z "${GITHUB_ACTIONS:-}" ]] && [[ -z "${CI:-}" ]]; then
    echo "==> Local/manual run detected (not in CI)"
 fi

-# Copy package to temp working directory
-info "Copying package to working directory..."
-cp -r "$PACKAGE_DIR" "$TEMP_WORK_DIR/"
-WORK_PACKAGE_DIR="$TEMP_WORK_DIR/$PACKAGE_NAME"
-
 # Detect package type and update version automatically
-cd "$WORK_PACKAGE_DIR"
+cd "$PACKAGE_DIR"

 # Function to get latest tag from GitHub
 get_latest_tag() {
@@ -294,29 +283,22 @@ if [ "$IS_GIT_PACKAGE" = true ] && [ -n "$GIT_REPO" ]; then
        # Check if we're rebuilding the same commit (increment PPA number if so)
        BASE_VERSION="${UPSTREAM_VERSION}+git${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}"
        CURRENT_VERSION=$(dpkg-parsechangelog -S Version 2>/dev/null || echo "")
+        PPA_NUM=1
        
-        # Use REBUILD_RELEASE if provided, otherwise auto-increment
-        if [[ -n "${REBUILD_RELEASE:-}" ]]; then
-            PPA_NUM=$REBUILD_RELEASE
-            info "Using REBUILD_RELEASE=$REBUILD_RELEASE for PPA number"
-        else
-            PPA_NUM=1
-            
-            # If current version matches the base version, increment PPA number
-            # Escape special regex characters in BASE_VERSION for pattern matching
-            ESCAPED_BASE=$(echo "$BASE_VERSION" | sed 's/\./\\./g' | sed 's/+/\\+/g')
-            if [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
-                PPA_NUM=$((BASH_REMATCH[1] + 1))
-                if [[ "$IS_MANUAL" == true ]]; then
-                    info "Detected rebuild of same commit (current: $CURRENT_VERSION), incrementing PPA number to $PPA_NUM"
-                else
-                    info "Detected rebuild of same commit (current: $CURRENT_VERSION). Not a manual run, skipping."
-                    success "No changes needed (commit matches)."
-                    exit 0
-                fi
+        # If current version matches the base version, increment PPA number
+        # Escape special regex characters in BASE_VERSION for pattern matching
+        ESCAPED_BASE=$(echo "$BASE_VERSION" | sed 's/\./\\./g' | sed 's/+/\\+/g')
+        if [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
+            PPA_NUM=$((BASH_REMATCH[1] + 1))
+            if [[ "$IS_MANUAL" == true ]]; then
+                info "Detected rebuild of same commit (current: $CURRENT_VERSION), incrementing PPA number to $PPA_NUM"
            else
-                info "New commit or first build, using PPA number $PPA_NUM"
+                info "Detected rebuild of same commit (current: $CURRENT_VERSION). Not a manual run, skipping."
+                success "No changes needed (commit matches)."
+                exit 0
            fi
+        else
+            info "New commit or first build, using PPA number $PPA_NUM"
        fi
        
        NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}"
@@ -447,23 +429,16 @@ elif [ -n "$GIT_REPO" ]; then

        # Get current version to check if we need to increment PPA number
        CURRENT_VERSION=$(dpkg-parsechangelog -S Version 2>/dev/null || echo "")
-        
-        # Use REBUILD_RELEASE if provided, otherwise auto-increment
-        if [[ -n "${REBUILD_RELEASE:-}" ]]; then
-            PPA_NUM=$REBUILD_RELEASE
-            info "Using REBUILD_RELEASE=$REBUILD_RELEASE for PPA number"
-        else
-            PPA_NUM=1
-        fi
+        PPA_NUM=1

        if [[ "$SOURCE_FORMAT" == *"native"* ]]; then
            # Native format: 0.2.1ppa1 (no dash, no revision)
            BASE_VERSION="${LATEST_TAG}"
            # Check if we're rebuilding the same version (increment PPA number if so)
-            if [[ -z "${REBUILD_RELEASE:-}" ]] && [[ "$CURRENT_VERSION" =~ ^${LATEST_TAG}ppa([0-9]+)$ ]]; then
+            if [[ "$CURRENT_VERSION" =~ ^${LATEST_TAG}ppa([0-9]+)$ ]]; then
                PPA_NUM=$((BASH_REMATCH[1] + 1))
                info "Detected rebuild of same version (current: $CURRENT_VERSION), incrementing PPA number to $PPA_NUM"
-            elif [[ -z "${REBUILD_RELEASE:-}" ]]; then
+            else
                info "New version or first build, using PPA number $PPA_NUM"
            fi
            NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}"
@@ -472,7 +447,7 @@ elif [ -n "$GIT_REPO" ]; then
            BASE_VERSION="${LATEST_TAG}-1"
            # Check if we're rebuilding the same version (increment PPA number if so)
            ESCAPED_BASE=$(echo "$BASE_VERSION" | sed 's/\./\\./g' | sed 's/-/\\-/g')
-            if [[ -z "${REBUILD_RELEASE:-}" ]] && [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
+            if [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
                PPA_NUM=$((BASH_REMATCH[1] + 1))
                if [[ "$IS_MANUAL" == true ]]; then
                    info "Detected rebuild of same version (current: $CURRENT_VERSION), incrementing PPA number to $PPA_NUM"
@@ -481,7 +456,7 @@ elif [ -n "$GIT_REPO" ]; then
                    success "No changes needed (version matches)."
                    exit 0
                fi
-            elif [[ -z "${REBUILD_RELEASE:-}" ]]; then
+            else
                info "New version or first build, using PPA number $PPA_NUM"
            fi
            NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}"
@@ -600,12 +575,10 @@ info "Building source package..."
 echo

 # Determine if we need to include orig tarball (-sa) or just debian changes (-sd)
-# Check if .orig.tar.xz already exists in real parent directory (previous build)
+# Check if .orig.tar.xz already exists in parent directory (previous build)
 ORIG_TARBALL="${PACKAGE_NAME}_${VERSION%.ppa*}.orig.tar.xz"
-if [ -f "$PACKAGE_PARENT/$ORIG_TARBALL" ]; then
-    info "Found existing orig tarball in $PACKAGE_PARENT, using -sd (debian changes only)"
-    # Copy it to temp parent so debuild can find it
-    cp "$PACKAGE_PARENT/$ORIG_TARBALL" "$TEMP_WORK_DIR/"
+if [ -f "../$ORIG_TARBALL" ]; then
+    info "Found existing orig tarball, using -sd (debian changes only)"
    DEBUILD_SOURCE_FLAG="-sd"
 else
    info "No existing orig tarball found, using -sa (include original source)"
@@ -619,19 +592,15 @@ if yes | DEBIAN_FRONTEND=noninteractive debuild -S $DEBUILD_SOURCE_FLAG -d; then
    echo
    success "Source package built successfully!"

-    # Copy build artifacts back to parent directory
-    info "Copying build artifacts to $PACKAGE_PARENT..."
-    cp -v "$TEMP_WORK_DIR"/${SOURCE_NAME}_${CHANGELOG_VERSION}* "$PACKAGE_PARENT/" 2>/dev/null || true
-
    # List generated files
-    info "Generated files in $PACKAGE_PARENT:"
-    ls -lh "$PACKAGE_PARENT"/${SOURCE_NAME}_${CHANGELOG_VERSION}* 2>/dev/null || true
+    info "Generated files in $(dirname "$PACKAGE_DIR"):"
+    ls -lh "$(dirname "$PACKAGE_DIR")"/${SOURCE_NAME}_${CHANGELOG_VERSION}* 2>/dev/null || true

    # Show what to do next
    echo
    info "Next steps:"
    echo "  1. Review the source package:"
-    echo "     cd $PACKAGE_PARENT"
+    echo "     cd $(dirname "$PACKAGE_DIR")"
    echo "     ls -lh ${SOURCE_NAME}_${CHANGELOG_VERSION}*"
    echo
    echo "  2. Upload to PPA (stable):"
@@ -641,7 +610,7 @@ if yes | DEBIAN_FRONTEND=noninteractive debuild -S $DEBUILD_SOURCE_FLAG -d; then
    echo "     dput ppa:avengemedia/dms-git ${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes"
    echo
    echo "  4. Or use the upload script:"
-    echo "     ./upload-ppa.sh $PACKAGE_PARENT/${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes dms"
+    echo "     ./upload-ppa.sh $(dirname "$PACKAGE_DIR")/${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes dms"

 else
    error "Source package build failed!"
--- a/distro/scripts/ppa-dput.sh
+++ b/distro/scripts/ppa-dput.sh
@@ -150,38 +150,7 @@ fi
 info "Uploading to Launchpad..."
 echo

-UPLOAD_SUCCESS=false
-
-if [ "$UPLOAD_METHOD" = "dput" ]; then
-    if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; then
-        UPLOAD_SUCCESS=true
-    fi
-elif [ "$UPLOAD_METHOD" = "lftp" ]; then
-    # Use lftp to upload to Launchpad PPA
-    CHANGES_DIR=$(dirname "$CHANGES_FILE")
-    CHANGES_BASENAME=$(basename "$CHANGES_FILE")
-    
-    # Extract files to upload from .changes file
-    FILES_TO_UPLOAD=("$CHANGES_BASENAME")
-    while IFS= read -r line; do
-        if [[ "$line" =~ ^\ [a-f0-9]+\ [0-9]+\ [^\ ]+\ [^\ ]+\ (.+)$ ]]; then
-            FILES_TO_UPLOAD+=("${BASH_REMATCH[1]}")
-        fi
-    done < "$CHANGES_FILE"
-    
-    # Build lftp command to upload all files
-    LFTP_COMMANDS="set ftp:ssl-allow no; open ftp://ppa.launchpad.net; user anonymous ''; cd ~avengemedia/ubuntu/$PPA_NAME/;"
-    for file in "${FILES_TO_UPLOAD[@]}"; do
-        LFTP_COMMANDS="$LFTP_COMMANDS put '$CHANGES_DIR/$file';"
-    done
-    LFTP_COMMANDS="$LFTP_COMMANDS bye"
-    
-    if echo "$LFTP_COMMANDS" | lftp; then
-        UPLOAD_SUCCESS=true
-    fi
-fi
-
-if [ "$UPLOAD_SUCCESS" = true ]; then
+if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; then
    echo
    success "Upload successful!"
    echo
@@ -197,6 +166,7 @@ if [ "$UPLOAD_SUCCESS" = true ]; then
    echo "  sudo add-apt-repository ppa:avengemedia/$PPA_NAME"
    echo "  sudo apt update"
    echo "  sudo apt install $PACKAGE_NAME"
+
 else
    error "Upload failed!"
    echo
--- a/distro/ubuntu/dms/debian/changelog
+++ b/distro/ubuntu/dms/debian/changelog
@@ -1,5 +1,5 @@
-dms (1.0.0ppa4) questing; urgency=medium
+dms (0.6.2ppa3) questing; urgency=medium

-  * Rebuild for packaging fixes (ppa4)
+  * Rebuild for packaging fixes (ppa3)

- -- Avenge Media <AvengeMedia.US@gmail.com>  Wed, 10 Dec 2025 12:56:23 -0500
+ -- Avenge Media <AvengeMedia.US@gmail.com>  Sun, 23 Nov 2025 00:40:41 -0500
--- a/distro/ubuntu/dms/debian/files
+++ b/distro/ubuntu/dms/debian/files
@@ -1 +1 @@
-dms_1.0.0ppa4_source.buildinfo x11 optional
+dms_0.6.2ppa3_source.buildinfo x11 optional
--- a/distro/ubuntu/dms/debian/rules
+++ b/distro/ubuntu/dms/debian/rules
@@ -29,31 +29,16 @@ override_dh_auto_build:
 	# Extract source tarball for QML files
 	tar -xzf dms-source.tar.gz
 	# Find the extracted directory (it might have various names)
-	# and rename it to the expected BASE_VERSION name for consistent install
-	SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" ! -name "DankMaterialShell-$(BASE_VERSION)" | head -n1); \
-	if [ -n "$$SOURCE_DIR" ] && [ "$$SOURCE_DIR" != "./DankMaterialShell-$(BASE_VERSION)" ]; then \
-		echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(BASE_VERSION)"; \
-		mv "$$SOURCE_DIR" DankMaterialShell-$(BASE_VERSION); \
-	elif [ ! -d "DankMaterialShell-$(BASE_VERSION)" ]; then \
-		echo "ERROR: No DankMaterialShell directory found after extraction!"; \
-		ls -la; \
-		exit 1; \
+	# and create a symlink to expected name for consistent install
+	SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell*" | head -n1); \
+	if [ -n "$$SOURCE_DIR" ]; then \
+		ln -sf $$SOURCE_DIR DankMaterialShell-$(BASE_VERSION); \
 	fi

 override_dh_auto_install:
 	# Install binary
 	install -Dm755 dms debian/dms/usr/bin/dms

-	# Install systemd user service (before copying everything else)
-	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/systemd/dms.service \
-		debian/dms/usr/lib/systemd/user/dms.service
-
-	# Install desktop file and icon
-	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dms-open.desktop \
-		debian/dms/usr/share/applications/dms-open.desktop
-	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/danklogo.svg \
-		debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg
-
 	# Install QML files from source tarball
 	mkdir -p debian/dms/usr/share/quickshell/dms
 	cp -r DankMaterialShell-$(BASE_VERSION)/* debian/dms/usr/share/quickshell/dms/
@@ -61,7 +46,16 @@ override_dh_auto_install:
 	# Remove unnecessary directories
 	rm -rf debian/dms/usr/share/quickshell/dms/core
 	rm -rf debian/dms/usr/share/quickshell/dms/distro
-	rm -rf debian/dms/usr/share/quickshell/dms/assets
+
+	# Install systemd user service
+	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/systemd/dms.service \
+		debian/dms/usr/lib/systemd/user/dms.service
+
+	# Install desktop file and icon
+	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dms-open.desktop \
+		debian/dms/usr/share/applications/dms-open.desktop
+	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/danklogo.svg \
+		debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg

 	# Create VERSION file for Quickshell (stable release format)
 	echo "$(BASE_VERSION)" > debian/dms/usr/share/quickshell/dms/VERSION
--- a/flake.nix
+++ b/flake.nix
@@ -40,16 +40,6 @@
            (import path (args // { dmsPkgs = buildDmsPkgs pkgs; }))
          ];
        };
-      mkQmlImportPath =
-        pkgs: qmlPkgs:
-        pkgs.lib.concatStringsSep ":" (map (o: "${o}/${pkgs.qt6.qtbase.qtQmlPrefix}") qmlPkgs);
-
-      qmlPkgs =
-        pkgs: with pkgs.kdePackages; [
-          kirigami.unwrapped
-          sonnet
-          qtmultimedia
-        ];
    in
    {
      packages = forEachSystem (
@@ -106,9 +96,7 @@
                install -D ${rootSrc}/core/assets/danklogo.svg \
                  $out/share/hicolor/scalable/apps/danklogo.svg

-                wrapProgram $out/bin/dms \
-                  --add-flags "-c $out/share/quickshell/dms" \
-                  --prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${mkQmlImportPath pkgs (qmlPkgs pkgs)}"
+                wrapProgram $out/bin/dms --add-flags "-c $out/share/quickshell/dms"

                install -Dm644 ${rootSrc}/assets/systemd/dms.service \
                  $out/lib/systemd/user/dms.service
@@ -155,11 +143,15 @@
      devShells = forEachSystem (
        system: pkgs:
        let
-          devQmlPkgs = [
+          qmlPkgs = [
            quickshell.packages.${system}.default
-            pkgs.kdePackages.qtdeclarative
          ]
-          ++ (qmlPkgs pkgs);
+          ++ (with pkgs.kdePackages; [
+            qtdeclarative
+            kirigami.unwrapped
+            sonnet
+            qtmultimedia
+          ]);
        in
        {
          default = pkgs.mkShell {
@@ -172,13 +164,13 @@
                go-tools
                gnumake
              ]
-              ++ devQmlPkgs;
+              ++ qmlPkgs;

            shellHook = ''
              touch quickshell/.qmlls.ini 2>/dev/null
            '';

-            QML2_IMPORT_PATH = mkQmlImportPath pkgs devQmlPkgs;
+            QML2_IMPORT_PATH = pkgs.lib.concatStringsSep ":" (map (o: "${o}/lib/qt-6/qml") qmlPkgs);
          };
        }
      );
--- a/quickshell/CODENAME
+++ b/quickshell/CODENAME
@@ -1 +1 @@
-Spicy Miso
+The Dark Knight
--- a/quickshell/Modules/DankBar/DankBarContent.qml
+++ b/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");
            }
        }
    }
--- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/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"
                                                }
                                            }
--- a/quickshell/Services/KeybindsService.qml
+++ b/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);
--- a/quickshell/VERSION
+++ b/quickshell/VERSION
@@ -1 +1 @@
-v1.2-unstable
+v1.0.1
--- a/quickshell/Widgets/KeybindItem.qml
+++ b/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
Author	SHA1	Message	Date
bbedward	830dd93af5	chore: bump version to v1.0.1	2025-12-12 10:04:47 -05:00
bbedward	75f28c5ea7	ci: switch to dispatch-based release flow	2025-12-12 10:04:20 -05:00
bbedward	6c9b8c590e	dankinstall: call add-wants for niri/hyprland with dms service	2025-12-12 10:04:20 -05:00
bbedward	24d9b77307	niri: fix keybind handling of cooldown-ms parameter	2025-12-12 10:04:20 -05:00
bbedward	d4be68912c	workspaces: make icons scale with bar size, fixi valign of numbers fixes #990	2025-12-12 10:04:20 -05:00
bbedward	a443721000	core: fix socket reported CLI version	2025-12-12 10:03:32 -05:00
bbedward	786b097187	plugins: hide uninstall and update buttons for system plugins	2025-12-12 10:03:18 -05:00
bbedward	8ca60c7d2a	dwl: fix layout popout not opening fixes #980	2025-12-12 10:03:04 -05:00