Manual Changelog versioning

nix: drop unnecessary dependencies and enable power and accounts daemons (#963 )
Revert "distro: update ppa-build script to ref right version"
2026-01-31 17:02:51 -05:00 · 2025-12-10 13:52:29 -05:00 · 2025-12-10 19:35:58 +01:00 · 2025-12-10 13:31:15 -05:00 · 2025-12-10 13:28:34 -05:00 · 2025-12-10 12:37:56 -05:00
37 changed files with 759 additions and 561 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,19 +1,16 @@
 name: Release

 on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "Tag to release (e.g., v1.0.1)"
-        required: true
-        type: string
+  push:
+    tags:
+      - "v*"

 permissions:
  contents: write
  actions: write

 concurrency:
-  group: release-${{ inputs.tag }}
+  group: release-${{ github.ref_name }}
  cancel-in-progress: true

 jobs:
@@ -27,14 +24,10 @@ 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
@@ -61,7 +54,7 @@ jobs:
        run: |
          set -eux
          cd cmd/dankinstall
-          go build -trimpath -ldflags "-s -w -X main.Version=${TAG}" \
+          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
            -o ../../dankinstall-${{ matrix.arch }}
          cd ../..
          gzip -9 -k dankinstall-${{ matrix.arch }}
@@ -75,7 +68,7 @@ jobs:
        run: |
          set -eux
          cd cmd/dms
-          go build -trimpath -ldflags "-s -w -X main.Version=${TAG}" \
+          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
            -o ../../dms-${{ matrix.arch }}
          cd ../..
          gzip -9 -k dms-${{ matrix.arch }}
@@ -98,7 +91,7 @@ jobs:
        run: |
          set -eux
          cd cmd/dms
-          go build -trimpath -tags distro_binary -ldflags "-s -w -X main.Version=${TAG}" \
+          go build -trimpath -tags distro_binary -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
            -o ../../dms-distropkg-${{ matrix.arch }}
          cd ../..
          gzip -9 -k dms-distropkg-${{ matrix.arch }}
@@ -178,18 +171,17 @@ jobs:
    runs-on: ubuntu-24.04
    needs: [build-core] #, update-versions]
    env:
-      TAG: ${{ inputs.tag }}
+      TAG: ${{ github.ref_name }}
    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 ${TAG}
-          git checkout ${TAG}
+          git fetch origin --force tag ${{ github.ref_name }}
+          git checkout ${{ github.ref_name }}

      - name: Download core artifacts
        uses: actions/download-artifact@v4
@@ -280,6 +272,9 @@ 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' \
@@ -396,296 +391,288 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  # trigger-obs-update:
-  #   runs-on: ubuntu-latest
-  #   needs: release
-  #   env:
-  #     TAG: ${{ inputs.tag }}
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #       with:
-  #         ref: ${{ inputs.tag }}
+  trigger-obs-update:
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4

-  #     - name: Install OSC
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y osc
+      - name: Install OSC
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc

-  #         mkdir -p ~/.config/osc
-  #         cat > ~/.config/osc/oscrc << EOF
-  #         [general]
-  #         apiurl = https://api.opensuse.org
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org

-  #         [https://api.opensuse.org]
-  #         user = ${{ secrets.OBS_USERNAME }}
-  #         pass = ${{ secrets.OBS_PASSWORD }}
-  #         EOF
-  #         chmod 600 ~/.config/osc/oscrc
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc

-  #     - name: Update OBS packages
-  #       run: |
-  #         cd distro
-  #         bash scripts/obs-upload.sh dms "Update to ${TAG}"
+      - name: Update OBS packages
+        run: |
+          VERSION="${{ github.ref_name }}"
+          cd distro
+          bash scripts/obs-upload.sh dms "Update to $VERSION"

-  # trigger-ppa-update:
-  #   runs-on: ubuntu-latest
-  #   needs: release
-  #   env:
-  #     TAG: ${{ inputs.tag }}
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #       with:
-  #         ref: ${{ inputs.tag }}
+  trigger-ppa-update:
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4

-  #     - name: Install build dependencies
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y \
-  #           debhelper \
-  #           devscripts \
-  #           dput \
-  #           lftp \
-  #           build-essential \
-  #           fakeroot \
-  #           dpkg-dev
+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            debhelper \
+            devscripts \
+            dput \
+            lftp \
+            build-essential \
+            fakeroot \
+            dpkg-dev

-  #     - name: Configure GPG
-  #       env:
-  #         GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-  #       run: |
-  #         echo "$GPG_KEY" | gpg --import
-  #         GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
-  #         echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
+      - name: Configure GPG
+        env:
+          GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+        run: |
+          echo "$GPG_KEY" | gpg --import
+          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
+          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV

-  #     - name: Upload to PPA
-  #       run: |
-  #         cd distro/ubuntu/ppa
-  #         bash create-and-upload.sh ../dms dms questing
+      - name: Upload to PPA
+        run: |
+          VERSION="${{ github.ref_name }}"
+          cd distro/ubuntu/ppa
+          bash create-and-upload.sh ../dms dms questing

-  # copr-build:
-  #   runs-on: ubuntu-latest
-  #   needs: release
-  #   env:
-  #     TAG: ${{ inputs.tag }}
+  copr-build:
+    runs-on: ubuntu-latest
+    needs: release
+    env:
+      TAG: ${{ github.ref_name }}

-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v4
-  #       with:
-  #         ref: ${{ inputs.tag }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4

-  #     - name: Determine version
-  #       id: version
-  #       run: |
-  #         VERSION="${TAG#v}"
-  #         echo "version=$VERSION" >> $GITHUB_OUTPUT
-  #         echo "Building DMS stable version: $VERSION"
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="${TAG#v}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Building DMS stable version: $VERSION"

-  #     - name: Setup build environment
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y rpm wget curl jq gzip
-  #         mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+      - name: Setup build environment
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y rpm wget curl jq gzip
+          mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}

-  #     - name: Download release assets
-  #       run: |
-  #         VERSION="${{ steps.version.outputs.version }}"
-  #         cd ~/rpmbuild/SOURCES
+      - name: Download release assets
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          cd ~/rpmbuild/SOURCES

-  #         wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
-  #           echo "Failed to download dms-qml.tar.gz for v${VERSION}"
-  #           exit 1
-  #         }
+          wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
+            echo "Failed to download dms-qml.tar.gz for v${VERSION}"
+            exit 1
+          }

-  #     - name: Generate stable spec file
-  #       run: |
-  #         VERSION="${{ steps.version.outputs.version }}"
-  #         CHANGELOG_DATE="$(date '+%a %b %d %Y')"
+      - name: Generate stable spec file
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          CHANGELOG_DATE="$(date '+%a %b %d %Y')"

-  #         cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
-  #         # Spec for DMS stable releases - Generated by GitHub Actions
+          cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+          # Spec for DMS stable releases - Generated by GitHub Actions

-  #         %global debug_package %{nil}
-  #         %global version VERSION_PLACEHOLDER
-  #         %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+          %global debug_package %{nil}
+          %global version VERSION_PLACEHOLDER
+          %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors

-  #         Name:           dms
-  #         Version:        %{version}
-  #         Release:        1%{?dist}
-  #         Summary:        %{pkg_summary}
+          Name:           dms
+          Version:        %{version}
+          Release:        1%{?dist}
+          Summary:        %{pkg_summary}

-  #         License:        MIT
-  #         URL:            https://github.com/AvengeMedia/DankMaterialShell
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell

-  #         Source0:        dms-qml.tar.gz
+          Source0:        dms-qml.tar.gz

-  #         BuildRequires:  gzip
-  #         BuildRequires:  wget
-  #         BuildRequires:  systemd-rpm-macros
+          BuildRequires:  gzip
+          BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros

-  #         Requires:       (quickshell or quickshell-git)
-  #         Requires:       accountsservice
-  #         Requires:       dms-cli = %{version}-%{release}
-  #         Requires:       dgop
+          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
+          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.
+          %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.
+          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
+          %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.
+          %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
+          %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
+          # Download architecture-specific binaries during build
+          case "%{_arch}" in
+            x86_64)
+              ARCH_SUFFIX="amd64"
+              ;;
+            aarch64)
+              ARCH_SUFFIX="arm64"
+              ;;
+            *)
+              echo "Unsupported architecture: %{_arch}"
+              exit 1
+              ;;
+          esac

-  #         wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
-  #           echo "Failed to download dms-cli for architecture %{_arch}"
-  #           exit 1
-  #         }
-  #         gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
-  #         chmod +x %{_builddir}/dms-cli
+          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dms-cli for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+          chmod +x %{_builddir}/dms-cli

-  #         %build
+          %build

-  #         %install
-  #         install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+          %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 -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/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 -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/
+          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
+          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
+          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 || :
+          %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
+          %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
+          %files -n dms-cli
+          %{_bindir}/dms
+          %{_datadir}/bash-completion/completions/dms
+          %{_datadir}/zsh/site-functions/_dms
+          %{_datadir}/fish/vendor_completions.d/dms.fish

-  #         %changelog
-  #         * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
-  #         - Stable release VERSION_PLACEHOLDER
-  #         - Built from GitHub release
-  #         SPECEOF
+          %changelog
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
+          - Stable release VERSION_PLACEHOLDER
+          - Built from GitHub release
+          SPECEOF

-  #         sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
-  #         sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec

-  #     - name: Build SRPM
-  #       id: build
-  #       run: |
-  #         cd ~/rpmbuild/SPECS
-  #         rpmbuild -bs dms.spec
+      - name: Build SRPM
+        id: build
+        run: |
+          cd ~/rpmbuild/SPECS
+          rpmbuild -bs dms.spec

-  #         SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
-  #         SRPM_NAME=$(basename "$SRPM")
+          SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
+          SRPM_NAME=$(basename "$SRPM")

-  #         echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
-  #         echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
-  #         echo "SRPM built: $SRPM_NAME"
+          echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
+          echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
+          echo "SRPM built: $SRPM_NAME"

-  #     - name: Upload SRPM artifact
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: dms-stable-srpm-${{ steps.version.outputs.version }}
-  #         path: ${{ steps.build.outputs.srpm_path }}
-  #         retention-days: 90
+      - name: Upload SRPM artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dms-stable-srpm-${{ steps.version.outputs.version }}
+          path: ${{ steps.build.outputs.srpm_path }}
+          retention-days: 90

-  #     - name: Install Copr CLI
-  #       run: |
-  #         sudo apt-get install -y python3-pip
-  #         pip3 install copr-cli
+      - name: Install Copr CLI
+        run: |
+          sudo apt-get install -y python3-pip
+          pip3 install copr-cli

-  #         mkdir -p ~/.config
-  #         cat > ~/.config/copr << EOF
-  #         [copr-cli]
-  #         login = ${{ secrets.COPR_LOGIN }}
-  #         username = avengemedia
-  #         token = ${{ secrets.COPR_TOKEN }}
-  #         copr_url = https://copr.fedorainfracloud.org
-  #         EOF
-  #         chmod 600 ~/.config/copr
+          mkdir -p ~/.config
+          cat > ~/.config/copr << EOF
+          [copr-cli]
+          login = ${{ secrets.COPR_LOGIN }}
+          username = avengemedia
+          token = ${{ secrets.COPR_TOKEN }}
+          copr_url = https://copr.fedorainfracloud.org
+          EOF
+          chmod 600 ~/.config/copr

-  #     - name: Upload to Copr
-  #       run: |
-  #         SRPM="${{ steps.build.outputs.srpm_path }}"
-  #         VERSION="${{ steps.version.outputs.version }}"
+      - name: Upload to Copr
+        run: |
+          SRPM="${{ steps.build.outputs.srpm_path }}"
+          VERSION="${{ steps.version.outputs.version }}"

-  #         echo "Uploading SRPM to avengemedia/dms..."
-  #         BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
-  #         echo "$BUILD_OUTPUT"
+          echo "Uploading SRPM to avengemedia/dms..."
+          BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
+          echo "$BUILD_OUTPUT"

-  #         BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
+          BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")

-  #         if [ "$BUILD_ID" != "unknown" ]; then
-  #           echo "Build submitted: https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
-  #         fi
+          if [ "$BUILD_ID" != "unknown" ]; then
+            echo "Build submitted: https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
+          fi
--- a/.github/workflows/run-ppa.yml
+++ b/.github/workflows/run-ppa.yml
@@ -130,6 +130,12 @@ 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..."
@@ -137,25 +143,25 @@ jobs:
              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
            fi
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms" dms questing
+            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms" dms questing
            
            echo ""
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading dms-git to PPA..."
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-git" dms-git questing
+            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-git" dms-git questing
            
            echo ""
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading dms-greeter to PPA..."
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-greeter" danklinux questing
+            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-greeter" danklinux questing
          else
            PPA_NAME="$PACKAGES"
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading $PACKAGES to PPA..."
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash distro/scripts/ppa-upload.sh "distro/ubuntu/$PACKAGES" "$PPA_NAME" questing
+            REBUILD_RELEASE="$REBUILD_RELEASE" bash distro/scripts/ppa-upload.sh "distro/ubuntu/$PACKAGES" "$PPA_NAME" questing
          fi
      
      - name: Summary
--- a/core/cmd/dms/shell.go
+++ b/core/cmd/dms/shell.go
@@ -155,7 +155,6 @@ 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)
 		}
--- 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, wm); err != nil {
+	if err := a.EnableDMSService(ctx); 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,24 +597,12 @@ TERMINAL=%s
 	return nil
 }

-func (b *BaseDistribution) EnableDMSService(ctx context.Context, wm deps.WindowManager) error {
+func (b *BaseDistribution) EnableDMSService(ctx context.Context) 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, wm); err != nil {
+	if err := d.EnableDMSService(ctx); 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, wm); err != nil {
+	if err := f.EnableDMSService(ctx); 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, wm); err != nil {
+	if err := g.EnableDMSService(ctx); 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, wm); err != nil {
+	if err := o.EnableDMSService(ctx); 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, wm); err != nil {
+	if err := u.EnableDMSService(ctx); 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,7 +6,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"sort"
-	"strconv"
 	"strings"

 	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds"
@@ -154,7 +153,6 @@ func (n *NiriProvider) convertKeybind(kb *NiriKeyBinding, subcategory string, co
 		Subcategory:   subcategory,
 		Source:        source,
 		HideOnOverlay: kb.HideOnOverlay,
-		CooldownMs:    kb.CooldownMs,
 	}

 	if source == "dms" && conflicts != nil {
@@ -312,9 +310,7 @@ func (n *NiriProvider) extractOptions(node *document.Node) map[string]any {
 		opts["repeat"] = val.String() == "true"
 	}
 	if val, ok := node.Properties.Get("cooldown-ms"); ok {
-		if ms, err := strconv.Atoi(val.String()); err == nil {
-			opts["cooldown-ms"] = ms
-		}
+		opts["cooldown-ms"] = val.String()
 	}
 	if val, ok := node.Properties.Get("allow-when-locked"); ok {
 		opts["allow-when-locked"] = val.String() == "true"
@@ -340,14 +336,7 @@ func (n *NiriProvider) buildBindNode(bind *overrideBind) *document.Node {
 			node.AddProperty("repeat", false, "")
 		}
 		if v, ok := bind.Options["cooldown-ms"]; ok {
-			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, "")
-				}
-			}
+			node.AddProperty("cooldown-ms", v, "")
 		}
 		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,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"

 	"github.com/sblinch/kdl-go"
@@ -18,7 +17,6 @@ type NiriKeyBinding struct {
 	Args          []string
 	Description   string
 	HideOnOverlay bool
-	CooldownMs    int
 	Source        string
 }

@@ -277,7 +275,6 @@ 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() {
@@ -287,9 +284,6 @@ 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{
@@ -299,7 +293,6 @@ 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,7 +7,6 @@ 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/core/internal/server/wayland/manager.go
+++ b/core/internal/server/wayland/manager.go
@@ -643,16 +643,6 @@ 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
--- a/distro/debian/dms-git/debian/changelog
+++ b/distro/debian/dms-git/debian/changelog
@@ -1,5 +1,6 @@
-dms-git (0.6.2+git2419.993f14a3) nightly; urgency=medium
+dms-git (1.0.0+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/v0.6.2.tar.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/archive/refs/tags/v1.0.0.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/v0.6.2/dms-distropkg-amd64.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.0/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/v0.6.2/dms-distropkg-arm64.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.0/dms-distropkg-arm64.gz</param>
  </service>
 </services>
--- a/distro/debian/dms/debian/changelog
+++ b/distro/debian/dms/debian/changelog
@@ -1,6 +1,7 @@
-dms (0.6.2) stable; urgency=medium
+dms (1.0.0) stable; urgency=medium

-  * Update to v0.6.2 release
+  * Update to v1.0.0 release
+  * Major stable 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,8 +42,10 @@ override_dh_auto_build:
 		elif [ -f dms-source.tar.gz ]; then \
 			tar -xzf dms-source.tar.gz; \
 		fi; \
-		if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ] && [ -d DankMaterialShell-0.6.2 ]; then \
-			mv DankMaterialShell-0.6.2 DankMaterialShell-$(UPSTREAM_VERSION); \
+		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); \
 		fi; \
 	fi

@@ -53,8 +55,12 @@ 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) ] && [ -d DankMaterialShell-0.6.2 ]; then \
-		mv DankMaterialShell-0.6.2 DankMaterialShell-$(UPSTREAM_VERSION); \
+	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; \
 	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
@@ -12,14 +12,6 @@ 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
@@ -31,8 +23,6 @@ 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
--- a/distro/nix/nixos.nix
+++ b/distro/nix/nixos.nix
@@ -40,5 +40,8 @@ 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,11 +5,21 @@
 }:
 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)
+  ];
+
  options.programs.dankMaterialShell = {
    enable = lib.mkEnableOption "DankMaterialShell";
-
    systemd = {
      enable = lib.mkEnableOption "DankMaterialShell systemd startup";
      restartIfChanged = lib.mkOption {
@@ -33,16 +43,6 @@ 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;
--- a/distro/opensuse/dms.spec
+++ b/distro/opensuse/dms.spec
@@ -3,7 +3,7 @@
 %global debug_package %{nil}

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

--- a/distro/scripts/copr-upload.sh
+++ b/distro/scripts/copr-upload.sh
@@ -0,0 +1,228 @@
+#!/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,7 +672,20 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
        if [[ "$IS_MANUAL" == true ]]; then
            echo "==> Detected rebuild of same base version $CHANGELOG_BASE, incrementing version"
        
-            if [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git$ ]]; then
+            # 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
                BASE_VERSION="${BASH_REMATCH[1]}"
                NEW_VERSION="${BASE_VERSION}+gitppa1"
                echo "  Adding PPA number: $CHANGELOG_VERSION -> $NEW_VERSION"
@@ -704,11 +717,27 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
                fi
            elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)(-([0-9]+))?$ ]]; then
                BASE_VERSION="${BASH_REMATCH[1]}"
-                NEW_VERSION="${BASE_VERSION}ppa1"
-                echo "  Warning: Native format cannot have Debian revision, converting to PPA format: $CHANGELOG_VERSION -> $NEW_VERSION"
+                # 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
            else
-                NEW_VERSION="${CHANGELOG_VERSION}ppa1"
-                echo "  Warning: Could not parse version format, appending ppa1: $CHANGELOG_VERSION -> $NEW_VERSION"
+                # 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
            fi
            
            if [[ -z "$SOURCE_DIR" ]] || [[ ! -d "$SOURCE_DIR" ]] || [[ ! -d "$SOURCE_DIR/debian" ]]; then
@@ -763,7 +792,15 @@ 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"
-                    tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/dms-source.tar.gz" "$EXPECTED_SOURCE_DIR"
+                    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
                    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)"
@@ -839,11 +876,7 @@ 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)
            
@@ -884,15 +917,40 @@ 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,9 +50,15 @@ 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
@@ -119,8 +125,13 @@ 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 "$PACKAGE_DIR"
+cd "$WORK_PACKAGE_DIR"

 # Function to get latest tag from GitHub
 get_latest_tag() {
@@ -283,22 +294,29 @@ 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
        
-        # 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
+        # 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
-            info "New commit or first build, using PPA number $PPA_NUM"
+            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
+            else
+                info "New commit or first build, using PPA number $PPA_NUM"
+            fi
        fi
        
        NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}"
@@ -429,16 +447,23 @@ 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 "")
-        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
+        fi

        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 [[ "$CURRENT_VERSION" =~ ^${LATEST_TAG}ppa([0-9]+)$ ]]; then
+            if [[ -z "${REBUILD_RELEASE:-}" ]] && [[ "$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"
-            else
+            elif [[ -z "${REBUILD_RELEASE:-}" ]]; then
                info "New version or first build, using PPA number $PPA_NUM"
            fi
            NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}"
@@ -447,7 +472,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 [[ "$CURRENT_VERSION" =~ ^${ESCAPED_BASE}ppa([0-9]+)$ ]]; then
+            if [[ -z "${REBUILD_RELEASE:-}" ]] && [[ "$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"
@@ -456,7 +481,7 @@ elif [ -n "$GIT_REPO" ]; then
                    success "No changes needed (version matches)."
                    exit 0
                fi
-            else
+            elif [[ -z "${REBUILD_RELEASE:-}" ]]; then
                info "New version or first build, using PPA number $PPA_NUM"
            fi
            NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}"
@@ -575,10 +600,12 @@ 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 parent directory (previous build)
+# Check if .orig.tar.xz already exists in real parent directory (previous build)
 ORIG_TARBALL="${PACKAGE_NAME}_${VERSION%.ppa*}.orig.tar.xz"
-if [ -f "../$ORIG_TARBALL" ]; then
-    info "Found existing orig tarball, using -sd (debian changes only)"
+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/"
    DEBUILD_SOURCE_FLAG="-sd"
 else
    info "No existing orig tarball found, using -sa (include original source)"
@@ -592,15 +619,19 @@ 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 $(dirname "$PACKAGE_DIR"):"
-    ls -lh "$(dirname "$PACKAGE_DIR")"/${SOURCE_NAME}_${CHANGELOG_VERSION}* 2>/dev/null || true
+    info "Generated files in $PACKAGE_PARENT:"
+    ls -lh "$PACKAGE_PARENT"/${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 $(dirname "$PACKAGE_DIR")"
+    echo "     cd $PACKAGE_PARENT"
    echo "     ls -lh ${SOURCE_NAME}_${CHANGELOG_VERSION}*"
    echo
    echo "  2. Upload to PPA (stable):"
@@ -610,7 +641,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 $(dirname "$PACKAGE_DIR")/${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes dms"
+    echo "     ./upload-ppa.sh $PACKAGE_PARENT/${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,7 +150,38 @@ fi
 info "Uploading to Launchpad..."
 echo

-if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; then
+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
    echo
    success "Upload successful!"
    echo
@@ -166,7 +197,6 @@ if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; 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 (0.6.2ppa3) questing; urgency=medium
+dms (1.0.0ppa4) questing; urgency=medium

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

- -- Avenge Media <AvengeMedia.US@gmail.com>  Sun, 23 Nov 2025 00:40:41 -0500
+ -- Avenge Media <AvengeMedia.US@gmail.com>  Wed, 10 Dec 2025 12:56:23 -0500
--- a/distro/ubuntu/dms/debian/files
+++ b/distro/ubuntu/dms/debian/files
@@ -1 +1 @@
-dms_0.6.2ppa3_source.buildinfo x11 optional
+dms_1.0.0ppa4_source.buildinfo x11 optional
--- a/distro/ubuntu/dms/debian/rules
+++ b/distro/ubuntu/dms/debian/rules
@@ -29,25 +29,22 @@ 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 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); \
+	# 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; \
 	fi

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

-	# 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/
-
-	# Remove unnecessary directories
-	rm -rf debian/dms/usr/share/quickshell/dms/core
-	rm -rf debian/dms/usr/share/quickshell/dms/distro
-
-	# Install systemd user service
+	# 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

@@ -57,6 +54,15 @@ override_dh_auto_install:
 	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/
+
+	# 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
+
 	# Create VERSION file for Quickshell (stable release format)
 	echo "$(BASE_VERSION)" > debian/dms/usr/share/quickshell/dms/VERSION

--- a/quickshell/CODENAME
+++ b/quickshell/CODENAME
@@ -1 +1 @@
-The Dark Knight
+Spicy Miso
--- a/quickshell/Modals/Settings/SettingsModal.qml
+++ b/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: screen ? Math.min(940, screen.height - 100) : 940
+    implicitHeight: 940
    color: Theme.surfaceContainer
    visible: false

--- a/quickshell/Modules/DankBar/DankBarContent.qml
+++ b/quickshell/Modules/DankBar/DankBarContent.qml
@@ -1088,7 +1088,6 @@ Item {
        id: layoutComponent

        DWLLayout {
-            id: layoutWidget
            layoutPopupVisible: layoutPopoutLoader.item ? layoutPopoutLoader.item.shouldBeVisible : false
            widgetThickness: barWindow.widgetThickness
            barThickness: barWindow.effectiveBarThickness
@@ -1101,19 +1100,14 @@ 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.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);
+                if (layoutPopoutLoader.item && layoutPopoutLoader.item.setBarContext) {
+                    layoutPopoutLoader.item.setBarContext(barPosition, effectiveBarConfig?.bottomGap ?? 0);
+                }
+                if (layoutPopoutLoader.item) {
+                    PopoutManager.requestPopout(layoutPopoutLoader.item, undefined, "layout");
                }
-
-                PopoutManager.requestPopout(layoutPopoutLoader.item, undefined, "layout");
            }
        }
    }
--- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Effects
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Hyprland
@@ -246,14 +245,11 @@ Item {
            if (!byApp[key]) {
                const moddedId = Paths.moddedAppId(keyBase);
                const isSteamApp = moddedId.toLowerCase().includes("steam_app");
-                const isQuickshell = keyBase === "org.quickshell";
-                const desktopEntry = DesktopEntries.heuristicLookup(keyBase);
-                const icon = isSteamApp ? "" : Paths.getAppIcon(keyBase, desktopEntry);
+                const icon = isSteamApp ? "" : DesktopService.resolveIconPath(moddedId);
                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,
@@ -450,7 +446,6 @@ 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 => {
@@ -724,14 +719,14 @@ Item {
                readonly property real iconsExtraWidth: {
                    if (!root.isVertical && SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
                        const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                        return numIcons * root.appIconSize + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
+                        return numIcons * 18 + (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 * root.appIconSize + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
+                        return numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0) + (isActive ? Theme.spacingXS : 0);
                    }
                    return 0;
                }
@@ -902,7 +897,7 @@ Item {
                                    Item {
                                        visible: loadedHasIcon && loadedIconData?.type === "icon"
                                        width: wsIcon.width + (isActive && loadedIcons.length > 0 ? 4 : 0)
-                                        height: root.appIconSize
+                                        height: 18

                                        DankIcon {
                                            id: wsIcon
@@ -917,7 +912,7 @@ Item {
                                    Item {
                                        visible: loadedHasIcon && loadedIconData?.type === "text"
                                        width: wsText.implicitWidth + (isActive && loadedIcons.length > 0 ? 4 : 0)
-                                        height: root.appIconSize
+                                        height: 18

                                        StyledText {
                                            id: wsText
@@ -932,7 +927,7 @@ Item {
                                    Item {
                                        visible: SettingsData.showWorkspaceIndex && !loadedHasIcon
                                        width: wsIndexText.implicitWidth + (isActive && loadedIcons.length > 0 ? 4 : 0)
-                                        height: root.appIconSize
+                                        height: 18

                                        StyledText {
                                            id: wsIndexText
@@ -949,61 +944,48 @@ Item {
                                            values: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
                                        }
                                        delegate: Item {
-                                            width: root.appIconSize
-                                            height: root.appIconSize
+                                            width: 18
+                                            height: 18

                                            IconImage {
-                                                id: rowAppIcon
+                                                id: appIcon
+                                                property var windowId: modelData.windowId
                                                anchors.fill: parent
                                                source: modelData.icon
-                                                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
-                                                }
+                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: !modelData.isSteamApp
                                            }

                                            DankIcon {
                                                anchors.centerIn: parent
-                                                size: root.appIconSize
+                                                size: 18
                                                name: "sports_esports"
                                                color: Theme.widgetTextColor
-                                                opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
                                                visible: modelData.isSteamApp
                                            }

                                            MouseArea {
-                                                id: rowAppMouseArea
+                                                id: appMouseArea
                                                anchors.fill: parent
                                                enabled: isActive
                                                cursorShape: Qt.PointingHandCursor
                                                onClicked: {
-                                                    const winId = modelData.windowId;
-                                                    if (!winId)
+                                                    if (!appIcon.windowId)
                                                        return;
                                                    if (CompositorService.isHyprland) {
-                                                        Hyprland.dispatch(`focuswindow address:${winId}`);
+                                                        Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`);
                                                    } else if (CompositorService.isNiri) {
-                                                        NiriService.focusWindow(winId);
+                                                        NiriService.focusWindow(appIcon.windowId);
                                                    }
                                                }
                                            }

                                            Rectangle {
                                                visible: modelData.count > 1 && !isActive
-                                                width: root.appIconSize * 0.67
-                                                height: root.appIconSize * 0.67
-                                                radius: root.appIconSize * 0.33
+                                                width: 12
+                                                height: 12
+                                                radius: 6
                                                color: "black"
                                                border.color: "white"
                                                border.width: 1
@@ -1014,7 +996,7 @@ Item {
                                                Text {
                                                    anchors.centerIn: parent
                                                    text: modelData.count
-                                                    font.pixelSize: root.appIconSize * 0.44
+                                                    font.pixelSize: 8
                                                    color: "white"
                                                }
                                            }
@@ -1052,61 +1034,48 @@ Item {
                                            values: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
                                        }
                                        delegate: Item {
-                                            width: root.appIconSize
-                                            height: root.appIconSize
+                                            width: 18
+                                            height: 18

                                            IconImage {
-                                                id: colAppIcon
+                                                id: appIcon
+                                                property var windowId: modelData.windowId
                                                anchors.fill: parent
                                                source: modelData.icon
-                                                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
-                                                }
+                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: !modelData.isSteamApp
                                            }

                                            DankIcon {
                                                anchors.centerIn: parent
-                                                size: root.appIconSize
+                                                size: 18
                                                name: "sports_esports"
                                                color: Theme.widgetTextColor
-                                                opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
                                                visible: modelData.isSteamApp
                                            }

                                            MouseArea {
-                                                id: colAppMouseArea
+                                                id: appMouseArea
                                                anchors.fill: parent
                                                enabled: isActive
                                                cursorShape: Qt.PointingHandCursor
                                                onClicked: {
-                                                    const winId = modelData.windowId;
-                                                    if (!winId)
+                                                    if (!appIcon.windowId)
                                                        return;
                                                    if (CompositorService.isHyprland) {
-                                                        Hyprland.dispatch(`focuswindow address:${winId}`);
+                                                        Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`);
                                                    } else if (CompositorService.isNiri) {
-                                                        NiriService.focusWindow(winId);
+                                                        NiriService.focusWindow(appIcon.windowId);
                                                    }
                                                }
                                            }

                                            Rectangle {
                                                visible: modelData.count > 1 && !isActive
-                                                width: root.appIconSize * 0.67
-                                                height: root.appIconSize * 0.67
-                                                radius: root.appIconSize * 0.33
+                                                width: 12
+                                                height: 12
+                                                radius: 6
                                                color: "black"
                                                border.color: "white"
                                                border.width: 1
@@ -1117,7 +1086,7 @@ Item {
                                                Text {
                                                    anchors.centerIn: parent
                                                    text: modelData.count
-                                                    font.pixelSize: root.appIconSize * 0.44
+                                                    font.pixelSize: 8
                                                    color: "white"
                                                }
                                            }
--- a/quickshell/Modules/Settings/PluginListItem.qml
+++ b/quickshell/Modules/Settings/PluginListItem.qml
@@ -28,7 +28,6 @@ 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;
@@ -117,7 +116,7 @@ StyledRect {
                    height: 28
                    radius: 14
                    color: updateArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent"
-                    visible: DMSService.dmsAvailable && root.isLoaded && root.hasUpdate && !root.isSystemPlugin
+                    visible: DMSService.dmsAvailable && root.isLoaded && root.hasUpdate

                    DankIcon {
                        anchors.centerIn: parent
@@ -161,7 +160,7 @@ StyledRect {
                    height: 28
                    radius: 14
                    color: uninstallArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent"
-                    visible: DMSService.dmsAvailable && !root.isSystemPlugin
+                    visible: DMSService.dmsAvailable

                    DankIcon {
                        anchors.centerIn: parent
--- a/quickshell/Services/KeybindsService.qml
+++ b/quickshell/Services/KeybindsService.qml
@@ -314,8 +314,7 @@ Singleton {
                const keyData = {
                    key: bind.key || "",
                    source: bind.source || "config",
-                    isOverride: bind.source === "dms",
-                    cooldownMs: bind.cooldownMs || 0
+                    isOverride: bind.source === "dms"
                };
                if (actionMap[action]) {
                    actionMap[action].keys.push(keyData);
@@ -379,8 +378,6 @@ 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.0.2
+v1.2-unstable
--- a/quickshell/Widgets/KeybindItem.qml
+++ b/quickshell/Widgets/KeybindItem.qml
@@ -23,8 +23,6 @@ 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
@@ -92,12 +90,6 @@ 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);
@@ -117,7 +109,6 @@ 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);
@@ -136,7 +127,6 @@ Item {
        addingNewKey = false;
        editingKeyIndex = index;
        editKey = keys[index].key;
-        editCooldownMs = keys[index].cooldownMs || 0;
        hasChanges = false;
    }

@@ -147,11 +137,8 @@ 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 : "";
-        const origCooldown = editingKeyIndex >= 0 && editingKeyIndex < keys.length ? (keys[editingKeyIndex].cooldownMs || 0) : 0;
-        hasChanges = editKey !== origKey || editAction !== (bindData.action || "") || editDesc !== (bindData.desc || "") || editCooldownMs !== origCooldown;
+        hasChanges = editKey !== origKey || editAction !== (bindData.action || "") || editDesc !== (bindData.desc || "");
    }

    function canSave() {
@@ -169,12 +156,10 @@ Item {
        let desc = editDesc;
        if (expandedLoader.item?.currentTitle !== undefined)
            desc = expandedLoader.item.currentTitle;
-        _savedCooldownMs = editCooldownMs;
        saveBind(origKey, {
            key: editKey,
            action: editAction,
-            desc: desc,
-            cooldownMs: editCooldownMs
+            desc: desc
        });
        hasChanges = false;
        addingNewKey = false;
@@ -1446,57 +1431,6 @@ 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
purian23	0dbd59b223	Manual Changelog versioning	2025-12-10 13:52:29 -05:00
Lucas	b2066c60d1	nix: drop unnecessary dependencies and enable power and accounts daemons (#963 )	2025-12-10 19:35:58 +01:00
bbedward	8d7ae324ff	Revert "distro: update ppa-build script to ref right version" This reverts commit `c0d3c4f875`.	2025-12-10 13:31:15 -05:00
bbedward	c0d3c4f875	distro: update ppa-build script to ref right version	2025-12-10 13:28:34 -05:00
purian23	27a771648a	Ubuntu workflow tweak	2025-12-10 12:37:56 -05:00
purian23	86affc7304	Add WorkDIR to build steps	2025-12-10 12:33:41 -05:00
purian23	d939b99628	Workflow build increment logic	2025-12-10 12:27:10 -05:00
purian23	1fcf777f3d	Bump OBS spec	2025-12-10 12:13:43 -05:00
purian23	7a8e23faa9	Update build scripts	2025-12-10 12:06:28 -05:00
bbedward	73a4dd3321	change codename	2025-12-10 11:18:08 -05:00
purian23	13ce873a69	Update dms stable systemd & desktop path	2025-12-10 11:16:03 -05:00