launcher: always heuristic lookup cached entries

* inverted dock visibility and position option

* added missing I18n strings

* added missing i18n strings

* added i18n strings

* Added missing i18n strings

* updated translations

* Update it.json

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,32 +7,32 @@ body:
     attributes:
       value: |
         ## DankMaterialShell Bug Report
-        Limit your report to one issue per submission unless similarly related
-  - type: dropdown
+        Limit your report to one issue per submission unless closely related
+  - type: checkboxes
     id: compositor
     attributes:
       label: Compositor
       options:
-        - Niri
-        - Hyprland
-        - MangoWC (dwl)
-        - Sway
+        - label: Niri
+        - label: Hyprland
+        - label: MangoWC (dwl)
+        - label: Sway
     validations:
       required: true
-  - type: dropdown
+  - type: checkboxes
     id: distribution
     attributes:
       label: Distribution
       options:
-        - Arch Linux
-        - CachyOS
-        - Fedora
-        - NixOS
-        - Debian
-        - Ubuntu
-        - Gentoo
-        - OpenSUSE
-        - Other (specify below)
+        - label: Arch Linux
+        - label: CachyOS
+        - label: Fedora
+        - label: NixOS
+        - label: Debian
+        - label: Ubuntu
+        - label: Gentoo
+        - label: OpenSUSE
+        - label: Other (specify below)
     validations:
       required: true
   - type: input
@@ -42,45 +42,12 @@ body:
       placeholder: e.g., PikaOS, Void Linux, etc.
     validations:
       required: false
-  - type: dropdown
-    id: installation_method
-    attributes:
-      label: Select your Installation Method
-      options:
-        - DankInstaller
-        - Distro Packaging
-        - Source
-    validations:
-      required: true
-  - type: dropdown
-    id: original_installation_method
-    attributes:
-      label: Was this your original Installation method?
-      options:
-        - "Yes"
-        - No (specify below)
-      default: 0
-    validations:
-      required: false
-  - type: input
-    id: original_installation_method_specify
-    attributes:
-      label: If no, specify
-      placeholder: e.g., Distro Packaging, then Source
-    validations:
-      required: false
   - type: textarea
     id: dms_doctor
     attributes:
       label: dms doctor -vC
-      description: Output of `dms doctor -vC` command — paste between the details tags below to keep it collapsed in the issue
+      description: Output of `dms doctor -vC` command
       placeholder: Paste the output of `dms doctor -vC` here
-      value: |
-        <details>
-        <summary>Click to expand</summary>
-
-
-        </details>
     validations:
       required: true
   - type: textarea
@@ -102,7 +69,7 @@ body:
   - type: textarea
     id: steps_to_reproduce
     attributes:
-      label: Steps to Reproduce
+      label: Steps to Reproduce & Installation Method
       description: Please provide detailed steps to reproduce the issue
       placeholder: |
         1. ...

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -23,25 +23,18 @@ body:
       placeholder: Why is this feature important?
     validations:
       required: false
-  - type: dropdown
+  - type: checkboxes
     id: compositor
     attributes:
       label: Compositor(s)
       description: Is this feature specific to one or more compositors?
       options:
-        - All compositors
-        - Niri
-        - Hyprland
-        - MangoWC (dwl)
-        - Sway
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: compositor_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., Wayfire, Mutter, etc.
+        - label: All compositors
+        - label: Niri
+        - label: Hyprland
+        - label: MangoWC (dwl)
+        - label: Sway
+        - label: Other (specify below)
     validations:
       required: false
   - type: textarea

.github/ISSUE_TEMPLATE/support_request.yml

@@ -7,87 +7,32 @@ body:
     attributes:
       value: |
         ## DankMaterialShell Support Request
-  - type: dropdown
+  - type: checkboxes
     id: compositor
     attributes:
       label: Compositor
       options:
-        - Niri
-        - Hyprland
-        - MangoWC (dwl)
-        - Sway
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: compositor_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., Wayfire, Mutter, etc.
+        - label: Niri
+        - label: Hyprland
+        - label: MangoWC (dwl)
+        - label: Sway
+        - label: Other (specify below)
     validations:
       required: false
-  - type: dropdown
+  - type: input
     id: distribution
     attributes:
       label: Distribution
-      options:
-        - Arch Linux
-        - CachyOS
-        - Fedora
-        - NixOS
-        - Debian
-        - Ubuntu
-        - Gentoo
-        - OpenSUSE
-        - Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: distribution_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., PikaOS, Void Linux, etc.
-    validations:
-      required: false
-  - type: dropdown
-    id: installation_method
-    attributes:
-      label: Select your Installation Method
-      options:
-        - DankInstaller
-        - Distro Packaging
-        - Source
-    validations:
-      required: true
-  - type: dropdown
-    id: original_installation_method_different
-    attributes:
-      label: Was your original Installation method different?
-      options:
-        - "Yes"
-        - No (specify below)
-      default: 0
-    validations:
-      required: false
-  - type: input
-    id: original_installation_method_specify
-    attributes:
-      label: If no, specify
-      placeholder: e.g., Distro Packaging, then Source
+      description: Which Linux distribution are you using? (e.g., Arch, Fedora, Debian, etc.)
+      placeholder: Your Linux distribution
     validations:
       required: false
   - type: textarea
     id: dms_doctor
     attributes:
       label: dms doctor -vC
-      description: Output of `dms doctor -vC` command — paste between the lines below to keep it collapsed in the issue
+      description: Output of `dms doctor -vC` command
       placeholder: Paste the output of `dms doctor -vC` here
-      value: |
-        <details>
-        <summary>Click to expand</summary>
-
-
-        </details>
     validations:
       required: false
   - type: textarea

.github/workflows/backup/run-obs.yml.bak

@@ -0,0 +1,383 @@
+name: Update OBS Packages
+
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        description: "Package to update (dms, dms-git, or all)"
+        required: false
+        default: "all"
+      force_upload:
+        description: "Force upload without version check"
+        required: false
+        default: "false"
+        type: choice
+        options:
+          - "false"
+          - "true"
+      rebuild_release:
+        description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)"
+        required: false
+        default: ""
+  push:
+    tags:
+      - "v*"
+  schedule:
+    - cron: "0 */3 * * *" # Every 3 hours for dms-git builds
+
+jobs:
+  check-updates:
+    name: Check for updates
+    runs-on: ubuntu-latest
+
+    outputs:
+      has_updates: ${{ steps.check.outputs.has_updates }}
+      packages: ${{ steps.check.outputs.packages }}
+      version: ${{ steps.check.outputs.version }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install OSC
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc
+
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org
+
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc
+
+      - name: Check for updates
+        id: check
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Triggered by tag: $VERSION (always update)"
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "Checking if dms-git source has changed..."
+
+            # Get current commit hash (8 chars to match spec format)
+            CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
+
+            # Check OBS for last uploaded commit
+            OBS_BASE="$HOME/.cache/osc-checkouts"
+            mkdir -p "$OBS_BASE"
+            OBS_PROJECT="home:AvengeMedia:dms-git"
+
+            if [[ -d "$OBS_BASE/$OBS_PROJECT/dms-git" ]]; then
+              cd "$OBS_BASE/$OBS_PROJECT/dms-git"
+              osc up -q 2>/dev/null || true
+
+              # Extract commit hash from spec Version line & format like; 0.6.2+git2264.a679be68
+              if [[ -f "dms-git.spec" ]]; then
+                OBS_COMMIT=$(grep "^Version:" "dms-git.spec" | grep -oP '\.[a-f0-9]{8}' | tr -d '.' || echo "")
+
+                if [[ -n "$OBS_COMMIT" ]]; then
+                  if [[ "$CURRENT_COMMIT" == "$OBS_COMMIT" ]]; then
+                    echo "has_updates=false" >> $GITHUB_OUTPUT
+                    echo "📋 Commit $CURRENT_COMMIT already uploaded to OBS, skipping"
+                  else
+                    echo "has_updates=true" >> $GITHUB_OUTPUT
+                    echo "📋 New commit detected: $CURRENT_COMMIT (OBS has $OBS_COMMIT)"
+                  fi
+                else
+                  echo "has_updates=true" >> $GITHUB_OUTPUT
+                  echo "📋 Could not extract OBS commit, proceeding with update"
+                fi
+              else
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+                echo "📋 No spec file in OBS, proceeding with update"
+              fi
+
+              cd "${{ github.workspace }}"
+            else
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "📋 First upload to OBS, update needed"
+            fi
+          elif [[ "${{ github.event.inputs.force_upload }}" == "true" ]]; then
+            PKG="${{ github.event.inputs.package }}"
+            if [[ -z "$PKG" || "$PKG" == "all" ]]; then
+              echo "packages=all" >> $GITHUB_OUTPUT
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "🚀 Force upload: all packages"
+            else
+              echo "packages=$PKG" >> $GITHUB_OUTPUT
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "🚀 Force upload: $PKG"
+            fi
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=all" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+          fi
+
+  update-obs:
+    name: Upload to OBS
+    needs: check-updates
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    if: |
+      github.event.inputs.force_upload == 'true' ||
+      github.event_name == 'workflow_dispatch' ||
+      needs.check-updates.outputs.has_updates == 'true'
+
+    steps:
+      - name: Generate GitHub App Token
+        id: generate_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.generate_token.outputs.token }}
+
+      - name: Check if last commit was automated
+        id: check-loop
+        run: |
+          LAST_COMMIT_MSG=$(git log -1 --pretty=%B | head -1)
+          if [[ "$LAST_COMMIT_MSG" == "ci: Auto-update PPA packages"* ]] || [[ "$LAST_COMMIT_MSG" == "ci: Auto-update OBS packages"* ]]; then
+            echo "⏭️ Last commit was automated ($LAST_COMMIT_MSG), skipping to prevent infinite loop"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "✅ Last commit was not automated, proceeding"
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Determine packages to update
+        if: steps.check-loop.outputs.skip != 'true'
+        id: packages
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "Triggered by tag: $VERSION"
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+            echo "Triggered by schedule: updating git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Update dms-git spec version
+        if: steps.check-loop.outputs.skip != 'true' && (contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all')
+        run: |
+          # Get commit info for dms-git versioning
+          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
+          COMMIT_COUNT=$(git rev-list --count HEAD)
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
+
+          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
+          echo "📦 Updating dms-git.spec to version: $NEW_VERSION"
+
+          # Update version in spec
+          sed -i "s/^Version:.*/Version:        $NEW_VERSION/" distro/opensuse/dms-git.spec
+
+          # Add changelog entry
+          DATE_STR=$(date "+%a %b %d %Y")
+          CHANGELOG_ENTRY="* $DATE_STR Avenge Media <AvengeMedia.US@gmail.com> - ${NEW_VERSION}-1\n- Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)"
+          sed -i "/%changelog/a\\$CHANGELOG_ENTRY" distro/opensuse/dms-git.spec
+
+      - name: Update Debian dms-git changelog version
+        if: steps.check-loop.outputs.skip != 'true' && (contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all')
+        run: |
+          # Get commit info for dms-git versioning
+          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
+          COMMIT_COUNT=$(git rev-list --count HEAD)
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
+
+          # Debian version format: 0.6.2+git2256.9162e314
+          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
+          echo "📦 Updating Debian dms-git changelog to version: $NEW_VERSION"
+
+          CHANGELOG_DATE=$(date -R)
+
+          CHANGELOG_FILE="distro/debian/dms-git/debian/changelog"
+
+          # Get current version from changelog
+          CURRENT_VERSION=$(head -1 "$CHANGELOG_FILE" | sed 's/.*(\([^)]*\)).*/\1/')
+
+          echo "Current Debian version: $CURRENT_VERSION"
+          echo "New version: $NEW_VERSION"
+
+          # Only update if version changed
+          if [ "$CURRENT_VERSION" != "$NEW_VERSION" ]; then
+            # Create new changelog entry at top
+            TEMP_CHANGELOG=$(mktemp)
+
+            cat > "$TEMP_CHANGELOG" << EOF
+          dms-git ($NEW_VERSION) nightly; urgency=medium
+
+            * Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)
+
+           -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE
+
+          EOF
+
+            # Prepend to existing changelog
+            cat "$CHANGELOG_FILE" >> "$TEMP_CHANGELOG"
+            mv "$TEMP_CHANGELOG" "$CHANGELOG_FILE"
+
+            echo "✓ Updated Debian changelog: $CURRENT_VERSION → $NEW_VERSION"
+          else
+            echo "✓ Debian changelog already at version $NEW_VERSION"
+          fi
+
+      - name: Update dms stable version
+        if: steps.check-loop.outputs.skip != 'true' && steps.packages.outputs.version != ''
+        run: |
+          VERSION="${{ steps.packages.outputs.version }}"
+          VERSION_NO_V="${VERSION#v}"
+          echo "Updating packaging to version $VERSION_NO_V"
+
+          # Update openSUSE dms spec (stable only)
+          sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
+
+          # Update openSUSE spec changelog
+          DATE_STR=$(date "+%a %b %d %Y")
+          CHANGELOG_ENTRY="* $DATE_STR AvengeMedia <maintainer@avengemedia.com> - ${VERSION_NO_V}-1\\n- Update to stable $VERSION release\\n- Bug fixes and improvements"
+          sed -i "/%changelog/a\\$CHANGELOG_ENTRY\\n" distro/opensuse/dms.spec
+
+          # Update Debian _service files (both tar_scm and download_url formats)
+          for service in distro/debian/*/_service; do
+            if [[ -f "$service" ]]; then
+              # Update tar_scm revision parameter (for dms-git)
+              sed -i "s|<param name=\"revision\">v[0-9.]*</param>|<param name=\"revision\">$VERSION</param>|" "$service"
+
+              # Update download_url paths (for dms stable)
+              sed -i "s|/v[0-9.]\+/|/$VERSION/|g" "$service"
+              sed -i "s|/tags/v[0-9.]\+\.tar\.gz|/tags/$VERSION.tar.gz|g" "$service"
+            fi
+          done
+
+          # Update Debian changelog for dms stable
+          if [[ -f "distro/debian/dms/debian/changelog" ]]; then
+            CHANGELOG_DATE=$(date -R)
+            TEMP_CHANGELOG=$(mktemp)
+
+            cat > "$TEMP_CHANGELOG" << EOF
+          dms ($VERSION_NO_V) stable; urgency=medium
+
+            * Update to $VERSION stable release
+            * Bug fixes and improvements
+
+           -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE
+
+          EOF
+
+            cat "distro/debian/dms/debian/changelog" >> "$TEMP_CHANGELOG"
+            mv "$TEMP_CHANGELOG" "distro/debian/dms/debian/changelog"
+
+            echo "✓ Updated Debian changelog to $VERSION_NO_V"
+          fi
+
+      - name: Install Go
+        if: steps.check-loop.outputs.skip != 'true'
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.24"
+
+      - name: Install OSC
+        if: steps.check-loop.outputs.skip != 'true'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc
+
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org
+
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc
+
+      - name: Upload to OBS
+        if: steps.check-loop.outputs.skip != 'true'
+        env:
+          FORCE_UPLOAD: ${{ github.event.inputs.force_upload }}
+          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
+        run: |
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          MESSAGE="Automated update from GitHub Actions"
+
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            MESSAGE="Update to ${{ steps.packages.outputs.version }}"
+          fi
+
+          if [[ "$PACKAGES" == "all" ]]; then
+            bash distro/scripts/obs-upload.sh dms "$MESSAGE"
+            bash distro/scripts/obs-upload.sh dms-git "Automated git update"
+          else
+            bash distro/scripts/obs-upload.sh "$PACKAGES" "$MESSAGE"
+          fi
+
+      - name: Get changed packages
+        if: steps.check-loop.outputs.skip != 'true'
+        id: changed-packages
+        run: |
+          # Check if there are any changes to commit
+          if git diff --exit-code distro/debian/ distro/opensuse/ >/dev/null 2>&1; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "📋 No changelog or spec changes to commit"
+          else
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+            # Get list of changed packages for commit message
+            CHANGED_DEB=$(git diff --name-only distro/debian/ 2>/dev/null | grep 'debian/changelog' | xargs dirname 2>/dev/null | xargs dirname 2>/dev/null | xargs basename 2>/dev/null | tr '\n' ', ' | sed 's/, $//' || echo "")
+            CHANGED_SUSE=$(git diff --name-only distro/opensuse/ 2>/dev/null | grep '\.spec$' | sed 's|distro/opensuse/||' | sed 's/\.spec$//' | tr '\n' ', ' | sed 's/, $//' || echo "")
+
+            PKGS=$(echo "$CHANGED_DEB,$CHANGED_SUSE" | tr ',' '\n' | grep -v '^$' | sort -u | tr '\n' ',' | sed 's/,$//')
+            echo "packages=$PKGS" >> $GITHUB_OUTPUT
+            echo "📋 Changed packages: $PKGS"
+          fi
+
+      - name: Commit packaging changes
+        if: steps.check-loop.outputs.skip != 'true' && steps.changed-packages.outputs.has_changes == 'true'
+        run: |
+          git config user.name "dms-ci[bot]"
+          git config user.email "dms-ci[bot]@users.noreply.github.com"
+          git add distro/debian/*/debian/changelog distro/opensuse/*.spec
+          git commit -m "ci: Auto-update OBS packages [${{ steps.changed-packages.outputs.packages }}]" -m "🤖 Automated by GitHub Actions"
+          git pull --rebase origin master
+          git push
+
+      - name: Summary
+        run: |
+          echo "### OBS Package Update Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          fi
+          if [[ "${{ needs.check-updates.outputs.has_updates }}" == "false" ]]; then
+            echo "- **Status**: Skipped (no changes detected)" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "- **Project**: https://build.opensuse.org/project/show/home:AvengeMedia" >> $GITHUB_STEP_SUMMARY

.github/workflows/backup/run-ppa.yml.bak

@@ -0,0 +1,298 @@
+name: Update PPA Packages
+
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        description: "Package to upload (dms, dms-git, dms-greeter, or all)"
+        required: false
+        default: "dms-git"
+      force_upload:
+        description: "Force upload without version check"
+        required: false
+        default: "false"
+        type: choice
+        options:
+          - "false"
+          - "true"
+      rebuild_release:
+        description: "Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)"
+        required: false
+        default: ""
+  schedule:
+    - cron: "0 */3 * * *" # Every 3 hours for dms-git builds
+
+jobs:
+  check-updates:
+    name: Check for updates
+    runs-on: ubuntu-latest
+
+    outputs:
+      has_updates: ${{ steps.check.outputs.has_updates }}
+      packages: ${{ steps.check.outputs.packages }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for updates
+        id: check
+        run: |
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "Checking if dms-git source has changed..."
+
+            # Get current commit hash (8 chars to match changelog format)
+            CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
+
+            # Extract commit hash from changelog
+            # Format: dms-git (0.6.2+git2264.c5c5ce84) questing; urgency=medium
+            CHANGELOG_FILE="distro/ubuntu/dms-git/debian/changelog"
+
+            if [[ -f "$CHANGELOG_FILE" ]]; then
+              CHANGELOG_COMMIT=$(head -1 "$CHANGELOG_FILE" | grep -oP '\.[a-f0-9]{8}' | tr -d '.' || echo "")
+
+              if [[ -n "$CHANGELOG_COMMIT" ]]; then
+                if [[ "$CURRENT_COMMIT" == "$CHANGELOG_COMMIT" ]]; then
+                  echo "has_updates=false" >> $GITHUB_OUTPUT
+                  echo "📋 Commit $CURRENT_COMMIT already in changelog, skipping upload"
+                else
+                  echo "has_updates=true" >> $GITHUB_OUTPUT
+                  echo "📋 New commit detected: $CURRENT_COMMIT (changelog has $CHANGELOG_COMMIT)"
+                fi
+              else
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+                echo "📋 Could not extract commit from changelog, proceeding with upload"
+              fi
+            else
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "📋 No changelog file found, proceeding with upload"
+            fi
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+          fi
+
+  upload-ppa:
+    name: Upload to PPA
+    needs: check-updates
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    if: |
+      github.event.inputs.force_upload == 'true' ||
+      github.event_name == 'workflow_dispatch' ||
+      needs.check-updates.outputs.has_updates == 'true'
+
+    steps:
+      - name: Generate GitHub App Token
+        id: generate_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.generate_token.outputs.token }}
+
+      - name: Check if last commit was automated
+        id: check-loop
+        run: |
+          LAST_COMMIT_MSG=$(git log -1 --pretty=%B | head -1)
+          if [[ "$LAST_COMMIT_MSG" == "ci: Auto-update PPA packages"* ]] || [[ "$LAST_COMMIT_MSG" == "ci: Auto-update OBS packages"* ]]; then
+            echo "⏭️ Last commit was automated ($LAST_COMMIT_MSG), skipping to prevent infinite loop"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "✅ Last commit was not automated, proceeding"
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Set up Go
+        if: steps.check-loop.outputs.skip != 'true'
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.24"
+          cache: false
+
+      - name: Install build dependencies
+        if: steps.check-loop.outputs.skip != 'true'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            debhelper \
+            devscripts \
+            dput \
+            lftp \
+            build-essential \
+            fakeroot \
+            dpkg-dev
+
+      - name: Configure GPG
+        if: steps.check-loop.outputs.skip != 'true'
+        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: Determine packages to upload
+        if: steps.check-loop.outputs.skip != 'true'
+        id: packages
+        run: |
+          if [[ "${{ github.event.inputs.force_upload }}" == "true" ]]; then
+            PKG="${{ github.event.inputs.package }}"
+            if [[ -z "$PKG" || "$PKG" == "all" ]]; then
+              echo "packages=all" >> $GITHUB_OUTPUT
+              echo "🚀 Force upload: all packages"
+            else
+              echo "packages=$PKG" >> $GITHUB_OUTPUT
+              echo "🚀 Force upload: $PKG"
+            fi
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+            echo "Triggered by schedule: uploading git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            # Manual package selection should respect change detection
+            SELECTED_PKG="${{ github.event.inputs.package }}"
+            UPDATED_PKG="${{ needs.check-updates.outputs.packages }}"
+
+            # Check if manually selected package is in the updated list
+            if [[ "$UPDATED_PKG" == *"$SELECTED_PKG"* ]] || [[ "$SELECTED_PKG" == "all" ]]; then
+              echo "packages=$SELECTED_PKG" >> $GITHUB_OUTPUT
+              echo "📦 Manual selection (has updates): $SELECTED_PKG"
+            else
+              echo "packages=" >> $GITHUB_OUTPUT
+              echo "⚠️ Manual selection '$SELECTED_PKG' has no updates - skipping (use force_upload to override)"
+            fi
+          else
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Upload to PPA
+        if: steps.check-loop.outputs.skip != 'true'
+        run: |
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          REBUILD_RELEASE="${{ github.event.inputs.rebuild_release }}"
+
+          if [[ -z "$PACKAGES" ]]; then
+            echo "No packages selected for upload. Skipping."
+            exit 0
+          fi
+
+          # Build command arguments
+          BUILD_ARGS=()
+          if [[ -n "$REBUILD_RELEASE" ]]; then
+            BUILD_ARGS+=("$REBUILD_RELEASE")
+            echo "✓ Using rebuild release number: ppa$REBUILD_RELEASE"
+          fi
+
+          if [[ "$PACKAGES" == "all" ]]; then
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms to PPA..."
+            if [ -n "$REBUILD_RELEASE" ]; then
+              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
+            fi
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh dms dms questing "${BUILD_ARGS[@]}"
+
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms-git to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh dms-git dms-git questing "${BUILD_ARGS[@]}"
+
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms-greeter to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh dms-greeter danklinux questing "${BUILD_ARGS[@]}"
+          else
+            # Map package to PPA name
+            case "$PACKAGES" in
+              dms)
+                PPA_NAME="dms"
+                ;;
+              dms-git)
+                PPA_NAME="dms-git"
+                ;;
+              dms-greeter)
+                PPA_NAME="danklinux"
+                ;;
+              *)
+                PPA_NAME="$PACKAGES"
+                ;;
+            esac
+
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading $PACKAGES to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "$PACKAGES" "$PPA_NAME" questing "${BUILD_ARGS[@]}"
+          fi
+
+      - name: Get changed packages
+        if: steps.check-loop.outputs.skip != 'true'
+        id: changed-packages
+        run: |
+          # Check if there are any changelog changes to commit
+          if git diff --exit-code distro/ubuntu/ >/dev/null 2>&1; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "📋 No changelog changes to commit"
+          else
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+            # Get list of changed packages for commit message (deduplicate)
+            CHANGED=$(git diff --name-only distro/ubuntu/ | grep 'debian/changelog' | sed 's|/debian/changelog||' | xargs -I{} basename {} | sort -u | tr '\n' ',' | sed 's/,$//')
+            echo "packages=$CHANGED" >> $GITHUB_OUTPUT
+            echo "📋 Changed packages: $CHANGED"
+            echo "📋 Debug - Changed files:"
+            git diff --name-only distro/ubuntu/ | grep 'debian/changelog' || echo "No changelog files found"
+          fi
+
+      - name: Commit changelog changes
+        if: steps.check-loop.outputs.skip != 'true' && steps.changed-packages.outputs.has_changes == 'true'
+        run: |
+          git config user.name "dms-ci[bot]"
+          git config user.email "dms-ci[bot]@users.noreply.github.com"
+          git add distro/ubuntu/*/debian/changelog
+          git commit -m "ci: Auto-update PPA packages [${{ steps.changed-packages.outputs.packages }}]" -m "🤖 Automated by GitHub Actions"
+          git pull --rebase origin master
+          git push
+
+      - name: Summary
+        run: |
+          echo "### PPA Package Upload Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
+
+          if [[ "${{ needs.check-updates.outputs.has_updates }}" == "false" ]]; then
+            echo "- **Status**: Skipped (no changes detected)" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          if [[ "$PACKAGES" == "all" ]]; then
+            echo "- **PPA dms**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
+            echo "- **PPA dms-git**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
+            echo "- **PPA danklinux**: https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms-git" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms-greeter" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Builds will appear once Launchpad processes the uploads." >> $GITHUB_STEP_SUMMARY

.github/workflows/run-obs.yml

@@ -10,7 +10,6 @@ on:
         options:
           - dms
           - dms-git
-          - dms-greeter
           - all
         default: "dms"
       rebuild_release:
@@ -73,27 +72,12 @@ jobs:
             fi
           }
 
-          # Helper function to check dms-greeter stable tag
-          check_dms_greeter_stable() {
-            LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
-            local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:danklinux/dms-greeter/dms-greeter.spec" 2>/dev/null || echo "")
-            local OBS_VERSION=$(echo "$OBS_SPEC" | grep "^Version:" | awk '{print $2}' | xargs | sed 's/^v//')
-
-            if [[ -n "$LATEST_TAG" && "$LATEST_TAG" == "v$OBS_VERSION" ]]; then
-              echo "📋 dms-greeter: Tag $LATEST_TAG already exists, skipping"
-              return 1  # No update needed
-            else
-              echo "📋 dms-greeter: New tag ${LATEST_TAG:-unknown} (OBS has ${OBS_VERSION:-none})"
-              return 0  # Update needed
-            fi
-          }
-
           # Main logic
           REBUILD="${{ github.event.inputs.rebuild_release }}"
 
-          if [[ "${{ github.ref }}" =~ ^refs/tags/ ]] && [[ -z "${{ github.event.inputs.package }}" ]]; then
-            # Run from tag with no package specified - update both stable packages
-            echo "packages=dms dms-greeter" >> $GITHUB_OUTPUT
+          if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            # Tag selected or pushed - always update stable package
+            echo "packages=dms" >> $GITHUB_OUTPUT
             VERSION="${GITHUB_REF#refs/tags/}"
             echo "version=$VERSION" >> $GITHUB_OUTPUT
             echo "has_updates=true" >> $GITHUB_OUTPUT
@@ -128,10 +112,6 @@ jobs:
                   echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
                 fi
               fi
-              if check_dms_greeter_stable; then
-                PACKAGES_TO_UPDATE+=("dms-greeter")
-                [[ -n "$LATEST_TAG" ]] && echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-              fi
 
               if [[ ${#PACKAGES_TO_UPDATE[@]} -gt 0 ]]; then
                 echo "packages=${PACKAGES_TO_UPDATE[*]}" >> $GITHUB_OUTPUT
@@ -164,18 +144,6 @@ jobs:
                 echo "has_updates=false" >> $GITHUB_OUTPUT
               fi
 
-            elif [[ "$PKG" == "dms-greeter" ]]; then
-              if check_dms_greeter_stable; then
-                echo "packages=$PKG" >> $GITHUB_OUTPUT
-                echo "has_updates=true" >> $GITHUB_OUTPUT
-                if [[ -n "$LATEST_TAG" ]]; then
-                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                fi
-              else
-                echo "packages=" >> $GITHUB_OUTPUT
-                echo "has_updates=false" >> $GITHUB_OUTPUT
-              fi
-
             else
               # Unknown package - proceed anyway
               echo "packages=$PKG" >> $GITHUB_OUTPUT
@@ -203,8 +171,15 @@ jobs:
       - name: Determine packages to update
         id: packages
         run: |
-          # Use check-updates outputs when available
-          if [[ -n "${{ needs.check-updates.outputs.version }}" ]]; then
+          # Check if GITHUB_REF points to a tag (works for both push events and workflow_dispatch with tag selected)
+          if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            # Tag selected or pushed - use the tag from GITHUB_REF
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "Using tag from GITHUB_REF: $VERSION"
+          # Check if check-updates already determined a version (from auto-detection)
+          elif [[ -n "${{ needs.check-updates.outputs.version }}" ]]; then
             # Use version from check-updates job
             echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
             echo "version=${{ needs.check-updates.outputs.version }}" >> $GITHUB_OUTPUT
@@ -216,16 +191,40 @@ jobs:
           elif [[ -n "${{ github.event.inputs.package }}" ]]; then
             # Manual workflow dispatch
 
-            # Determine version for dms stable and dms-greeter using the API
-            # GITHUB_REF is unreliable when "Use workflow from" a tag; API works from any ref
-            if [[ "${{ github.event.inputs.package }}" == "dms" ]] || [[ "${{ github.event.inputs.package }}" == "dms-greeter" ]] || [[ "${{ github.event.inputs.package }}" == "all" ]]; then
-              LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
-              if [[ -n "$LATEST_TAG" ]]; then
-                echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                echo "Using latest release from API: $LATEST_TAG"
+            # Determine version for dms stable
+            if [[ "${{ github.event.inputs.package }}" == "dms" ]]; then
+              # Use github.ref if tag selected, otherwise auto-detect latest
+              if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+                VERSION="${GITHUB_REF#refs/tags/}"
+                echo "version=$VERSION" >> $GITHUB_OUTPUT
+                echo "Using tag from GITHUB_REF: $VERSION"
               else
-                echo "ERROR: Could not fetch latest release from API"
-                exit 1
+                # Auto-detect latest release for dms
+                LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
+                if [[ -n "$LATEST_TAG" ]]; then
+                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
+                  echo "Auto-detected latest release: $LATEST_TAG"
+                else
+                  echo "ERROR: Could not auto-detect latest release"
+                  exit 1
+                fi
+              fi
+            elif [[ "${{ github.event.inputs.package }}" == "all" ]]; then
+              # Use github.ref if tag selected, otherwise auto-detect latest
+              if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+                VERSION="${GITHUB_REF#refs/tags/}"
+                echo "version=$VERSION" >> $GITHUB_OUTPUT
+                echo "Using tag from GITHUB_REF: $VERSION"
+              else
+                # Auto-detect latest release for "all"
+                LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
+                if [[ -n "$LATEST_TAG" ]]; then
+                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
+                  echo "Auto-detected latest release: $LATEST_TAG"
+                else
+                  echo "ERROR: Could not auto-detect latest release"
+                  exit 1
+                fi
               fi
             fi
 
@@ -284,66 +283,55 @@ jobs:
             echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
           } > "distro/debian/dms-git/debian/changelog"
 
-      - name: Update stable version (dms + dms-greeter)
+      - name: Update dms stable version
         if: steps.packages.outputs.version != ''
         run: |
           VERSION="${{ steps.packages.outputs.version }}"
           VERSION_NO_V="${VERSION#v}"
-          PACKAGES="${{ steps.packages.outputs.packages }}"
           echo "==> Updating packaging files to version: $VERSION_NO_V"
 
-          # Update dms spec and changelog when dms is in the upload list
-          if [[ "$PACKAGES" == *"dms"* ]]; then
-            sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
-            UPDATED_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1)
-            echo "✓ dms spec now shows Version: $UPDATED_VERSION"
+          # Update spec file
+          sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
 
-            DATE_STR=$(date "+%a %b %d %Y")
-            LOCAL_SPEC_HEAD=$(sed -n '1,/%changelog/{ /%changelog/d; p }' distro/opensuse/dms.spec)
-            {
-              echo "$LOCAL_SPEC_HEAD"
-              echo "%changelog"
-              echo "* $DATE_STR AvengeMedia <maintainer@avengemedia.com> - ${VERSION_NO_V}-1"
-              echo "- Update to stable $VERSION release"
-            } > distro/opensuse/dms.spec
+          # Verify the update
+          UPDATED_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1)
+          echo "✓ Spec file now shows Version: $UPDATED_VERSION"
 
-            if [[ -f "distro/debian/dms/debian/changelog" ]]; then
-              CHANGELOG_DATE=$(date -R)
-              {
-                echo "dms (${VERSION_NO_V}db1) stable; urgency=medium"
-                echo ""
-                echo "  * Update to $VERSION stable release"
-                echo ""
-                echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
-              } > "distro/debian/dms/debian/changelog"
-              echo "✓ Updated dms changelog to ${VERSION_NO_V}db1"
-            fi
-          fi
+          # Single changelog entry (full history on OBS website)
+          DATE_STR=$(date "+%a %b %d %Y")
+          LOCAL_SPEC_HEAD=$(sed -n '1,/%changelog/{ /%changelog/d; p }' distro/opensuse/dms.spec)
+          {
+            echo "$LOCAL_SPEC_HEAD"
+            echo "%changelog"
+            echo "* $DATE_STR AvengeMedia <maintainer@avengemedia.com> - ${VERSION_NO_V}-1"
+            echo "- Update to stable $VERSION release"
+          } > distro/opensuse/dms.spec
 
-          # Update dms-greeter changelog when dms-greeter is in the upload list
-          if [[ "$PACKAGES" == *"dms-greeter"* ]] && [[ -f "distro/debian/dms-greeter/debian/changelog" ]]; then
-            CHANGELOG_DATE=$(date -R)
-            {
-              echo "dms-greeter (${VERSION_NO_V}db1) unstable; urgency=medium"
-              echo ""
-              echo "  * Update to $VERSION stable release"
-              echo ""
-              echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
-            } > "distro/debian/dms-greeter/debian/changelog"
-            echo "✓ Updated dms-greeter changelog to ${VERSION_NO_V}db1"
-          fi
-
-          # Update Debian _service files for packages in upload list (download_url paths)
+          # Update Debian _service files (both tar_scm and download_url formats)
           for service in distro/debian/*/_service; do
             if [[ -f "$service" ]]; then
               # Update tar_scm revision parameter (for dms-git)
               sed -i "s|<param name=\"revision\">v[0-9.]*</param>|<param name=\"revision\">$VERSION</param>|" "$service"
-              # Update download_url paths (for dms, dms-greeter stable)
+
+              # Update download_url paths (for dms stable)
               sed -i "s|/v[0-9.]\+/|/$VERSION/|g" "$service"
               sed -i "s|/tags/v[0-9.]\+\.tar\.gz|/tags/$VERSION.tar.gz|g" "$service"
             fi
           done
 
+          # Update Debian changelog for dms stable (single entry, history on OBS website)
+          if [[ -f "distro/debian/dms/debian/changelog" ]]; then
+            CHANGELOG_DATE=$(date -R)
+            {
+              echo "dms (${VERSION_NO_V}db1) stable; urgency=medium"
+              echo ""
+              echo "  * Update to $VERSION stable release"
+              echo ""
+              echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
+            } > "distro/debian/dms/debian/changelog"
+            echo "✓ Updated Debian changelog to ${VERSION_NO_V}db1"
+          fi
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
@@ -366,7 +354,6 @@ jobs:
           chmod 600 ~/.config/osc/oscrc
 
       - name: Upload to OBS
-        id: upload
         env:
           REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
           TAG_VERSION: ${{ steps.packages.outputs.version }}
@@ -375,8 +362,6 @@ jobs:
 
           if [[ -z "$PACKAGES" ]]; then
             echo "✓ No packages need uploading. All up to date!"
-            echo "uploaded_packages=" >> $GITHUB_OUTPUT
-            echo "skipped_packages=" >> $GITHUB_OUTPUT
             exit 0
           fi
 
@@ -386,9 +371,6 @@ jobs:
             echo "==> Version being uploaded: ${{ steps.packages.outputs.version }}"
           fi
 
-          UPLOADED_PACKAGES=()
-          SKIPPED_PACKAGES=()
-
           # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check)
           # Loop through each package and upload
           for PKG in $PACKAGES; do
@@ -400,37 +382,13 @@ jobs:
             fi
             echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 
-            LOG_FILE=$(mktemp)
-            set +e
             if [[ "$PKG" == "dms-git" ]]; then
-              bash distro/scripts/obs-upload.sh dms-git "Automated git update" >"$LOG_FILE" 2>&1
+              bash distro/scripts/obs-upload.sh dms-git "Automated git update"
             else
-              bash distro/scripts/obs-upload.sh "$PKG" "$MESSAGE" >"$LOG_FILE" 2>&1
+              bash distro/scripts/obs-upload.sh "$PKG" "$MESSAGE"
             fi
-            STATUS=$?
-            set -e
-
-            cat "$LOG_FILE"
-
-            if [[ $STATUS -ne 0 ]]; then
-              rm -f "$LOG_FILE"
-              echo "❌ Upload failed for $PKG"
-              exit $STATUS
-            fi
-
-            if grep -Eq "Exiting gracefully \(no changes needed\)|No changes needed for this package\. Exiting gracefully\." "$LOG_FILE"; then
-              echo "ℹ️  $PKG is already up to date. Skipped."
-              SKIPPED_PACKAGES+=("$PKG")
-            else
-              UPLOADED_PACKAGES+=("$PKG")
-            fi
-
-            rm -f "$LOG_FILE"
           done
 
-          echo "uploaded_packages=${UPLOADED_PACKAGES[*]}" >> $GITHUB_OUTPUT
-          echo "skipped_packages=${SKIPPED_PACKAGES[*]}" >> $GITHUB_OUTPUT
-
       - name: Summary
         if: always()
         run: |
@@ -444,59 +402,20 @@ jobs:
             echo "" >> $GITHUB_STEP_SUMMARY
             echo "All packages are current. Run completed successfully." >> $GITHUB_STEP_SUMMARY
           else
-            UPLOADED_PACKAGES="${{ steps.upload.outputs.uploaded_packages }}"
-            SKIPPED_PACKAGES="${{ steps.upload.outputs.skipped_packages }}"
-            TOTAL_COUNT=$(wc -w <<<"$PACKAGES" | tr -d ' ')
-            UPLOADED_COUNT=0
-            SKIPPED_COUNT=0
-            if [[ -n "$UPLOADED_PACKAGES" ]]; then
-              UPLOADED_COUNT=$(wc -w <<<"$UPLOADED_PACKAGES" | tr -d ' ')
-            fi
-            if [[ -n "$SKIPPED_PACKAGES" ]]; then
-              SKIPPED_COUNT=$(wc -w <<<"$SKIPPED_PACKAGES" | tr -d ' ')
-            fi
-            in_list() {
-              local item="$1"
-              local list="$2"
-              [[ " $list " == *" $item "* ]]
-            }
-
-            if [[ "${{ job.status }}" == "success" ]]; then
-              echo "**Status:** ✅ Completed successfully" >> $GITHUB_STEP_SUMMARY
-            else
-              echo "**Status:** ❌ Completed with errors" >> $GITHUB_STEP_SUMMARY
-            fi
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**Processed:** $TOTAL_COUNT package(s)" >> $GITHUB_STEP_SUMMARY
-            echo "**Uploaded:** $UPLOADED_COUNT package(s)" >> $GITHUB_STEP_SUMMARY
-            echo "**Skipped (up to date):** $SKIPPED_COUNT package(s)" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**Packages:**" >> $GITHUB_STEP_SUMMARY
+            echo "**Packages Uploaded:**" >> $GITHUB_STEP_SUMMARY
             echo "" >> $GITHUB_STEP_SUMMARY
 
             for PKG in $PACKAGES; do
-              STATUS_ICON="✅"
-              STATUS_TEXT="uploaded"
-              if in_list "$PKG" "$SKIPPED_PACKAGES"; then
-                STATUS_ICON="ℹ️"
-                STATUS_TEXT="up to date (skipped)"
-              elif ! in_list "$PKG" "$UPLOADED_PACKAGES"; then
-                STATUS_ICON="❌"
-                STATUS_TEXT="failed"
-              fi
-
               case "$PKG" in
                 dms)
-                  echo "- $STATUS_ICON **dms** ($STATUS_TEXT) → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:dms/dms)" >> $GITHUB_STEP_SUMMARY
+                  echo "- ✅ **dms** → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:dms/dms)" >> $GITHUB_STEP_SUMMARY
                   ;;
                 dms-git)
-                  echo "- $STATUS_ICON **dms-git** ($STATUS_TEXT) → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:dms-git/dms-git)" >> $GITHUB_STEP_SUMMARY
-                  ;;
-                dms-greeter)
-                  echo "- $STATUS_ICON **dms-greeter** ($STATUS_TEXT) → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:danklinux/dms-greeter)" >> $GITHUB_STEP_SUMMARY
+                  echo "- ✅ **dms-git** → [View builds](https://build.opensuse.org/package/show/home:AvengeMedia:dms-git/dms-git)" >> $GITHUB_STEP_SUMMARY
                   ;;
               esac
             done
+
             echo "" >> $GITHUB_STEP_SUMMARY
 
             if [[ -n "${{ github.event.inputs.rebuild_release }}" ]]; then

.pre-commit-config.yaml

@@ -5,13 +5,11 @@ repos:
       - id: trailing-whitespace
       - id: check-yaml
       - id: end-of-file-fixer
-  - repo: local
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.10.0.1
     hooks:
       - id: shellcheck
-        name: shellcheck
-        entry: shellcheck -e SC2164 -e SC2001 -e SC2012 -e SC2317
-        language: system
-        types: [shell]
+        args: [-e, SC2164, -e, SC2001, -e, SC2012, -e, SC2317]
   - repo: local
     hooks:
       - id: go-mod-tidy

CONTRIBUTING.md

@@ -22,7 +22,7 @@ nix develop
 
 This will provide:
 
-- Go 1.25+ toolchain (go, gopls, delve, go-tools) and GNU Make
+- Go 1.24 toolchain (go, gopls, delve, go-tools) and GNU Make
 - Quickshell and required QML packages
 - Properly configured QML2_IMPORT_PATH
 

core/README.md

@@ -96,7 +96,7 @@ The on-screen preview displays the selected format. JSON output includes hex, RG
 
 ## Building
 
-Requires Go 1.25+
+Requires Go 1.24+
 
 **Development build:**
 

core/cmd/dms/commands_common.go

@@ -525,6 +525,5 @@ func getCommonCommands() []*cobra.Command {
 		doctorCmd,
 		configCmd,
 		dlCmd,
-		randrCmd,
 	}
 }

core/cmd/dms/commands_doctor.go

@@ -652,14 +652,16 @@ func checkI2CAvailability() checkResult {
 func checkImageFormatPlugins() []checkResult {
 	url := doctorDocsURL + "#optional-features"
 
-	pluginDirs := findQtPluginDirs()
-	if len(pluginDirs) == 0 {
+	pluginDir := findQtPluginDir()
+	if pluginDir == "" {
 		return []checkResult{
 			{catOptionalFeatures, "qt6-imageformats", statusInfo, "Cannot detect (plugin dir not found)", "WebP, TIFF, JP2 support", url},
 			{catOptionalFeatures, "kimageformats", statusInfo, "Cannot detect (plugin dir not found)", "AVIF, HEIF, JXL support", url},
 		}
 	}
 
+	imageFormatsDir := filepath.Join(pluginDir, "imageformats")
+
 	type pluginCheck struct {
 		name    string
 		desc    string
@@ -693,18 +695,9 @@ func checkImageFormatPlugins() []checkResult {
 	var results []checkResult
 	for _, c := range checks {
 		var found []string
-		var foundDirs []string
-		for _, pluginDir := range pluginDirs {
-			imageFormatsDir := filepath.Join(pluginDir, "imageformats")
-			for _, p := range c.plugins {
-				if _, err := os.Stat(filepath.Join(imageFormatsDir, p.file)); err == nil {
-					if !slices.Contains(found, p.format) {
-						found = append(found, p.format)
-					}
-					if !slices.Contains(foundDirs, imageFormatsDir) {
-						foundDirs = append(foundDirs, imageFormatsDir)
-					}
-				}
+		for _, p := range c.plugins {
+			if _, err := os.Stat(filepath.Join(imageFormatsDir, p.file)); err == nil {
+				found = append(found, p.format)
 			}
 		}
 
@@ -715,7 +708,7 @@ func checkImageFormatPlugins() []checkResult {
 		default:
 			details := ""
 			if doctorVerbose {
-				details = fmt.Sprintf("Formats: %s (%s)", strings.Join(found, ", "), strings.Join(foundDirs, ":"))
+				details = fmt.Sprintf("Formats: %s (%s)", strings.Join(found, ", "), imageFormatsDir)
 			}
 			result = checkResult{catOptionalFeatures, c.name, statusOK, fmt.Sprintf("Installed (%d formats)", len(found)), details, url}
 		}
@@ -725,28 +718,22 @@ func checkImageFormatPlugins() []checkResult {
 	return results
 }
 
-func findQtPluginDirs() []string {
-	var dirs []string
-
-	addDir := func(dir string) {
-		if dir != "" {
-			if _, err := os.Stat(filepath.Join(dir, "imageformats")); err == nil {
-				dirs = append(dirs, dir)
-			}
-		}
-	}
-
-	// Check all paths in QT_PLUGIN_PATH env var (used by NixOS and custom setups)
+func findQtPluginDir() string {
+	// Check QT_PLUGIN_PATH env var first (used by NixOS and custom setups)
 	if envPath := os.Getenv("QT_PLUGIN_PATH"); envPath != "" {
 		for dir := range strings.SplitSeq(envPath, ":") {
-			addDir(dir)
+			if _, err := os.Stat(filepath.Join(dir, "imageformats")); err == nil {
+				return dir
+			}
 		}
 	}
 
 	// Try qtpaths
 	for _, cmd := range []string{"qtpaths6", "qtpaths"} {
 		if output, err := exec.Command(cmd, "-query", "QT_INSTALL_PLUGINS").Output(); err == nil {
-			addDir(strings.TrimSpace(string(output)))
+			if dir := strings.TrimSpace(string(output)); dir != "" {
+				return dir
+			}
 		}
 	}
 
@@ -757,10 +744,12 @@ func findQtPluginDirs() []string {
 		"/usr/lib/x86_64-linux-gnu/qt6/plugins",
 		"/usr/lib/aarch64-linux-gnu/qt6/plugins",
 	} {
-		addDir(dir)
+		if _, err := os.Stat(filepath.Join(dir, "imageformats")); err == nil {
+			return dir
+		}
 	}
 
-	return dirs
+	return ""
 }
 
 func detectNetworkBackend(stackResult *network.DetectResult) string {

core/cmd/dms/commands_greeter.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/distros"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/greeter"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
@@ -78,28 +77,6 @@ func installGreeter() error {
 		return err
 	}
 
-	// Debian/openSUSE
-	greeter.TryInstallGreeterPackage(logFunc, "")
-	if isPackageOnlyGreeterDistro() && !greeter.IsGreeterPackaged() {
-		return fmt.Errorf("dms-greeter must be installed from distro packages on this distribution. %s", packageInstallHint())
-	}
-	if greeter.IsGreeterPackaged() && greeter.HasLegacyLocalGreeterWrapper() {
-		return fmt.Errorf("legacy manual wrapper detected at /usr/local/bin/dms-greeter; remove it before using packaged dms-greeter: sudo rm -f /usr/local/bin/dms-greeter")
-	}
-
-	// If already fully configured, prompt the user
-	if isGreeterEnabled() {
-		fmt.Print("\nGreeter is already installed and configured. Re-run to re-sync settings and permissions? [Y/n]: ")
-		var response string
-		fmt.Scanln(&response)
-		response = strings.TrimSpace(strings.ToLower(response))
-		if response == "n" || response == "no" {
-			fmt.Println("Run 'dms greeter sync' to re-sync theme and settings at any time.")
-			return nil
-		}
-		fmt.Println()
-	}
-
 	fmt.Println("\nDetecting DMS installation...")
 	dmsPath, err := greeter.DetectDMSPath()
 	if err != nil {
@@ -137,12 +114,7 @@ func installGreeter() error {
 	}
 
 	fmt.Println("\nConfiguring greetd...")
-	// Use empty path when packaged (greeter finds /usr/share/quickshell/dms-greeter); else use user's DMS path
-	greeterPathForConfig := ""
-	if !greeter.IsGreeterPackaged() {
-		greeterPathForConfig = dmsPath
-	}
-	if err := greeter.ConfigureGreetd(greeterPathForConfig, selectedCompositor, logFunc, ""); err != nil {
+	if err := greeter.ConfigureGreetd(dmsPath, selectedCompositor, logFunc, ""); err != nil {
 		return err
 	}
 
@@ -151,22 +123,11 @@ func installGreeter() error {
 		return err
 	}
 
-	if err := ensureGraphicalTarget(); err != nil {
-		return err
-	}
-
-	if err := handleConflictingDisplayManagers(); err != nil {
-		return err
-	}
-
-	if err := ensureGreetdEnabled(); err != nil {
-		return err
-	}
-
 	fmt.Println("\n=== Installation Complete ===")
-	fmt.Println("\nTo start the greeter now, run:")
+	fmt.Println("\nTo test the greeter, run:")
 	fmt.Println("  sudo systemctl start greetd")
-	fmt.Println("\nOr reboot to see the greeter at next boot.")
+	fmt.Println("\nTo enable on boot, run:")
+	fmt.Println("  sudo systemctl enable --now greetd")
 
 	return nil
 }
@@ -366,29 +327,20 @@ func ensureGreetdEnabled() error {
 		fmt.Println("  ✓ Unmasked greetd")
 	}
 
-	if state.EnabledState == "enabled" || state.EnabledState == "enabled-runtime" {
-		fmt.Println("  Reasserting greetd as active display manager...")
-	} else {
+	switch state.EnabledState {
+	case "disabled", "masked", "masked-runtime":
 		fmt.Println("  Enabling greetd service...")
-	}
-
-	enableCmd := exec.Command("sudo", "systemctl", "enable", "--force", "greetd")
-	enableCmd.Stdout = os.Stdout
-	enableCmd.Stderr = os.Stderr
-	if err := enableCmd.Run(); err != nil {
-		return fmt.Errorf("failed to enable greetd: %w", err)
-	}
-
-	enabledState, _, verifyErr := checkSystemdServiceEnabled("greetd")
-	if verifyErr != nil {
-		fmt.Printf("  ⚠ Warning: Could not verify greetd enabled state: %v\n", verifyErr)
-	} else {
-		switch enabledState {
-		case "enabled", "enabled-runtime", "static", "indirect", "alias":
-			fmt.Printf("  ✓ greetd enabled (state: %s)\n", enabledState)
-		default:
-			return fmt.Errorf("greetd is still in state '%s' after enable operation", enabledState)
+		enableCmd := exec.Command("sudo", "systemctl", "enable", "greetd")
+		enableCmd.Stdout = os.Stdout
+		enableCmd.Stderr = os.Stderr
+		if err := enableCmd.Run(); err != nil {
+			return fmt.Errorf("failed to enable greetd: %w", err)
 		}
+		fmt.Println("  ✓ Enabled greetd service")
+	case "enabled", "enabled-runtime":
+		fmt.Println("  ✓ greetd is already enabled")
+	default:
+		fmt.Printf("  ℹ greetd is in state '%s' (should work, no action needed)\n", state.EnabledState)
 	}
 
 	return nil
@@ -494,10 +446,6 @@ func enableGreeter() error {
 	}
 
 	configContent := string(data)
-	if greeter.IsGreeterPackaged() && greeter.HasLegacyLocalGreeterWrapper() {
-		return fmt.Errorf("legacy manual wrapper detected at /usr/local/bin/dms-greeter; remove it before using packaged dms-greeter: sudo rm -f /usr/local/bin/dms-greeter")
-	}
-
 	configAlreadyCorrect := strings.Contains(configContent, "dms-greeter")
 
 	if configAlreadyCorrect {
@@ -663,48 +611,6 @@ func detectConfiguredCompositor() string {
 	return ""
 }
 
-func packageInstallHint() string {
-	osInfo, err := distros.GetOSInfo()
-	if err != nil {
-		return "Install package: dms-greeter"
-	}
-	config, exists := distros.Registry[osInfo.Distribution.ID]
-	if !exists {
-		return "Install package: dms-greeter"
-	}
-
-	switch config.Family {
-	case distros.FamilyDebian:
-		return "Install with 'sudo apt install dms-greeter' (requires DankLinux OBS repo — see https://danklinux.com/docs/dankgreeter/installation#debian)"
-	case distros.FamilySUSE:
-		return "Install with 'sudo zypper install dms-greeter' (requires DankLinux OBS repo — see https://danklinux.com/docs/dankgreeter/installation#opensuse)"
-	case distros.FamilyUbuntu:
-		return "Install with 'sudo apt install dms-greeter' (requires ppa:avengemedia/danklinux: sudo add-apt-repository ppa:avengemedia/danklinux)"
-	case distros.FamilyFedora:
-		return "Install with 'sudo dnf install dms-greeter' (requires COPR: sudo dnf copr enable avengemedia/danklinux)"
-	case distros.FamilyArch:
-		return "Install from AUR with 'paru -S greetd-dms-greeter-git' or 'yay -S greetd-dms-greeter-git'"
-	default:
-		return "Run 'dms greeter install' to install greeter"
-	}
-}
-
-func isPackageOnlyGreeterDistro() bool {
-	osInfo, err := distros.GetOSInfo()
-	if err != nil {
-		return false
-	}
-	config, exists := distros.Registry[osInfo.Distribution.ID]
-	if !exists {
-		return false
-	}
-	return config.Family == distros.FamilyDebian ||
-		config.Family == distros.FamilySUSE ||
-		config.Family == distros.FamilyUbuntu ||
-		config.Family == distros.FamilyFedora ||
-		config.Family == distros.FamilyArch
-}
-
 func promptCompositorChoice(compositors []string) (string, error) {
 	fmt.Println("\nMultiple compositors detected:")
 	for i, comp := range compositors {
@@ -773,7 +679,7 @@ func checkGreeterStatus() error {
 		}
 	} else {
 		fmt.Println("  ✗ Greeter config not found")
-		fmt.Printf("    %s\n", packageInstallHint())
+		fmt.Println("    Run 'dms greeter install' to install greeter")
 	}
 
 	fmt.Println("\nGroup Membership:")
@@ -783,13 +689,12 @@ func checkGreeterStatus() error {
 		return fmt.Errorf("failed to check groups: %w", err)
 	}
 
-	greeterGroup := greeter.DetectGreeterGroup()
-	inGreeterGroup := strings.Contains(string(groupsOutput), greeterGroup)
+	inGreeterGroup := strings.Contains(string(groupsOutput), "greeter")
 	if inGreeterGroup {
-		fmt.Printf("  ✓ User is in %s group\n", greeterGroup)
+		fmt.Println("  ✓ User is in greeter group")
 	} else {
-		fmt.Printf("  ✗ User is NOT in %s group\n", greeterGroup)
-		fmt.Println("    Run 'dms greeter sync' to set up group membership and permissions")
+		fmt.Println("  ✗ User is NOT in greeter group")
+		fmt.Println("    Run 'dms greeter install' to add user to greeter group")
 	}
 
 	cacheDir := "/var/cache/dms-greeter"
@@ -798,7 +703,7 @@ func checkGreeterStatus() error {
 		fmt.Printf("  ✓ %s exists\n", cacheDir)
 	} else {
 		fmt.Printf("  ✗ %s not found\n", cacheDir)
-		fmt.Printf("    %s\n", packageInstallHint())
+		fmt.Println("    Run 'dms greeter install' to create cache directory")
 		return nil
 	}
 

core/cmd/dms/commands_matugen.go

@@ -3,9 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"os"
 	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
@@ -97,11 +95,7 @@ func buildMatugenOptions(cmd *cobra.Command) matugen.Options {
 
 func runMatugenGenerate(cmd *cobra.Command, args []string) {
 	opts := buildMatugenOptions(cmd)
-	err := matugen.Run(opts)
-	switch {
-	case errors.Is(err, matugen.ErrNoChanges):
-		os.Exit(2)
-	case err != nil:
+	if err := matugen.Run(opts); err != nil {
 		log.Fatalf("Theme generation failed: %v", err)
 	}
 }
@@ -135,11 +129,7 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 	if !wait {
 		if err := sendServerRequestFireAndForget(request); err != nil {
 			log.Info("Server unavailable, running synchronously")
-			err := matugen.Run(opts)
-			switch {
-			case errors.Is(err, matugen.ErrNoChanges):
-				os.Exit(2)
-			case err != nil:
+			if err := matugen.Run(opts); err != nil {
 				log.Fatalf("Theme generation failed: %v", err)
 			}
 			return
@@ -156,15 +146,11 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 		resp, ok := tryServerRequest(request)
 		if !ok {
 			log.Info("Server unavailable, running synchronously")
-			err := matugen.Run(opts)
-			switch {
-			case errors.Is(err, matugen.ErrNoChanges):
-				resultCh <- matugen.ErrNoChanges
-			case err != nil:
+			if err := matugen.Run(opts); err != nil {
 				resultCh <- err
-			default:
-				resultCh <- nil
+				return
 			}
+			resultCh <- nil
 			return
 		}
 		if resp.Error != "" {
@@ -176,10 +162,7 @@ func runMatugenQueue(cmd *cobra.Command, args []string) {
 
 	select {
 	case err := <-resultCh:
-		switch {
-		case errors.Is(err, matugen.ErrNoChanges):
-			os.Exit(2)
-		case err != nil:
+		if err != nil {
 			log.Fatalf("Theme generation failed: %v", err)
 		}
 		fmt.Println("Theme generation completed")

core/cmd/dms/commands_randr.go

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

core/cmd/dms/main_distro.go

@@ -18,7 +18,7 @@ func init() {
 	runCmd.Flags().MarkHidden("daemon-child")
 
 	// Add subcommands to greeter
-	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd)
+	greeterCmd.AddCommand(greeterSyncCmd, greeterEnableCmd, greeterStatusCmd)
 
 	// Add subcommands to setup
 	setupCmd.AddCommand(setupBindsCmd, setupLayoutCmd, setupColorsCmd, setupAlttabCmd, setupOutputsCmd, setupCursorCmd, setupWindowrulesCmd)

core/cmd/dms/randr_client.go

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

core/internal/distros/arch.go

@@ -26,9 +26,6 @@ func init() {
 	Register("cachyos", "#08A283", FamilyArch, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewArchDistribution(config, logChan)
 	})
-	Register("catos", "#1793D1", FamilyArch, func(config DistroConfig, logChan chan<- string) Distribution {
-		return NewArchDistribution(config, logChan)
-	})
 	Register("endeavouros", "#7F3FBF", FamilyArch, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewArchDistribution(config, logChan)
 	})
@@ -97,7 +94,6 @@ func (a *ArchDistribution) DetectDependenciesWithTerminal(ctx context.Context, w
 	dependencies = append(dependencies, a.detectGit())
 	dependencies = append(dependencies, a.detectWindowManager(wm))
 	dependencies = append(dependencies, a.detectQuickshell())
-	dependencies = append(dependencies, a.detectDMSGreeter())
 	dependencies = append(dependencies, a.detectXDGPortal())
 	dependencies = append(dependencies, a.detectAccountsService())
 
@@ -125,10 +121,6 @@ func (a *ArchDistribution) detectAccountsService() deps.Dependency {
 	return a.detectPackage("accountsservice", "D-Bus interface for user account query and manipulation", a.packageInstalled("accountsservice"))
 }
 
-func (a *ArchDistribution) detectDMSGreeter() deps.Dependency {
-	return a.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", a.packageInstalled("greetd-dms-greeter-git"))
-}
-
 func (a *ArchDistribution) packageInstalled(pkg string) bool {
 	cmd := exec.Command("pacman", "-Q", pkg)
 	err := cmd.Run()
@@ -144,7 +136,6 @@ func (a *ArchDistribution) GetPackageMappingWithVariants(wm deps.WindowManager,
 		"dms (DankMaterialShell)": a.getDMSMapping(variants["dms (DankMaterialShell)"]),
 		"git":                     {Name: "git", Repository: RepoTypeSystem},
 		"quickshell":              a.getQuickshellMapping(variants["quickshell"]),
-		"dms-greeter":             {Name: "greetd-dms-greeter-git", Repository: RepoTypeAUR},
 		"matugen":                 a.getMatugenMapping(variants["matugen"]),
 		"dgop":                    {Name: "dgop", Repository: RepoTypeSystem},
 		"ghostty":                 {Name: "ghostty", Repository: RepoTypeSystem},

core/internal/distros/base.go

@@ -102,19 +102,6 @@ func (b *BaseDistribution) detectPackage(name, description string, installed boo
 	}
 }
 
-func (b *BaseDistribution) detectOptionalPackage(name, description string, installed bool) deps.Dependency {
-	status := deps.StatusMissing
-	if installed {
-		status = deps.StatusInstalled
-	}
-	return deps.Dependency{
-		Name:        name,
-		Status:      status,
-		Description: description,
-		Required:    false,
-	}
-}
-
 func (b *BaseDistribution) detectGit() deps.Dependency {
 	return b.detectCommand("git", "Version control system")
 }

core/internal/distros/debian.go

@@ -61,7 +61,6 @@ func (d *DebianDistribution) DetectDependenciesWithTerminal(ctx context.Context,
 	dependencies = append(dependencies, d.detectGit())
 	dependencies = append(dependencies, d.detectWindowManager(wm))
 	dependencies = append(dependencies, d.detectQuickshell())
-	dependencies = append(dependencies, d.detectDMSGreeter())
 	dependencies = append(dependencies, d.detectXDGPortal())
 	dependencies = append(dependencies, d.detectAccountsService())
 
@@ -87,10 +86,6 @@ func (d *DebianDistribution) detectAccountsService() deps.Dependency {
 	return d.detectPackage("accountsservice", "D-Bus interface for user account query and manipulation", d.packageInstalled("accountsservice"))
 }
 
-func (d *DebianDistribution) detectDMSGreeter() deps.Dependency {
-	return d.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", d.packageInstalled("dms-greeter"))
-}
-
 func (d *DebianDistribution) packageInstalled(pkg string) bool {
 	cmd := exec.Command("dpkg", "-l", pkg)
 	err := cmd.Run()
@@ -113,7 +108,6 @@ func (d *DebianDistribution) GetPackageMappingWithVariants(wm deps.WindowManager
 		// DMS packages from OBS with variant support
 		"dms (DankMaterialShell)": d.getDmsMapping(variants["dms (DankMaterialShell)"]),
 		"quickshell":              d.getQuickshellMapping(variants["quickshell"]),
-		"dms-greeter":             {Name: "dms-greeter", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"matugen":                 {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"dgop":                    {Name: "dgop", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"ghostty":                 {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},

core/internal/distros/fedora.go

@@ -13,9 +13,6 @@ func init() {
 	Register("fedora", "#0B57A4", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewFedoraDistribution(config, logChan)
 	})
-	Register("evernight", "#72B8DC", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
-		return NewFedoraDistribution(config, logChan)
-	})
 	Register("nobara", "#0B57A4", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewFedoraDistribution(config, logChan)
 	})
@@ -78,7 +75,6 @@ func (f *FedoraDistribution) DetectDependenciesWithTerminal(ctx context.Context,
 	dependencies = append(dependencies, f.detectGit())
 	dependencies = append(dependencies, f.detectWindowManager(wm))
 	dependencies = append(dependencies, f.detectQuickshell())
-	dependencies = append(dependencies, f.detectDMSGreeter())
 	dependencies = append(dependencies, f.detectXDGPortal())
 	dependencies = append(dependencies, f.detectAccountsService())
 
@@ -124,7 +120,6 @@ func (f *FedoraDistribution) GetPackageMappingWithVariants(wm deps.WindowManager
 
 		// COPR packages
 		"quickshell":              f.getQuickshellMapping(variants["quickshell"]),
-		"dms-greeter":             {Name: "dms-greeter", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"},
 		"matugen":                 {Name: "matugen", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"},
 		"dms (DankMaterialShell)": f.getDmsMapping(variants["dms (DankMaterialShell)"]),
 		"dgop":                    {Name: "dgop", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"},
@@ -196,10 +191,6 @@ func (f *FedoraDistribution) detectAccountsService() deps.Dependency {
 	}
 }
 
-func (f *FedoraDistribution) detectDMSGreeter() deps.Dependency {
-	return f.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", f.packageInstalled("dms-greeter"))
-}
-
 func (f *FedoraDistribution) getPrerequisites() []string {
 	return []string{
 		"dnf-plugins-core",

core/internal/distros/interface.go

@@ -55,7 +55,6 @@ const (
 	PhaseAURPackages
 	PhaseCursorTheme
 	PhaseConfiguration
-	PhaseGreeterSetup
 	PhaseComplete
 )
 

core/internal/distros/opensuse.go

@@ -71,7 +71,6 @@ func (o *OpenSUSEDistribution) DetectDependenciesWithTerminal(ctx context.Contex
 	dependencies = append(dependencies, o.detectGit())
 	dependencies = append(dependencies, o.detectWindowManager(wm))
 	dependencies = append(dependencies, o.detectQuickshell())
-	dependencies = append(dependencies, o.detectDMSGreeter())
 	dependencies = append(dependencies, o.detectXDGPortal())
 	dependencies = append(dependencies, o.detectAccountsService())
 
@@ -101,10 +100,6 @@ func (o *OpenSUSEDistribution) packageInstalled(pkg string) bool {
 	return err == nil
 }
 
-func (o *OpenSUSEDistribution) detectDMSGreeter() deps.Dependency {
-	return o.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", o.packageInstalled("dms-greeter"))
-}
-
 func (o *OpenSUSEDistribution) GetPackageMapping(wm deps.WindowManager) map[string]PackageMapping {
 	return o.GetPackageMappingWithVariants(wm, make(map[string]deps.PackageVariant))
 }
@@ -121,7 +116,6 @@ func (o *OpenSUSEDistribution) GetPackageMappingWithVariants(wm deps.WindowManag
 		// DMS packages from OBS
 		"dms (DankMaterialShell)": o.getDmsMapping(variants["dms (DankMaterialShell)"]),
 		"quickshell":              o.getQuickshellMapping(variants["quickshell"]),
-		"dms-greeter":             {Name: "dms-greeter", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"ghostty":                 {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"matugen":                 {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"dgop":                    {Name: "dgop", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},

core/internal/distros/ubuntu.go

@@ -63,7 +63,6 @@ func (u *UbuntuDistribution) DetectDependenciesWithTerminal(ctx context.Context,
 	dependencies = append(dependencies, u.detectGit())
 	dependencies = append(dependencies, u.detectWindowManager(wm))
 	dependencies = append(dependencies, u.detectQuickshell())
-	dependencies = append(dependencies, u.detectDMSGreeter())
 	dependencies = append(dependencies, u.detectXDGPortal())
 	dependencies = append(dependencies, u.detectAccountsService())
 
@@ -95,10 +94,6 @@ func (u *UbuntuDistribution) detectAccountsService() deps.Dependency {
 	return u.detectPackage("accountsservice", "D-Bus interface for user account query and manipulation", u.packageInstalled("accountsservice"))
 }
 
-func (u *UbuntuDistribution) detectDMSGreeter() deps.Dependency {
-	return u.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", u.packageInstalled("dms-greeter"))
-}
-
 func (u *UbuntuDistribution) packageInstalled(pkg string) bool {
 	cmd := exec.Command("dpkg", "-l", pkg)
 	err := cmd.Run()
@@ -121,7 +116,6 @@ func (u *UbuntuDistribution) GetPackageMappingWithVariants(wm deps.WindowManager
 		// DMS packages from PPAs
 		"dms (DankMaterialShell)": u.getDmsMapping(variants["dms (DankMaterialShell)"]),
 		"quickshell":              u.getQuickshellMapping(variants["quickshell"]),
-		"dms-greeter":             {Name: "dms-greeter", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"},
 		"matugen":                 {Name: "matugen", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"},
 		"dgop":                    {Name: "dgop", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"},
 		"ghostty":                 {Name: "ghostty", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"},

core/internal/greeter/installer.go

@@ -17,6 +17,7 @@ import (
 	"github.com/sblinch/kdl-go/document"
 )
 
+// DetectDMSPath checks for DMS installation following XDG Base Directory specification
 func DetectDMSPath() (string, error) {
 	return config.LocateDMSConfig()
 }
@@ -36,6 +37,7 @@ func DetectGreeterGroup() string {
 	return "greeter"
 }
 
+// DetectCompositors checks which compositors are installed
 func DetectCompositors() []string {
 	var compositors []string
 
@@ -49,6 +51,7 @@ func DetectCompositors() []string {
 	return compositors
 }
 
+// PromptCompositorChoice asks user to choose between compositors
 func PromptCompositorChoice(compositors []string) (string, error) {
 	fmt.Println("\nMultiple compositors detected:")
 	for i, comp := range compositors {
@@ -76,18 +79,9 @@ func PromptCompositorChoice(compositors []string) (string, error) {
 	}
 }
 
-// EnsureGreetdInstalled checks if greetd is installed - greetd is a daemon in /usr/sbin on Debian/Ubuntu
+// EnsureGreetdInstalled checks if greetd is installed and installs it if not
 func EnsureGreetdInstalled(logFunc func(string), sudoPassword string) error {
-	greetdFound := utils.CommandExists("greetd")
-	if !greetdFound {
-		for _, p := range []string{"/usr/sbin/greetd", "/sbin/greetd"} {
-			if _, err := os.Stat(p); err == nil {
-				greetdFound = true
-				break
-			}
-		}
-	}
-	if greetdFound {
+	if utils.CommandExists("greetd") {
 		logFunc("✓ greetd is already installed")
 		return nil
 	}
@@ -148,14 +142,6 @@ func EnsureGreetdInstalled(logFunc func(string), sudoPassword string) error {
 			installCmd = exec.CommandContext(ctx, "sudo", "apt-get", "install", "-y", "greetd")
 		}
 
-	case distros.FamilyGentoo:
-		if sudoPassword != "" {
-			installCmd = distros.ExecSudoCommand(ctx, sudoPassword,
-				"emerge --ask n sys-apps/greetd")
-		} else {
-			installCmd = exec.CommandContext(ctx, "sudo", "emerge", "--ask", "n", "sys-apps/greetd")
-		}
-
 	case distros.FamilyNix:
 		return fmt.Errorf("on NixOS, please add greetd to your configuration.nix")
 
@@ -174,124 +160,13 @@ func EnsureGreetdInstalled(logFunc func(string), sudoPassword string) error {
 	return nil
 }
 
-// IsGreeterPackaged returns true if dms-greeter was installed from a system package.
-func IsGreeterPackaged() bool {
-	if !utils.CommandExists("dms-greeter") {
-		return false
-	}
-	packagedPath := "/usr/share/quickshell/dms-greeter"
-	info, err := os.Stat(packagedPath)
-	return err == nil && info.IsDir()
-}
-
-// HasLegacyLocalGreeterWrapper returns true when a manually installed wrapper exists.
-func HasLegacyLocalGreeterWrapper() bool {
-	info, err := os.Stat("/usr/local/bin/dms-greeter")
-	return err == nil && !info.IsDir()
-}
-
-// TryInstallGreeterPackage attempts to install dms-greeter from the distro's official repo.
-func TryInstallGreeterPackage(logFunc func(string), sudoPassword string) bool {
-	osInfo, err := distros.GetOSInfo()
-	if err != nil {
-		return false
-	}
-	config, exists := distros.Registry[osInfo.Distribution.ID]
-	if !exists {
-		return false
-	}
-
-	if IsGreeterPackaged() {
-		logFunc("✓ dms-greeter package already installed")
-		return true
-	}
-
-	ctx := context.Background()
-	var installCmd *exec.Cmd
-	var failHint string
-
-	switch config.Family {
-	case distros.FamilyDebian:
-		obsSlug := getDebianOBSSlug(osInfo)
-		keyURL := fmt.Sprintf("https://download.opensuse.org/repositories/home:AvengeMedia:danklinux/%s/Release.key", obsSlug)
-		repoLine := fmt.Sprintf("deb [signed-by=/etc/apt/keyrings/danklinux.gpg] https://download.opensuse.org/repositories/home:/AvengeMedia:/danklinux/%s/ /", obsSlug)
-		failHint = fmt.Sprintf("⚠ dms-greeter install failed. Add OBS repo manually:\ncurl -fsSL %s | sudo gpg --dearmor -o /etc/apt/keyrings/danklinux.gpg\necho '%s' | sudo tee /etc/apt/sources.list.d/danklinux.list\nsudo apt update && sudo apt install dms-greeter", keyURL, repoLine)
-		logFunc(fmt.Sprintf("Adding DankLinux OBS repository (%s)...", obsSlug))
-		addKeyCmd := exec.CommandContext(ctx, "bash", "-c",
-			fmt.Sprintf(`curl -fsSL %s | sudo gpg --dearmor -o /etc/apt/keyrings/danklinux.gpg`, keyURL))
-		addKeyCmd.Stdout = os.Stdout
-		addKeyCmd.Stderr = os.Stderr
-		addKeyCmd.Run()
-		addRepoCmd := exec.CommandContext(ctx, "bash", "-c",
-			fmt.Sprintf(`echo '%s' | sudo tee /etc/apt/sources.list.d/danklinux.list`, repoLine))
-		addRepoCmd.Stdout = os.Stdout
-		addRepoCmd.Stderr = os.Stderr
-		addRepoCmd.Run()
-		exec.CommandContext(ctx, "sudo", "apt-get", "update").Run()
-		installCmd = exec.CommandContext(ctx, "sudo", "apt-get", "install", "-y", "dms-greeter")
-	case distros.FamilySUSE:
-		repoURL := getOpenSUSEOBSRepoURL(osInfo)
-		failHint = fmt.Sprintf("⚠ dms-greeter install failed. Add OBS repo manually:\nsudo zypper addrepo %s\nsudo zypper refresh && sudo zypper install dms-greeter", repoURL)
-		logFunc("Adding DankLinux OBS repository...")
-		addRepoCmd := exec.CommandContext(ctx, "sudo", "zypper", "addrepo", repoURL)
-		addRepoCmd.Stdout = os.Stdout
-		addRepoCmd.Stderr = os.Stderr
-		addRepoCmd.Run()
-		exec.CommandContext(ctx, "sudo", "zypper", "refresh").Run()
-		installCmd = exec.CommandContext(ctx, "sudo", "zypper", "install", "-y", "dms-greeter")
-	case distros.FamilyUbuntu:
-		failHint = "⚠ dms-greeter install failed. Add PPA manually: sudo add-apt-repository ppa:avengemedia/danklinux && sudo apt-get update && sudo apt-get install dms-greeter"
-		logFunc("Enabling PPA ppa:avengemedia/danklinux...")
-		ppacmd := exec.CommandContext(ctx, "sudo", "add-apt-repository", "-y", "ppa:avengemedia/danklinux")
-		ppacmd.Stdout = os.Stdout
-		ppacmd.Stderr = os.Stderr
-		ppacmd.Run()
-		exec.CommandContext(ctx, "sudo", "apt-get", "update").Run()
-		installCmd = exec.CommandContext(ctx, "sudo", "apt-get", "install", "-y", "dms-greeter")
-	case distros.FamilyFedora:
-		failHint = "⚠ dms-greeter install failed. Enable COPR manually: sudo dnf copr enable avengemedia/danklinux && sudo dnf install dms-greeter"
-		logFunc("Enabling COPR avengemedia/danklinux...")
-		coprcmd := exec.CommandContext(ctx, "sudo", "dnf", "copr", "enable", "-y", "avengemedia/danklinux")
-		coprcmd.Stdout = os.Stdout
-		coprcmd.Stderr = os.Stderr
-		coprcmd.Run()
-		installCmd = exec.CommandContext(ctx, "sudo", "dnf", "install", "-y", "dms-greeter")
-	case distros.FamilyArch:
-		aurHelper := ""
-		for _, helper := range []string{"paru", "yay"} {
-			if _, err := exec.LookPath(helper); err == nil {
-				aurHelper = helper
-				break
-			}
-		}
-		if aurHelper == "" {
-			logFunc("⚠ No AUR helper found (paru/yay). Install greetd-dms-greeter-git from AUR: https://aur.archlinux.org/packages/greetd-dms-greeter-git")
-			return false
-		}
-		failHint = fmt.Sprintf("⚠ dms-greeter install failed. Install from AUR: %s -S greetd-dms-greeter-git", aurHelper)
-		installCmd = exec.CommandContext(ctx, aurHelper, "-S", "--noconfirm", "greetd-dms-greeter-git")
-	default:
-		return false
-	}
-
-	logFunc("Installing dms-greeter from official repository...")
-	installCmd.Stdout = os.Stdout
-	installCmd.Stderr = os.Stderr
-
-	if err := installCmd.Run(); err != nil {
-		logFunc(failHint)
-		return false
-	}
-
-	logFunc("✓ dms-greeter package installed")
-	return true
-}
-
 // CopyGreeterFiles installs the dms-greeter wrapper and sets up cache directory
 func CopyGreeterFiles(dmsPath, compositor string, logFunc func(string), sudoPassword string) error {
+	// Check if dms-greeter is already in PATH
 	if utils.CommandExists("dms-greeter") {
 		logFunc("✓ dms-greeter wrapper already installed")
 	} else {
+		// Install the wrapper script
 		assetsDir := filepath.Join(dmsPath, "Modules", "Greetd", "assets")
 		wrapperSrc := filepath.Join(assetsDir, "dms-greeter")
 
@@ -328,6 +203,7 @@ func CopyGreeterFiles(dmsPath, compositor string, logFunc func(string), sudoPass
 		}
 	}
 
+	// Create cache directory with proper permissions
 	cacheDir := "/var/cache/dms-greeter"
 	if err := runSudoCmd(sudoPassword, "mkdir", "-p", cacheDir); err != nil {
 		return fmt.Errorf("failed to create cache directory: %w", err)
@@ -348,90 +224,14 @@ func CopyGreeterFiles(dmsPath, compositor string, logFunc func(string), sudoPass
 	return nil
 }
 
-// EnsureACLInstalled installs the acl package (setfacl/getfacl) if not already present
-func EnsureACLInstalled(logFunc func(string), sudoPassword string) error {
-	if utils.CommandExists("setfacl") {
-		return nil
-	}
-
-	logFunc("setfacl not found – installing acl package...")
-
-	osInfo, err := distros.GetOSInfo()
-	if err != nil {
-		return fmt.Errorf("failed to detect OS: %w", err)
-	}
-
-	config, exists := distros.Registry[osInfo.Distribution.ID]
-	if !exists {
-		return fmt.Errorf("unsupported distribution for automatic acl installation: %s", osInfo.Distribution.ID)
-	}
-
-	ctx := context.Background()
-	var installCmd *exec.Cmd
-
-	switch config.Family {
-	case distros.FamilyArch:
-		if sudoPassword != "" {
-			installCmd = distros.ExecSudoCommand(ctx, sudoPassword, "pacman -S --needed --noconfirm acl")
-		} else {
-			installCmd = exec.CommandContext(ctx, "sudo", "pacman", "-S", "--needed", "--noconfirm", "acl")
-		}
-
-	case distros.FamilyFedora:
-		if sudoPassword != "" {
-			installCmd = distros.ExecSudoCommand(ctx, sudoPassword, "dnf install -y acl")
-		} else {
-			installCmd = exec.CommandContext(ctx, "sudo", "dnf", "install", "-y", "acl")
-		}
-
-	case distros.FamilySUSE:
-		if sudoPassword != "" {
-			installCmd = distros.ExecSudoCommand(ctx, sudoPassword, "zypper install -y acl")
-		} else {
-			installCmd = exec.CommandContext(ctx, "sudo", "zypper", "install", "-y", "acl")
-		}
-
-	case distros.FamilyUbuntu, distros.FamilyDebian:
-		if sudoPassword != "" {
-			installCmd = distros.ExecSudoCommand(ctx, sudoPassword, "apt-get install -y acl")
-		} else {
-			installCmd = exec.CommandContext(ctx, "sudo", "apt-get", "install", "-y", "acl")
-		}
-
-	case distros.FamilyGentoo:
-		if sudoPassword != "" {
-			installCmd = distros.ExecSudoCommand(ctx, sudoPassword, "emerge --ask n sys-fs/acl")
-		} else {
-			installCmd = exec.CommandContext(ctx, "sudo", "emerge", "--ask", "n", "sys-fs/acl")
-		}
-
-	case distros.FamilyNix:
-		return fmt.Errorf("on NixOS, please add pkgs.acl to your configuration.nix")
-
-	default:
-		return fmt.Errorf("unsupported distribution family for automatic acl installation: %s", config.Family)
-	}
-
-	installCmd.Stdout = os.Stdout
-	installCmd.Stderr = os.Stderr
-	if err := installCmd.Run(); err != nil {
-		return fmt.Errorf("failed to install acl: %w", err)
-	}
-
-	logFunc("✓ acl package installed")
-	return nil
-}
-
 // SetupParentDirectoryACLs sets ACLs on parent directories to allow traversal
 func SetupParentDirectoryACLs(logFunc func(string), sudoPassword string) error {
-	if err := EnsureACLInstalled(logFunc, sudoPassword); err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: could not install acl package: %v", err))
-		logFunc("  ACL permissions will be skipped; theme sync may not work correctly.")
-		return nil
-	}
 	if !utils.CommandExists("setfacl") {
-		// setfacl still not found after install attempt (e.g. unsupported filesystem)
-		logFunc("⚠ Warning: setfacl still not available after install attempt; skipping ACL setup.")
+		logFunc("⚠ Warning: setfacl command not found. ACL support may not be available on this filesystem.")
+		logFunc("  If theme sync doesn't work, you may need to install acl package:")
+		logFunc("  - Fedora/RHEL: sudo dnf install acl")
+		logFunc("  - Debian/Ubuntu: sudo apt-get install acl")
+		logFunc("  - Arch: sudo pacman -S acl")
 		return nil
 	}
 
@@ -464,6 +264,7 @@ func SetupParentDirectoryACLs(logFunc func(string), sudoPassword string) error {
 			}
 		}
 
+		// Set ACL to allow greeter user read+execute permission (for session discovery)
 		if err := runSudoCmd(sudoPassword, "setfacl", "-m", fmt.Sprintf("u:%s:rx", owner), dir.path); err != nil {
 			logFunc(fmt.Sprintf("⚠ Warning: Failed to set ACL on %s: %v", dir.desc, err))
 			logFunc(fmt.Sprintf("  You may need to run manually: setfacl -m u:%s:x %s", owner, dir.path))
@@ -498,6 +299,7 @@ func SetupDMSGroup(logFunc func(string), sudoPassword string) error {
 	if err == nil && strings.Contains(string(groupsOutput), group) {
 		logFunc(fmt.Sprintf("✓ %s is already in %s group", currentUser, group))
 	} else {
+		// Add current user to greeter group for file access permissions
 		if err := runSudoCmd(sudoPassword, "usermod", "-aG", group, currentUser); err != nil {
 			return fmt.Errorf("failed to add %s to %s group: %w", currentUser, group, err)
 		}
@@ -537,6 +339,7 @@ func SetupDMSGroup(logFunc func(string), sudoPassword string) error {
 		logFunc(fmt.Sprintf("✓ Set group permissions for %s", dir.desc))
 	}
 
+	// Set up ACLs on parent directories to allow greeter user traversal
 	if err := SetupParentDirectoryACLs(logFunc, sudoPassword); err != nil {
 		return fmt.Errorf("failed to setup parent directory ACLs: %w", err)
 	}
@@ -590,7 +393,7 @@ func SyncDMSConfigs(dmsPath, compositor string, logFunc func(string), sudoPasswo
 			}
 		}
 
-		_ = runSudoCmd(sudoPassword, "rm", "-f", link.target)
+		runSudoCmd(sudoPassword, "rm", "-f", link.target) //nolint:errcheck
 
 		if err := runSudoCmd(sudoPassword, "ln", "-sf", link.source, link.target); err != nil {
 			logFunc(fmt.Sprintf("⚠ Warning: Failed to create symlink for %s: %v", link.desc, err))
@@ -984,19 +787,15 @@ user = "%s"
 		}
 	}
 
-	// If dmsPath is empty (packaged greeter), omit -p; wrapper finds /usr/share/quickshell/dms-greeter
+	// Determine wrapper command path
 	wrapperCmd := "dms-greeter"
 	if !utils.CommandExists("dms-greeter") {
 		wrapperCmd = "/usr/local/bin/dms-greeter"
 	}
 
+	// Build command based on compositor and dms path
 	compositorLower := strings.ToLower(compositor)
-	var command string
-	if dmsPath == "" {
-		command = fmt.Sprintf(`command = "%s --command %s"`, wrapperCmd, compositorLower)
-	} else {
-		command = fmt.Sprintf(`command = "%s --command %s -p %s"`, wrapperCmd, compositorLower, dmsPath)
-	}
+	command := fmt.Sprintf(`command = "%s --command %s -p %s"`, wrapperCmd, compositorLower, dmsPath)
 
 	var finalLines []string
 	inDefaultSession := false
@@ -1033,11 +832,7 @@ user = "%s"
 		return fmt.Errorf("failed to move config to /etc/greetd: %w", err)
 	}
 
-	cmdDesc := fmt.Sprintf("%s --command %s", wrapperCmd, compositorLower)
-	if dmsPath != "" {
-		cmdDesc = fmt.Sprintf("%s -p %s", cmdDesc, dmsPath)
-	}
-	logFunc(fmt.Sprintf("✓ Updated greetd configuration (user: %s, command: %s)", greeterUser, cmdDesc))
+	logFunc(fmt.Sprintf("✓ Updated greetd configuration (user: %s, command: %s --command %s -p %s)", greeterUser, wrapperCmd, compositorLower, dmsPath))
 	return nil
 }
 
@@ -1072,47 +867,6 @@ func stripConfigFlag(command string) string {
 	return command
 }
 
-// getDebianOBSSlug returns the OBS repository slug for the running Debian version.
-func getDebianOBSSlug(osInfo *distros.OSInfo) string {
-	versionID := strings.ToLower(osInfo.VersionID)
-	codename := strings.ToLower(osInfo.VersionCodename)
-	prettyName := strings.ToLower(osInfo.PrettyName)
-
-	if strings.Contains(prettyName, "sid") || strings.Contains(prettyName, "unstable") ||
-		codename == "sid" || versionID == "sid" {
-		return "Debian_Unstable"
-	}
-	if versionID == "testing" || codename == "testing" {
-		return "Debian_Testing"
-	}
-	if versionID != "" {
-		return "Debian_" + versionID // "Debian_13"
-	}
-	return "Debian_Unstable"
-}
-
-// getOpenSUSEOBSRepoURL returns the OBS .repo file URL for the running openSUSE variant.
-func getOpenSUSEOBSRepoURL(osInfo *distros.OSInfo) string {
-	const base = "https://download.opensuse.org/repositories/home:AvengeMedia:danklinux"
-	var slug string
-	switch osInfo.Distribution.ID {
-	case "opensuse-leap":
-		v := osInfo.VersionID
-		if v != "" && !strings.Contains(v, ".") {
-			v += ".0" // "16" → "16.0"
-		}
-		if v == "" {
-			v = "16.0"
-		}
-		slug = v
-	case "opensuse-slowroll":
-		slug = "openSUSE_Slowroll"
-	default: // opensuse-tumbleweed || unknown version
-		slug = "openSUSE_Tumbleweed"
-	}
-	return fmt.Sprintf("%s/%s/home:AvengeMedia:danklinux.repo", base, slug)
-}
-
 func runSudoCmd(sudoPassword string, command string, args ...string) error {
 	var cmd *exec.Cmd
 
@@ -1133,140 +887,3 @@ func runSudoCmd(sudoPassword string, command string, args ...string) error {
 	cmd.Stderr = os.Stderr
 	return cmd.Run()
 }
-
-func checkSystemdEnabled(service string) (string, error) {
-	cmd := exec.Command("systemctl", "is-enabled", service)
-	output, _ := cmd.Output()
-	return strings.TrimSpace(string(output)), nil
-}
-
-func DisableConflictingDisplayManagers(sudoPassword string, logFunc func(string)) error {
-	conflictingDMs := []string{"gdm", "gdm3", "lightdm", "sddm", "lxdm", "xdm", "cosmic-greeter"}
-	for _, dm := range conflictingDMs {
-		state, err := checkSystemdEnabled(dm)
-		if err != nil || state == "" || state == "not-found" {
-			continue
-		}
-		switch state {
-		case "enabled", "enabled-runtime", "static", "indirect", "alias":
-			logFunc(fmt.Sprintf("Disabling conflicting display manager: %s", dm))
-			if err := runSudoCmd(sudoPassword, "systemctl", "disable", "--now", dm); err != nil {
-				logFunc(fmt.Sprintf("⚠ Warning: Failed to disable %s: %v", dm, err))
-			} else {
-				logFunc(fmt.Sprintf("✓ Disabled %s", dm))
-			}
-		}
-	}
-	return nil
-}
-
-// EnableGreetd unmasks and enables greetd, forcing it over any other DM.
-func EnableGreetd(sudoPassword string, logFunc func(string)) error {
-	state, err := checkSystemdEnabled("greetd")
-	if err != nil {
-		return fmt.Errorf("failed to check greetd state: %w", err)
-	}
-	if state == "not-found" {
-		return fmt.Errorf("greetd service not found; ensure greetd is installed")
-	}
-	if state == "masked" || state == "masked-runtime" {
-		logFunc("  Unmasking greetd...")
-		if err := runSudoCmd(sudoPassword, "systemctl", "unmask", "greetd"); err != nil {
-			return fmt.Errorf("failed to unmask greetd: %w", err)
-		}
-		logFunc("  ✓ Unmasked greetd")
-	}
-	logFunc("  Enabling greetd service (--force)...")
-	if err := runSudoCmd(sudoPassword, "systemctl", "enable", "--force", "greetd"); err != nil {
-		return fmt.Errorf("failed to enable greetd: %w", err)
-	}
-	logFunc("✓ greetd enabled")
-	return nil
-}
-
-func EnsureGraphicalTarget(sudoPassword string, logFunc func(string)) error {
-	cmd := exec.Command("systemctl", "get-default")
-	output, err := cmd.Output()
-	if err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: could not get default systemd target: %v", err))
-		return nil
-	}
-	current := strings.TrimSpace(string(output))
-	if current == "graphical.target" {
-		logFunc("✓ Default target is already graphical.target")
-		return nil
-	}
-	logFunc(fmt.Sprintf("  Setting default target to graphical.target (was: %s)...", current))
-	if err := runSudoCmd(sudoPassword, "systemctl", "set-default", "graphical.target"); err != nil {
-		return fmt.Errorf("failed to set graphical target: %w", err)
-	}
-	logFunc("✓ Default target set to graphical.target")
-	return nil
-}
-
-// AutoSetupGreeter performs the full non-interactive greeter setup
-func AutoSetupGreeter(compositor, sudoPassword string, logFunc func(string)) error {
-	if IsGreeterPackaged() && HasLegacyLocalGreeterWrapper() {
-		return fmt.Errorf("legacy manual wrapper detected at /usr/local/bin/dms-greeter; " +
-			"remove it before using packaged dms-greeter: sudo rm -f /usr/local/bin/dms-greeter")
-	}
-
-	logFunc("Ensuring greetd is installed...")
-	if err := EnsureGreetdInstalled(logFunc, sudoPassword); err != nil {
-		return fmt.Errorf("greetd install failed: %w", err)
-	}
-
-	dmsPath := ""
-	if !IsGreeterPackaged() {
-		detected, err := DetectDMSPath()
-		if err != nil {
-			return fmt.Errorf("DMS installation not found: %w", err)
-		}
-		dmsPath = detected
-		logFunc(fmt.Sprintf("✓ Found DMS at: %s", dmsPath))
-	} else {
-		logFunc("✓ Using packaged dms-greeter (/usr/share/quickshell/dms-greeter)")
-	}
-
-	logFunc("Setting up dms-greeter group and permissions...")
-	if err := SetupDMSGroup(logFunc, sudoPassword); err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: group/permissions setup error: %v", err))
-	}
-
-	logFunc("Copying greeter files...")
-	if err := CopyGreeterFiles(dmsPath, compositor, logFunc, sudoPassword); err != nil {
-		return fmt.Errorf("failed to copy greeter files: %w", err)
-	}
-
-	logFunc("Configuring greetd...")
-	greeterPathForConfig := ""
-	if !IsGreeterPackaged() {
-		greeterPathForConfig = dmsPath
-	}
-	if err := ConfigureGreetd(greeterPathForConfig, compositor, logFunc, sudoPassword); err != nil {
-		return fmt.Errorf("failed to configure greetd: %w", err)
-	}
-
-	logFunc("Synchronizing DMS configurations...")
-	if err := SyncDMSConfigs(dmsPath, compositor, logFunc, sudoPassword); err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: config sync error: %v", err))
-	}
-
-	logFunc("Checking for conflicting display managers...")
-	if err := DisableConflictingDisplayManagers(sudoPassword, logFunc); err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: %v", err))
-	}
-
-	logFunc("Enabling greetd service...")
-	if err := EnableGreetd(sudoPassword, logFunc); err != nil {
-		return fmt.Errorf("failed to enable greetd: %w", err)
-	}
-
-	logFunc("Ensuring graphical.target as default...")
-	if err := EnsureGraphicalTarget(sudoPassword, logFunc); err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: %v", err))
-	}
-
-	logFunc("✓ DMS greeter setup complete")
-	return nil
-}

core/internal/keybinds/providers/niri.go

@@ -341,8 +341,6 @@ func (n *NiriProvider) buildActionFromNode(bindNode *document.Node) string {
 		val := arg.ValueString()
 		if val == "" {
 			parts = append(parts, `""`)
-		} else if strings.ContainsAny(val, " \t") {
-			parts = append(parts, `"`+strings.ReplaceAll(val, `"`, `\"`)+`"`)
 		} else {
 			parts = append(parts, val)
 		}

core/internal/matugen/matugen.go

@@ -1,9 +1,7 @@
 package matugen
 
 import (
-	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"math"
 	"os"
@@ -21,8 +19,6 @@ import (
 	"github.com/lucasb-eyer/go-colorful"
 )
 
-var ErrNoChanges = errors.New("no color changes")
-
 type ColorMode string
 
 const (
@@ -58,7 +54,7 @@ var templateRegistry = []TemplateDef{
 	{ID: "qt6ct", Commands: []string{"qt6ct"}, ConfigFile: "qt6ct.toml"},
 	{ID: "firefox", Commands: []string{"firefox"}, ConfigFile: "firefox.toml"},
 	{ID: "pywalfox", Commands: []string{"pywalfox"}, ConfigFile: "pywalfox.toml"},
-	{ID: "zenbrowser", Commands: []string{"zen", "zen-browser", "zen-beta", "zen-twilight"}, Flatpaks: []string{"app.zen_browser.zen"}, ConfigFile: "zenbrowser.toml"},
+	{ID: "zenbrowser", Commands: []string{"zen", "zen-browser"}, Flatpaks: []string{"app.zen_browser.zen"}, ConfigFile: "zenbrowser.toml"},
 	{ID: "vesktop", Commands: []string{"vesktop"}, Flatpaks: []string{"dev.vencord.Vesktop"}, ConfigFile: "vesktop.toml"},
 	{ID: "equibop", Commands: []string{"equibop"}, ConfigFile: "equibop.toml"},
 	{ID: "ghostty", Commands: []string{"ghostty"}, ConfigFile: "ghostty.toml", Kind: TemplateKindTerminal},
@@ -164,14 +160,8 @@ func Run(opts Options) error {
 
 	log.Infof("Building theme: %s %s (%s)", opts.Kind, opts.Value, opts.Mode)
 
-	changed, buildErr := buildOnce(&opts)
-	if buildErr != nil {
-		return buildErr
-	}
-
-	if !changed {
-		log.Info("No color changes detected, skipping refresh")
-		return ErrNoChanges
+	if err := buildOnce(&opts); err != nil {
+		return err
 	}
 
 	if opts.SyncModeWithPortal {
@@ -182,27 +172,25 @@ func Run(opts Options) error {
 	return nil
 }
 
-func buildOnce(opts *Options) (bool, error) {
+func buildOnce(opts *Options) error {
 	cfgFile, err := os.CreateTemp("", "matugen-config-*.toml")
 	if err != nil {
-		return false, fmt.Errorf("failed to create temp config: %w", err)
+		return fmt.Errorf("failed to create temp config: %w", err)
 	}
 	defer os.Remove(cfgFile.Name())
 	defer cfgFile.Close()
 
 	tmpDir, err := os.MkdirTemp("", "matugen-templates-*")
 	if err != nil {
-		return false, fmt.Errorf("failed to create temp dir: %w", err)
+		return fmt.Errorf("failed to create temp dir: %w", err)
 	}
 	defer os.RemoveAll(tmpDir)
 
 	if err := buildMergedConfig(opts, cfgFile, tmpDir); err != nil {
-		return false, fmt.Errorf("failed to build config: %w", err)
+		return fmt.Errorf("failed to build config: %w", err)
 	}
 	cfgFile.Close()
 
-	oldColors, _ := os.ReadFile(opts.ColorsOutput())
-
 	var primaryDark, primaryLight, surface string
 	var dank16JSON string
 	var importArgs []string
@@ -214,7 +202,7 @@ func buildOnce(opts *Options) (bool, error) {
 		surface = extractNestedColor(opts.StockColors, "surface", "dark")
 
 		if primaryDark == "" {
-			return false, fmt.Errorf("failed to extract primary dark from stock colors")
+			return fmt.Errorf("failed to extract primary dark from stock colors")
 		}
 		if primaryLight == "" {
 			primaryLight = primaryDark
@@ -228,14 +216,14 @@ func buildOnce(opts *Options) (bool, error) {
 		args := []string{"color", "hex", primaryDark, "-m", string(opts.Mode), "-t", opts.MatugenType, "-c", cfgFile.Name()}
 		args = append(args, importArgs...)
 		if err := runMatugen(args); err != nil {
-			return false, err
+			return err
 		}
 	} else {
 		log.Infof("Using dynamic theme from %s: %s", opts.Kind, opts.Value)
 
 		matJSON, err := runMatugenDryRun(opts)
 		if err != nil {
-			return false, fmt.Errorf("matugen dry-run failed: %w", err)
+			return fmt.Errorf("matugen dry-run failed: %w", err)
 		}
 
 		primaryDark = extractMatugenColor(matJSON, "primary", "dark")
@@ -243,7 +231,7 @@ func buildOnce(opts *Options) (bool, error) {
 		surface = extractMatugenColor(matJSON, "surface", "dark")
 
 		if primaryDark == "" {
-			return false, fmt.Errorf("failed to extract primary color")
+			return fmt.Errorf("failed to extract primary color")
 		}
 		if primaryLight == "" {
 			primaryLight = primaryDark
@@ -264,15 +252,10 @@ func buildOnce(opts *Options) (bool, error) {
 		args = append(args, "-m", string(opts.Mode), "-t", opts.MatugenType, "-c", cfgFile.Name())
 		args = append(args, importArgs...)
 		if err := runMatugen(args); err != nil {
-			return false, err
+			return err
 		}
 	}
 
-	newColors, _ := os.ReadFile(opts.ColorsOutput())
-	if bytes.Equal(oldColors, newColors) && len(oldColors) > 0 {
-		return false, nil
-	}
-
 	if isDMSGTKActive(opts.ConfigDir) {
 		switch opts.Mode {
 		case ColorModeLight:
@@ -290,7 +273,7 @@ func buildOnce(opts *Options) (bool, error) {
 
 	signalTerminals(opts)
 
-	return true, nil
+	return nil
 }
 
 func buildMergedConfig(opts *Options, cfgFile *os.File, tmpDir string) error {

core/internal/matugen/queue.go

@@ -2,7 +2,6 @@ package matugen
 
 import (
 	"context"
-	"errors"
 	"sync"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
@@ -94,13 +93,10 @@ func (q *Queue) runWorker() {
 		err := Run(job.Options)
 
 		var result Result
-		switch {
-		case err == nil:
-			result = Result{Success: true}
-		case errors.Is(err, ErrNoChanges):
-			result = Result{Success: true}
-		default:
+		if err != nil {
 			result = Result{Success: false, Error: err}
+		} else {
+			result = Result{Success: true}
 		}
 
 		q.finishJob(result)

core/internal/server/bluez/manager.go

@@ -311,10 +311,6 @@ func (m *Manager) handleDevicePropertiesChanged(path dbus.ObjectPath, changed ma
 				select {
 				case m.eventQueue <- func() {
 					time.Sleep(300 * time.Millisecond)
-					log.Infof("[Bluetooth] Auto-trusting newly paired device: %s", devicePath)
-					if err := m.TrustDevice(devicePath, true); err != nil {
-						log.Warnf("[Bluetooth] Auto-trust failed: %v", err)
-					}
 					log.Infof("[Bluetooth] Auto-connecting newly paired device: %s", devicePath)
 					if err := m.ConnectDevice(devicePath); err != nil {
 						log.Warnf("[Bluetooth] Auto-connect failed: %v", err)

core/internal/server/clipboard/manager.go

@@ -232,15 +232,8 @@ func (m *Manager) setupDataDeviceSync() {
 			return
 		}
 
-		prevOffer := m.currentOffer
 		m.currentOffer = offer
 
-		if prevOffer != nil && prevOffer != offer {
-			m.offerMutex.Lock()
-			delete(m.offerMimeTypes, prevOffer)
-			m.offerMutex.Unlock()
-		}
-
 		m.offerMutex.RLock()
 		mimes := m.offerMimeTypes[offer]
 		m.offerMutex.RUnlock()
@@ -594,26 +587,20 @@ func (m *Manager) uriListPreview(data []byte) (string, bool) {
 		uris = strings.Split(text, "\n")
 	}
 
-	if len(uris) > 1 {
-		return fmt.Sprintf("[[ %d files ]]", len(uris)), false
-	}
-
 	if len(uris) == 1 && strings.HasPrefix(uris[0], "file://") {
 		filePath := strings.TrimPrefix(uris[0], "file://")
-		info, err := os.Stat(filePath)
-		if err != nil || info.IsDir() {
-			return m.textPreview(data), false
-		}
-
-		cfg := m.getConfig()
-		if info.Size() <= cfg.MaxEntrySize {
+		if info, err := os.Stat(filePath); err == nil && !info.IsDir() {
 			if imgData, err := os.ReadFile(filePath); err == nil {
 				if config, imgFmt, err := image.DecodeConfig(bytes.NewReader(imgData)); err == nil {
 					return fmt.Sprintf("[[ file %s %s %dx%d ]]", filepath.Base(filePath), imgFmt, config.Width, config.Height), true
 				}
 			}
+			return fmt.Sprintf("[[ file %s ]]", filepath.Base(filePath)), false
 		}
-		return fmt.Sprintf("[[ file %s ]]", filepath.Base(filePath)), false
+	}
+
+	if len(uris) > 1 {
+		return fmt.Sprintf("[[ %d files ]]", len(uris)), false
 	}
 
 	return m.textPreview(data), false
@@ -636,11 +623,6 @@ func (m *Manager) tryReadImageFromURI(data []byte) ([]byte, string, bool) {
 		return nil, "", false
 	}
 
-	cfg := m.getConfig()
-	if info.Size() > cfg.MaxEntrySize {
-		return nil, "", false
-	}
-
 	imgData, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, "", false

core/internal/server/freedesktop/constants.go

@@ -16,8 +16,4 @@ const (
 	dbusScreensaverPath      = "/ScreenSaver"
 	dbusScreensaverPath2     = "/org/freedesktop/ScreenSaver"
 	dbusScreensaverInterface = "org.freedesktop.ScreenSaver"
-
-	dbusGnomeScreensaverName      = "org.gnome.ScreenSaver"
-	dbusGnomeScreensaverPath      = "/org/gnome/ScreenSaver"
-	dbusGnomeScreensaverInterface = "org.gnome.ScreenSaver"
 )

core/internal/server/freedesktop/manager.go

@@ -191,12 +191,6 @@ func (m *Manager) Close() {
 		return true
 	})
 
-	m.screensaverSubscribers.Range(func(key string, ch chan ScreensaverState) bool {
-		close(ch)
-		m.screensaverSubscribers.Delete(key)
-		return true
-	})
-
 	if m.systemConn != nil {
 		m.systemConn.Close()
 	}

core/internal/server/freedesktop/screensaver.go

@@ -1,7 +1,6 @@
 package freedesktop
 
 import (
-	"fmt"
 	"path/filepath"
 	"strings"
 	"sync/atomic"
@@ -16,9 +15,45 @@ type screensaverHandler struct {
 	manager *Manager
 }
 
-func screensaverIntrospectIface(ifaceName string) introspect.Interface {
-	return introspect.Interface{
-		Name: ifaceName,
+func (m *Manager) initializeScreensaver() error {
+	if m.sessionConn == nil {
+		m.stateMutex.Lock()
+		m.state.Screensaver.Available = false
+		m.stateMutex.Unlock()
+		return nil
+	}
+
+	reply, err := m.sessionConn.RequestName(dbusScreensaverName, dbus.NameFlagDoNotQueue)
+	if err != nil {
+		log.Warnf("Failed to request screensaver name: %v", err)
+		m.stateMutex.Lock()
+		m.state.Screensaver.Available = false
+		m.stateMutex.Unlock()
+		return nil
+	}
+
+	if reply != dbus.RequestNameReplyPrimaryOwner {
+		log.Warnf("Screensaver name already owned by another process")
+		m.stateMutex.Lock()
+		m.state.Screensaver.Available = false
+		m.stateMutex.Unlock()
+		return nil
+	}
+
+	handler := &screensaverHandler{manager: m}
+
+	if err := m.sessionConn.Export(handler, dbusScreensaverPath, dbusScreensaverInterface); err != nil {
+		log.Warnf("Failed to export screensaver on %s: %v", dbusScreensaverPath, err)
+		return nil
+	}
+
+	if err := m.sessionConn.Export(handler, dbusScreensaverPath2, dbusScreensaverInterface); err != nil {
+		log.Warnf("Failed to export screensaver on %s: %v", dbusScreensaverPath2, err)
+		return nil
+	}
+
+	screensaverIface := introspect.Interface{
+		Name: dbusScreensaverInterface,
 		Methods: []introspect.Method{
 			{
 				Name: "Inhibit",
@@ -34,106 +69,40 @@ func screensaverIntrospectIface(ifaceName string) introspect.Interface {
 					{Name: "cookie", Type: "u", Direction: "in"},
 				},
 			},
-			{
-				Name: "GetActive",
-				Args: []introspect.Arg{
-					{Name: "active", Type: "b", Direction: "out"},
-				},
-			},
-			{
-				Name: "SetActive",
-				Args: []introspect.Arg{
-					{Name: "active", Type: "b", Direction: "in"},
-				},
-			},
-			{
-				Name: "Lock",
-			},
-		},
-		Signals: []introspect.Signal{
-			{
-				Name: "ActiveChanged",
-				Args: []introspect.Arg{
-					{Name: "new_value", Type: "b"},
-				},
-			},
 		},
 	}
-}
 
-func (m *Manager) initializeScreensaver() error {
-	if m.sessionConn == nil {
-		m.stateMutex.Lock()
-		m.state.Screensaver.Available = false
-		m.stateMutex.Unlock()
-		return nil
+	introNode := &introspect.Node{
+		Name: dbusScreensaverPath,
+		Interfaces: []introspect.Interface{
+			introspect.IntrospectData,
+			screensaverIface,
+		},
+	}
+	if err := m.sessionConn.Export(introspect.NewIntrospectable(introNode), dbusScreensaverPath, "org.freedesktop.DBus.Introspectable"); err != nil {
+		log.Warnf("Failed to export introspectable on %s: %v", dbusScreensaverPath, err)
 	}
 
-	handler := &screensaverHandler{manager: m}
-
-	m.screensaverFreedesktopClaimed = m.claimScreensaverName(handler,
-		dbusScreensaverName, dbusScreensaverInterface, dbusScreensaverPath, dbusScreensaverPath2)
-	m.screensaverGnomeClaimed = m.claimScreensaverName(handler,
-		dbusGnomeScreensaverName, dbusGnomeScreensaverInterface, dbusGnomeScreensaverPath)
-
-	if !m.screensaverFreedesktopClaimed && !m.screensaverGnomeClaimed {
-		log.Warn("No screensaver interface could be claimed")
-		m.stateMutex.Lock()
-		m.state.Screensaver.Available = false
-		m.stateMutex.Unlock()
-		return nil
+	introNode2 := &introspect.Node{
+		Name: dbusScreensaverPath2,
+		Interfaces: []introspect.Interface{
+			introspect.IntrospectData,
+			screensaverIface,
+		},
+	}
+	if err := m.sessionConn.Export(introspect.NewIntrospectable(introNode2), dbusScreensaverPath2, "org.freedesktop.DBus.Introspectable"); err != nil {
+		log.Warnf("Failed to export introspectable on %s: %v", dbusScreensaverPath2, err)
 	}
 
 	go m.watchPeerDisconnects()
 
 	m.stateMutex.Lock()
 	m.state.Screensaver.Available = true
-	m.state.Screensaver.Active = false
 	m.state.Screensaver.Inhibited = false
 	m.state.Screensaver.Inhibitors = []ScreensaverInhibitor{}
 	m.stateMutex.Unlock()
 
-	log.Info("Screensaver listener initialized")
-	return nil
-}
-
-func (m *Manager) claimScreensaverName(handler *screensaverHandler, name, iface string, paths ...dbus.ObjectPath) bool {
-	reply, err := m.sessionConn.RequestName(name, dbus.NameFlagDoNotQueue)
-	if err != nil {
-		log.Warnf("Failed to request screensaver name %s: %v", name, err)
-		return false
-	}
-	if reply != dbus.RequestNameReplyPrimaryOwner {
-		log.Warnf("Screensaver name %s already owned by another process", name)
-		return false
-	}
-	if err := m.exportScreensaverOnPaths(handler, iface, paths...); err != nil {
-		log.Warnf("Failed to export screensaver on %s: %v", name, err)
-		return false
-	}
-	log.Infof("Claimed %s on session bus", name)
-	return true
-}
-
-// exportScreensaverOnPaths exports the handler and introspection on the given
-// paths under the specified interface name.
-func (m *Manager) exportScreensaverOnPaths(handler *screensaverHandler, ifaceName string, paths ...dbus.ObjectPath) error {
-	iface := screensaverIntrospectIface(ifaceName)
-	for _, path := range paths {
-		if err := m.sessionConn.Export(handler, path, ifaceName); err != nil {
-			return fmt.Errorf("export handler on %s: %w", path, err)
-		}
-		node := &introspect.Node{
-			Name: string(path),
-			Interfaces: []introspect.Interface{
-				introspect.IntrospectData,
-				iface,
-			},
-		}
-		if err := m.sessionConn.Export(introspect.NewIntrospectable(node), path, "org.freedesktop.DBus.Introspectable"); err != nil {
-			log.Warnf("Failed to export introspectable on %s: %v", path, err)
-		}
-	}
+	log.Info("Screensaver inhibit listener initialized")
 	return nil
 }
 
@@ -299,51 +268,3 @@ func (m *Manager) NotifyScreensaverSubscribers() {
 		return true
 	})
 }
-
-func (h *screensaverHandler) GetActive() (bool, *dbus.Error) {
-	h.manager.stateMutex.RLock()
-	active := h.manager.state.Screensaver.Active
-	h.manager.stateMutex.RUnlock()
-	return active, nil
-}
-
-func (h *screensaverHandler) SetActive(active bool) *dbus.Error {
-	h.manager.SetScreenLockActive(active)
-	return nil
-}
-
-func (h *screensaverHandler) Lock() *dbus.Error {
-	h.manager.SetScreenLockActive(true)
-	return nil
-}
-
-func (m *Manager) SetScreenLockActive(active bool) {
-	m.stateMutex.Lock()
-	changed := m.state.Screensaver.Active != active
-	m.state.Screensaver.Active = active
-	m.stateMutex.Unlock()
-
-	if !changed {
-		return
-	}
-
-	log.Infof("Screen lock active changed: %v", active)
-	defer m.NotifyScreensaverSubscribers()
-
-	if m.sessionConn == nil {
-		return
-	}
-	if m.screensaverFreedesktopClaimed {
-		if err := m.sessionConn.Emit(dbusScreensaverPath, dbusScreensaverInterface+".ActiveChanged", active); err != nil {
-			log.Warnf("Failed to emit ActiveChanged on %s: %v", dbusScreensaverPath, err)
-		}
-		if err := m.sessionConn.Emit(dbusScreensaverPath2, dbusScreensaverInterface+".ActiveChanged", active); err != nil {
-			log.Warnf("Failed to emit ActiveChanged on %s: %v", dbusScreensaverPath2, err)
-		}
-	}
-	if m.screensaverGnomeClaimed {
-		if err := m.sessionConn.Emit(dbusGnomeScreensaverPath, dbusGnomeScreensaverInterface+".ActiveChanged", active); err != nil {
-			log.Warnf("Failed to emit ActiveChanged on %s: %v", dbusGnomeScreensaverPath, err)
-		}
-	}
-}

core/internal/server/freedesktop/screensaver_test.go

@@ -1,102 +0,0 @@
-package freedesktop
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSetScreenLockActive_ChangesState(t *testing.T) {
-	manager := &Manager{
-		state: &FreedeskState{
-			Screensaver: ScreensaverState{Available: true},
-		},
-		stateMutex: sync.RWMutex{},
-	}
-
-	assert.False(t, manager.GetScreensaverState().Active)
-
-	manager.SetScreenLockActive(true)
-	assert.True(t, manager.GetScreensaverState().Active)
-
-	manager.SetScreenLockActive(false)
-	assert.False(t, manager.GetScreensaverState().Active)
-}
-
-func TestSetScreenLockActive_NoChangeNoDuplicate(t *testing.T) {
-	ch := make(chan ScreensaverState, 64)
-	manager := &Manager{
-		state: &FreedeskState{
-			Screensaver: ScreensaverState{Available: true, Active: false},
-		},
-		stateMutex: sync.RWMutex{},
-	}
-	manager.screensaverSubscribers.Store("test", ch)
-	defer manager.screensaverSubscribers.Delete("test")
-
-	// Setting to same value should not notify
-	manager.SetScreenLockActive(false)
-
-	select {
-	case <-ch:
-		t.Fatal("should not have received notification for no-change")
-	case <-time.After(50 * time.Millisecond):
-		// Expected: no notification
-	}
-}
-
-func TestSetScreenLockActive_NotifiesSubscribers(t *testing.T) {
-	ch := make(chan ScreensaverState, 64)
-	manager := &Manager{
-		state: &FreedeskState{
-			Screensaver: ScreensaverState{Available: true, Active: false},
-		},
-		stateMutex: sync.RWMutex{},
-	}
-	manager.screensaverSubscribers.Store("test", ch)
-	defer manager.screensaverSubscribers.Delete("test")
-
-	manager.SetScreenLockActive(true)
-
-	select {
-	case state := <-ch:
-		assert.True(t, state.Active)
-	case <-time.After(time.Second):
-		t.Fatal("timeout waiting for subscriber notification")
-	}
-}
-
-func TestSetScreenLockActive_NilSessionConn(t *testing.T) {
-	manager := &Manager{
-		state: &FreedeskState{
-			Screensaver: ScreensaverState{Available: true},
-		},
-		stateMutex: sync.RWMutex{},
-	}
-
-	assert.NotPanics(t, func() {
-		manager.SetScreenLockActive(true)
-	})
-	assert.True(t, manager.GetScreensaverState().Active)
-}
-
-func TestGetActive_ReturnsCurrentState(t *testing.T) {
-	manager := &Manager{
-		state: &FreedeskState{
-			Screensaver: ScreensaverState{Available: true, Active: true},
-		},
-		stateMutex: sync.RWMutex{},
-	}
-
-	handler := &screensaverHandler{manager: manager}
-	active, dbusErr := handler.GetActive()
-	assert.Nil(t, dbusErr)
-	assert.True(t, active)
-}
-
-func TestScreensaverState_ActiveDefaultsFalse(t *testing.T) {
-	state := ScreensaverState{}
-	assert.False(t, state.Active)
-}

core/internal/server/freedesktop/types.go

@@ -39,7 +39,6 @@ type ScreensaverInhibitor struct {
 
 type ScreensaverState struct {
 	Available  bool                   `json:"available"`
-	Active     bool                   `json:"active"`
 	Inhibited  bool                   `json:"inhibited"`
 	Inhibitors []ScreensaverInhibitor `json:"inhibitors"`
 }
@@ -51,16 +50,14 @@ type FreedeskState struct {
 }
 
 type Manager struct {
-	state                         *FreedeskState
-	stateMutex                    sync.RWMutex
-	systemConn                    *dbus.Conn
-	sessionConn                   *dbus.Conn
-	accountsObj                   dbus.BusObject
-	settingsObj                   dbus.BusObject
-	currentUID                    uint64
-	subscribers                   syncmap.Map[string, chan FreedeskState]
-	screensaverSubscribers        syncmap.Map[string, chan ScreensaverState]
-	screensaverCookieCounter      uint32
-	screensaverFreedesktopClaimed bool
-	screensaverGnomeClaimed       bool
+	state                    *FreedeskState
+	stateMutex               sync.RWMutex
+	systemConn               *dbus.Conn
+	sessionConn              *dbus.Conn
+	accountsObj              dbus.BusObject
+	settingsObj              dbus.BusObject
+	currentUID               uint64
+	subscribers              syncmap.Map[string, chan FreedeskState]
+	screensaverSubscribers   syncmap.Map[string, chan ScreensaverState]
+	screensaverCookieCounter uint32
 }

core/internal/server/server.go

@@ -1516,11 +1516,7 @@ func Start(printDocs bool) error {
 		}
 	}()
 
-	loginctlReady := make(chan struct{})
-	freedesktopReady := make(chan struct{})
-
 	go func() {
-		defer close(loginctlReady)
 		if err := InitializeLoginctlManager(); err != nil {
 			log.Warnf("Loginctl manager unavailable: %v", err)
 		} else {
@@ -1529,7 +1525,6 @@ func Start(printDocs bool) error {
 	}()
 
 	go func() {
-		defer close(freedesktopReady)
 		if err := InitializeFreedeskManager(); err != nil {
 			log.Warnf("Freedesktop manager unavailable: %v", err)
 		} else if freedesktopManager != nil {
@@ -1538,31 +1533,6 @@ func Start(printDocs bool) error {
 		}
 	}()
 
-	// Bridge loginctl lock state to the freedesktop/gnome screensaver
-	// ActiveChanged signal so apps like Bitwarden can detect screen lock.
-	go func() {
-		<-loginctlReady
-		<-freedesktopReady
-
-		if loginctlManager == nil || freedesktopManager == nil {
-			return
-		}
-
-		ch := loginctlManager.Subscribe("dms-lock-bridge")
-		defer loginctlManager.Unsubscribe("dms-lock-bridge")
-
-		initial := loginctlManager.GetState()
-		lastLocked := initial.Locked
-		freedesktopManager.SetScreenLockActive(lastLocked)
-
-		for state := range ch {
-			if state.Locked != lastLocked {
-				lastLocked = state.Locked
-				freedesktopManager.SetScreenLockActive(lastLocked)
-			}
-		}
-	}()
-
 	if err := InitializeWaylandManager(); err != nil {
 		log.Warnf("Wayland manager unavailable: %v", err)
 	}
@@ -1599,13 +1569,6 @@ func Start(printDocs bool) error {
 		log.Warnf("Theme mode manager unavailable: %v", err)
 	} else {
 		notifyCapabilityChange()
-		go func() {
-			<-loginctlReady
-			if loginctlManager == nil {
-				return
-			}
-			themeModeManager.WatchLoginctl(loginctlManager)
-		}()
 	}
 
 	fatalErrChan := make(chan error, 1)

core/internal/server/server_test.go

@@ -162,7 +162,7 @@ func TestCleanupStaleSockets(t *testing.T) {
 	tempDir := t.TempDir()
 	t.Setenv("XDG_RUNTIME_DIR", tempDir)
 
-	staleSocket := filepath.Join(tempDir, "danklinux-4194305.sock")
+	staleSocket := filepath.Join(tempDir, "danklinux-999999.sock")
 	err := os.WriteFile(staleSocket, []byte{}, 0o600)
 	require.NoError(t, err)
 

core/internal/server/thememode/manager.go

@@ -5,7 +5,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
 )
@@ -188,29 +187,6 @@ func (m *Manager) Close() {
 	})
 }
 
-func (m *Manager) WatchLoginctl(lm *loginctl.Manager) {
-	ch := lm.Subscribe("thememode")
-	m.wg.Add(1)
-	go func() {
-		defer m.wg.Done()
-		defer lm.Unsubscribe("thememode")
-		for {
-			select {
-			case <-m.stopChan:
-				return
-			case state, ok := <-ch:
-				if !ok {
-					return
-				}
-				if state.PreparingForSleep {
-					continue
-				}
-				m.TriggerUpdate()
-			}
-		}
-	}()
-}
-
 func (m *Manager) schedulerLoop() {
 	defer m.wg.Done()
 
@@ -351,12 +327,10 @@ func statesEqual(a, b *State) bool {
 }
 
 func (m *Manager) computeSchedule(now time.Time, config Config) (bool, time.Time) {
-	switch config.Mode {
-	case "location":
+	if config.Mode == "location" {
 		return m.computeLocationSchedule(now, config)
-	default:
-		return computeTimeSchedule(now, config)
 	}
+	return computeTimeSchedule(now, config)
 }
 
 func computeTimeSchedule(now time.Time, config Config) (bool, time.Time) {
@@ -407,10 +381,10 @@ func (m *Manager) computeLocationSchedule(now time.Time, config Config) (bool, t
 	}
 
 	times, cond := wayland.CalculateSunTimesWithTwilight(*lat, *lon, now, config.ElevationTwilight, config.ElevationDaylight)
-	switch cond {
-	case wayland.SunMidnightSun:
-		return true, startOfNextDay(now)
-	case wayland.SunPolarNight:
+	if cond != wayland.SunNormal {
+		if cond == wayland.SunMidnightSun {
+			return true, startOfNextDay(now)
+		}
 		return false, startOfNextDay(now)
 	}
 
@@ -423,10 +397,10 @@ func (m *Manager) computeLocationSchedule(now time.Time, config Config) (bool, t
 
 	nextDay := startOfNextDay(now)
 	nextTimes, nextCond := wayland.CalculateSunTimesWithTwilight(*lat, *lon, nextDay, config.ElevationTwilight, config.ElevationDaylight)
-	switch nextCond {
-	case wayland.SunMidnightSun:
-		return true, startOfNextDay(nextDay)
-	case wayland.SunPolarNight:
+	if nextCond != wayland.SunNormal {
+		if nextCond == wayland.SunMidnightSun {
+			return true, startOfNextDay(nextDay)
+		}
 		return false, startOfNextDay(nextDay)
 	}
 
@@ -439,7 +413,13 @@ func startOfNextDay(t time.Time) time.Time {
 }
 
 func validateHourMinute(hour, minute int) bool {
-	return hour >= 0 && hour <= 23 && minute >= 0 && minute <= 59
+	if hour < 0 || hour > 23 {
+		return false
+	}
+	if minute < 0 || minute > 59 {
+		return false
+	}
+	return true
 }
 
 func (m *Manager) ValidateSchedule(startHour, startMinute, endHour, endMinute int) error {

core/internal/tui/views_dependencies.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/distros"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/greeter"
 	tea "github.com/charmbracelet/bubbletea"
 )
 
@@ -81,24 +80,19 @@ func (m Model) viewDependencyReview() string {
 				}
 			}
 
-			note := ""
-			if dep.Name == "dms-greeter" {
-				note = m.styles.Subtle.Render(" (selection replaces your current display manager)")
-			}
-
 			var line string
 			if i == m.selectedDep {
 				line = fmt.Sprintf("▶ %s%s%-25s %s", reinstallMarker, variantMarker, dep.Name, status)
 				if dep.Version != "" {
 					line += fmt.Sprintf(" (%s)", dep.Version)
 				}
-				line = m.styles.SelectedOption.Render(line) + note
+				line = m.styles.SelectedOption.Render(line)
 			} else {
 				line = fmt.Sprintf("  %s%s%-25s %s", reinstallMarker, variantMarker, dep.Name, status)
 				if dep.Version != "" {
 					line += fmt.Sprintf(" (%s)", dep.Version)
 				}
-				line = m.styles.Normal.Render(line) + note
+				line = m.styles.Normal.Render(line)
 			}
 
 			b.WriteString(line)
@@ -121,13 +115,6 @@ func (m Model) updateDetectingDepsState(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.state = StateError
 		} else {
 			m.dependencies = depsMsg.deps
-			// dms-greeter is opt-in skipped by default
-			for _, dep := range depsMsg.deps {
-				if dep.Name == "dms-greeter" {
-					m.disabledItems["dms-greeter"] = true
-					break
-				}
-			}
 			m.state = StateDependencyReview
 		}
 		return m, m.listenForLogs()
@@ -243,41 +230,6 @@ func (m Model) installPackages() tea.Cmd {
 		// Convert installer messages to TUI messages
 		go func() {
 			for msg := range installerProgressChan {
-				// Run optional greeter setup
-				if msg.Phase == distros.PhaseComplete && msg.IsComplete && msg.Error == nil {
-					greeterSelected := false
-					for _, dep := range m.dependencies {
-						if dep.Name == "dms-greeter" && !m.disabledItems["dms-greeter"] {
-							greeterSelected = true
-							break
-						}
-					}
-					if greeterSelected {
-						compositorName := "niri"
-						if m.selectedWM == 1 {
-							compositorName = "Hyprland"
-						}
-						m.packageProgressChan <- packageInstallProgressMsg{
-							progress:  0.92,
-							step:      "Configuring DMS greeter...",
-							logOutput: "Starting automated greeter setup...",
-						}
-						greeterLogFunc := func(line string) {
-							m.packageProgressChan <- packageInstallProgressMsg{
-								progress:  0.94,
-								step:      "Configuring DMS greeter...",
-								logOutput: line,
-							}
-						}
-						if err := greeter.AutoSetupGreeter(compositorName, m.sudoPassword, greeterLogFunc); err != nil {
-							m.packageProgressChan <- packageInstallProgressMsg{
-								progress:  0.96,
-								step:      "Greeter setup warning",
-								logOutput: fmt.Sprintf("⚠ Greeter auto-setup warning (non-fatal): %v", err),
-							}
-						}
-					}
-				}
 				tuiMsg := packageInstallProgressMsg{
 					progress:    msg.Progress,
 					step:        msg.Step,

core/internal/windowrules/providers/niri_parser.go

@@ -864,12 +864,10 @@ func (p *NiriWritableProvider) formatRule(rule windowrules.WindowRule) string {
 
 func formatSizeProperty(name, value string) string {
 	parts := strings.SplitN(value, " ", 2)
-	if len(parts) == 2 {
-		return fmt.Sprintf("    %s { %s %s; }", name, parts[0], parts[1])
+	if len(parts) != 2 {
+		return fmt.Sprintf("    %s { }", name)
 	}
-	// Bare number without type prefix — default to "fixed"
-	if _, err := strconv.Atoi(value); err == nil {
-		return fmt.Sprintf("    %s { fixed %s; }", name, value)
-	}
-	return fmt.Sprintf("    %s { }", name)
+	sizeType := parts[0]
+	sizeValue := parts[1]
+	return fmt.Sprintf("    %s { %s %s; }", name, sizeType, sizeValue)
 }

distro/debian/dms-git/debian/control

@@ -29,7 +29,6 @@ Depends: ${misc:Depends},
          qml6-module-qtquick-templates,
          qml6-module-qtquick-window,
          qt6ct
-Suggests: cups-pk-helper
 Provides: dms
 Conflicts: dms
 Replaces: dms

distro/debian/dms-greeter/_service

@@ -1,9 +0,0 @@
-<services>
-  <!-- Download dms-qml source tarball from GitHub releases (greeter + quickshell content) -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.4.2/dms-qml.tar.gz</param>
-    <param name="filename">dms-qml.tar.gz</param>
-  </service>
-</services>

distro/debian/dms-greeter/debian/changelog

@@ -1,6 +0,0 @@
-dms-greeter (1.4.2db8) unstable; urgency=medium
-
-  * Initial Debian OBS package
-  * Port from Ubuntu/Fedora packaging
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 21 Feb 2026 00:00:00 +0000

distro/debian/dms-greeter/debian/control

@@ -1,23 +0,0 @@
-Source: dms-greeter
-Section: x11
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git
-
-Package: dms-greeter
-Architecture: any
-Depends: ${misc:Depends},
-  greetd,
-  quickshell-git | quickshell
-Recommends: niri | hyprland | sway
-Description: DankMaterialShell greeter for greetd
-  DankMaterialShell greeter for greetd login manager. A modern, Material Design 3
-  inspired greeter interface built with Quickshell for Wayland compositors.
-  .
-  Supports multiple compositors including Niri, Hyprland, and Sway with automatic
-  compositor detection and configuration. Features session selection, user
-  authentication, and dynamic theming.

distro/debian/dms-greeter/debian/copyright

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

distro/debian/dms-greeter/debian/postinst

@@ -1,108 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    configure)
-        # Create greeter user/group if they don't exist
-        if ! getent group greeter >/dev/null; then
-            addgroup --system greeter
-        fi
-
-        if ! getent passwd greeter >/dev/null; then
-            adduser --system --ingroup greeter --home /var/lib/greeter \
-                --shell /bin/bash --gecos "System Greeter" greeter
-        fi
-
-        if [ -d /var/cache/dms-greeter ]; then
-            chown -R greeter:greeter /var/cache/dms-greeter 2>/dev/null || true
-        fi
-
-        if [ -d /var/lib/greeter ]; then
-            chown -R greeter:greeter /var/lib/greeter 2>/dev/null || true
-        fi
-
-        # Check and set graphical.target as default
-        CURRENT_TARGET=$(systemctl get-default 2>/dev/null || echo "unknown")
-        if [ "$CURRENT_TARGET" != "graphical.target" ]; then
-            systemctl set-default graphical.target >/dev/null 2>&1 || true
-            TARGET_STATUS="Set to graphical.target (was: $CURRENT_TARGET) ✓"
-        else
-            TARGET_STATUS="Already graphical.target ✓"
-        fi
-
-        GREETD_CONFIG="/etc/greetd/config.toml"
-        CONFIG_STATUS="Not modified (already configured)"
-
-        # Check if niri or hyprland exists
-        COMPOSITOR="niri"
-        if ! command -v niri >/dev/null 2>&1; then
-            if command -v Hyprland >/dev/null 2>&1; then
-                COMPOSITOR="hyprland"
-            fi
-        fi
-
-        # If config doesn't exist, create a default one
-        if [ ! -f "$GREETD_CONFIG" ]; then
-            mkdir -p /etc/greetd
-            cat > "$GREETD_CONFIG" << 'GREETD_EOF'
-[terminal]
-vt = 1
-
-[default_session]
-user = "greeter"
-command = "/usr/bin/dms-greeter --command COMPOSITOR_PLACEHOLDER"
-GREETD_EOF
-            sed -i "s|COMPOSITOR_PLACEHOLDER|$COMPOSITOR|" "$GREETD_CONFIG"
-            CONFIG_STATUS="Created new config with $COMPOSITOR ✓"
-        elif ! grep -q "dms-greeter" "$GREETD_CONFIG"; then
-            # Backup existing config
-            BACKUP_FILE="${GREETD_CONFIG}.backup-$(date +%Y%m%d-%H%M%S)"
-            cp "$GREETD_CONFIG" "$BACKUP_FILE" 2>/dev/null || true
-
-            # Update command in default_session section
-            sed -i "/^\[default_session\]/,/^\[/ s|^command =.*|command = \"/usr/bin/dms-greeter --command $COMPOSITOR\"|" "$GREETD_CONFIG"
-            sed -i '/^\[default_session\]/,/^\[/ s|^user =.*|user = "greeter"|' "$GREETD_CONFIG"
-            CONFIG_STATUS="Updated existing config (backed up) with $COMPOSITOR ✓"
-        fi
-
-        # Only show banner on initial install
-        if [ -z "$2" ]; then
-            cat << 'EOF'
-
-=========================================================================
-        DMS Greeter Installation Complete!
-=========================================================================
-
-Status:
-EOF
-            echo "    ✓ Greetd config: $CONFIG_STATUS"
-            echo "    ✓ Default target: $TARGET_STATUS"
-            cat << 'EOF'
-    ✓ Greeter user: Created
-    ✓ Greeter directories: /var/cache/dms-greeter, /var/lib/greeter
-
-Next steps:
-
-1. Enable the greeter:
-     dms greeter enable
-     (This will automatically disable conflicting display managers,
-      set graphical.target, and enable greetd)
-
-2. Sync your theme with the greeter (optional):
-     dms greeter sync
-
-3. Check your setup:
-     dms greeter status
-
-Ready to test? Run: sudo systemctl start greetd
-Documentation: https://danklinux.com/docs/dankgreeter/
-=========================================================================
-
-EOF
-        fi
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0

distro/debian/dms-greeter/debian/postrm

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    purge)
-        # Remove greeter cache directory on purge
-        rm -rf /var/cache/dms-greeter 2>/dev/null || true
-
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0

distro/debian/dms-greeter/debian/rules

@@ -1,48 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	: nothing to build, we use prebuilt tarball content
-
-override_dh_auto_install:
-	# Same pattern as dms: upstream from combined tarball (native format)
-	# Build root is either . (we're inside dms-qml) or has dms-qml/ subdir
-	SOURCE_DIR=""; \
-	if [ -d dms-qml ]; then SOURCE_DIR="dms-qml"; \
-	elif [ -f Modules/Greetd/assets/dms-greeter ]; then SOURCE_DIR="."; \
-	fi; \
-	if [ -n "$$SOURCE_DIR" ]; then \
-		mkdir -p debian/dms-greeter/usr/share/quickshell/dms-greeter && \
-		( cd $$SOURCE_DIR && tar cf - --exclude=debian . ) | \
-		( cd debian/dms-greeter/usr/share/quickshell/dms-greeter && tar xf - ) && \
-		install -Dm755 $$SOURCE_DIR/Modules/Greetd/assets/dms-greeter \
-			debian/dms-greeter/usr/bin/dms-greeter && \
-		install -Dm644 $$SOURCE_DIR/Modules/Greetd/README.md \
-			debian/dms-greeter/usr/share/doc/dms-greeter/README.md && \
-		install -Dm644 $$SOURCE_DIR/LICENSE \
-			debian/dms-greeter/usr/share/doc/dms-greeter/LICENSE && \
-		install -Dpm0644 $$SOURCE_DIR/systemd/tmpfiles-dms-greeter.conf \
-			debian/dms-greeter/usr/lib/tmpfiles.d/dms-greeter.conf; \
-	else \
-		echo "ERROR: No upstream source (dms-qml or Modules/Greetd/assets/dms-greeter)!" && \
-		echo "Contents of current directory:" && ls -la && exit 1; \
-	fi
-
-	# Remove build and development files
-	rm -rf debian/dms-greeter/usr/share/quickshell/dms-greeter/core
-	rm -rf debian/dms-greeter/usr/share/quickshell/dms-greeter/distro
-	rm -rf debian/dms-greeter/usr/share/quickshell/dms-greeter/.git*
-	rm -f debian/dms-greeter/usr/share/quickshell/dms-greeter/.gitignore
-	rm -rf debian/dms-greeter/usr/share/quickshell/dms-greeter/.github
-
-override_dh_auto_clean:
-	rm -rf dms-qml
-	# When build root is dms-qml itself, we're inside it - nothing extra to remove
-	dh_auto_clean

distro/debian/dms-greeter/debian/source/format

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

distro/debian/dms-greeter/debian/source/options

@@ -1 +0,0 @@
-# OBS _service downloads dms-qml.tar.gz; no extra excludes needed

distro/debian/dms/debian/control

@@ -28,7 +28,6 @@ Depends: ${misc:Depends},
          qml6-module-qtquick-templates,
          qml6-module-qtquick-window,
          qt6ct
-Suggests: cups-pk-helper
 Conflicts: dms-git
 Replaces: dms-git
 Description: DankMaterialShell - Modern Wayland Desktop Shell

distro/fedora/dms-git.spec

@@ -37,7 +37,6 @@ Recommends:     quickshell-git
 # Recommended system packages
 Recommends:     NetworkManager
 Recommends:     qt6-qtmultimedia
-Suggests:       cups-pk-helper
 Suggests:       qt6ct
 
 %description

distro/fedora/dms.spec

@@ -28,7 +28,6 @@ Recommends:     danksearch
 Recommends:     matugen
 Recommends:     NetworkManager
 Recommends:     qt6-qtmultimedia
-Suggests:       cups-pk-helper
 Suggests:       qt6ct
 
 %description

distro/opensuse/dms-git.spec

@@ -25,7 +25,6 @@ Recommends:     matugen
 Recommends:     quickshell-git
 Recommends:     NetworkManager
 Recommends:     qt6-qtmultimedia
-Suggests:       cups-pk-helper
 Suggests:       qt6ct
 
 Provides:       dms

distro/opensuse/dms-greeter.spec

@@ -1,322 +0,0 @@
-# Spec for DMS Greeter - OpenSUSE/OBS
-
-%global debug_package %{nil}
-%global version VERSION_PLACEHOLDER
-%global pkg_summary DankMaterialShell greeter for greetd
-
-Name:           dms-greeter
-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:       greetd
-Requires:       (quickshell-git or quickshell)
-Requires(post): /usr/sbin/useradd
-Requires(post): /usr/sbin/groupadd
-
-Recommends:     policycoreutils-python-utils
-Recommends:     acl
-Suggests:       niri
-Suggests:       hyprland
-Suggests:       sway
-
-%description
-DankMaterialShell greeter for greetd login manager. A modern, Material Design 3
-inspired greeter interface built with Quickshell for Wayland compositors.
-
-Supports multiple compositors including Niri, Hyprland, and Sway with automatic
-compositor detection and configuration. Features session selection, user
-authentication, and dynamic theming.
-
-%prep
-%setup -q -c -n dms-qml
-
-%build
-
-%install
-# Install greeter files to shared data location
-install -dm755 %{buildroot}%{_datadir}/quickshell/dms-greeter
-cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms-greeter/
-
-install -Dm755 %{_builddir}/dms-qml/Modules/Greetd/assets/dms-greeter %{buildroot}%{_bindir}/dms-greeter
-
-install -Dm644 %{_builddir}/dms-qml/Modules/Greetd/README.md %{buildroot}%{_docdir}/dms-greeter/README.md
-
-install -Dpm0644 %{_builddir}/dms-qml/systemd/tmpfiles-dms-greeter.conf %{buildroot}%{_tmpfilesdir}/dms-greeter.conf
-
-install -Dm644 %{_builddir}/dms-qml/LICENSE %{buildroot}%{_docdir}/dms-greeter/LICENSE
-
-install -dm755 %{buildroot}%{_sharedstatedir}/greeter
-
-# Remove build and development files
-rm -rf %{buildroot}%{_datadir}/quickshell/dms-greeter/.git*
-rm -f %{buildroot}%{_datadir}/quickshell/dms-greeter/.gitignore
-rm -rf %{buildroot}%{_datadir}/quickshell/dms-greeter/.github
-rm -rf %{buildroot}%{_datadir}/quickshell/dms-greeter/distro
-
-%posttrans
-if [ -d "%{_sysconfdir}/xdg/quickshell/dms-greeter" ]; then
-    rmdir "%{_sysconfdir}/xdg/quickshell/dms-greeter" 2>/dev/null || true
-    rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
-    rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
-fi
-
-%files
-%dir %{_docdir}/dms-greeter
-%license %{_docdir}/dms-greeter/LICENSE
-%doc %{_docdir}/dms-greeter/README.md
-%{_bindir}/dms-greeter
-%dir %{_datadir}/quickshell
-%{_datadir}/quickshell/dms-greeter/
-%{_tmpfilesdir}/%{name}.conf
-
-%pre
-# Create greeter user/group if they don't exist
-getent group greeter >/dev/null || groupadd -r greeter
-getent passwd greeter >/dev/null || \
-    useradd -r -g greeter -d %{_sharedstatedir}/greeter -s /bin/bash \
-    -c "System Greeter" greeter
-exit 0
-
-%post
-# SELinux contexts (no-op on OpenSUSE - semanage/restorecon not present)
-if [ -x /usr/sbin/semanage ] && [ -x /usr/sbin/restorecon ]; then
-    semanage fcontext -a -t bin_t '%{_bindir}/dms-greeter' >/dev/null 2>&1 || true
-    restorecon %{_bindir}/dms-greeter >/dev/null 2>&1 || true
-    semanage fcontext -a -t user_home_dir_t '%{_sharedstatedir}/greeter(/.*)?' >/dev/null 2>&1 || true
-    restorecon -R %{_sharedstatedir}/greeter >/dev/null 2>&1 || true
-    semanage fcontext -a -t cache_home_t '%{_localstatedir}/cache/dms-greeter(/.*)?' >/dev/null 2>&1 || true
-    restorecon -R %{_localstatedir}/cache/dms-greeter >/dev/null 2>&1 || true
-    semanage fcontext -a -t usr_t '%{_datadir}/quickshell/dms-greeter(/.*)?' >/dev/null 2>&1 || true
-    restorecon -R %{_datadir}/quickshell/dms-greeter >/dev/null 2>&1 || true
-    restorecon %{_sysconfdir}/pam.d/greetd >/dev/null 2>&1 || true
-fi
-
-# Resolve greeter runtime account/group for distro differences
-GREETER_USER="greeter"
-for candidate in greeter greetd _greeter; do
-    if getent passwd "$candidate" >/dev/null 2>&1; then
-        GREETER_USER="$candidate"
-        break
-    fi
-done
-
-GREETER_GROUP="$GREETER_USER"
-if ! getent group "$GREETER_GROUP" >/dev/null 2>&1; then
-    for candidate in greeter greetd _greeter; do
-        if getent group "$candidate" >/dev/null 2>&1; then
-            GREETER_GROUP="$candidate"
-            break
-        fi
-    done
-fi
-
-# Ensure proper ownership of greeter directories
-chown -R "$GREETER_USER:$GREETER_GROUP" %{_localstatedir}/cache/dms-greeter 2>/dev/null || true
-chown -R "$GREETER_USER:$GREETER_GROUP" %{_sharedstatedir}/greeter 2>/dev/null || true
-
-# Verify PAM configuration
-PAM_CONFIG="/etc/pam.d/greetd"
-write_greetd_pam_config() {
-    # openSUSE and Debian families usually expose PAM stacks as common-*
-    if [ -f /etc/pam.d/common-auth ] && [ -f /etc/pam.d/common-account ] && [ -f /etc/pam.d/common-password ] && [ -f /etc/pam.d/common-session ]; then
-        cat > "$PAM_CONFIG" << 'PAM_EOF'
-#%PAM-1.0
-auth       include     common-auth
-account    required    pam_nologin.so
-account    include     common-account
-password   include     common-password
-session    required    pam_loginuid.so
-session    optional    pam_keyinit.so force revoke
-session    include     common-session
-PAM_EOF
-        return
-    fi
-
-    # Fedora/RHEL style system-auth/postlogin stack
-    if [ -f /etc/pam.d/system-auth ]; then
-        if [ -f /etc/pam.d/postlogin ]; then
-            cat > "$PAM_CONFIG" << 'PAM_EOF'
-#%PAM-1.0
-auth       substack    system-auth
-auth       include     postlogin
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_keyinit.so force revoke
-session    include     system-auth
-session    include     postlogin
-PAM_EOF
-        else
-            cat > "$PAM_CONFIG" << 'PAM_EOF'
-#%PAM-1.0
-auth       include     system-auth
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_keyinit.so force revoke
-session    include     system-auth
-PAM_EOF
-        fi
-        return
-    fi
-
-    # Last-resort conservative fallback
-    cat > "$PAM_CONFIG" << 'PAM_EOF'
-#%PAM-1.0
-auth       required    pam_unix.so nullok
-account    required    pam_unix.so
-password   required    pam_unix.so nullok sha512
-session    required    pam_unix.so
-PAM_EOF
-}
-
-if [ ! -f "$PAM_CONFIG" ]; then
-    write_greetd_pam_config
-    chmod 644 "$PAM_CONFIG"
-    [ "$1" -eq 1 ] && echo "Created PAM configuration for greetd"
-else
-    NEEDS_PAM_UPDATE=0
-    if grep -q "common-auth" "$PAM_CONFIG"; then
-        if [ ! -f /etc/pam.d/common-auth ]; then
-            NEEDS_PAM_UPDATE=1
-        fi
-    elif grep -q "system-auth" "$PAM_CONFIG"; then
-        if [ ! -f /etc/pam.d/system-auth ]; then
-            NEEDS_PAM_UPDATE=1
-        fi
-    else
-        NEEDS_PAM_UPDATE=1
-    fi
-
-    if [ "$NEEDS_PAM_UPDATE" -eq 1 ]; then
-        cp "$PAM_CONFIG" "$PAM_CONFIG.backup-dms-greeter"
-        write_greetd_pam_config
-        chmod 644 "$PAM_CONFIG"
-        [ "$1" -eq 1 ] && echo "Updated PAM configuration (old config backed up to $PAM_CONFIG.backup-dms-greeter)"
-    fi
-fi
-
-# Auto-configure greetd config
-GREETD_CONFIG="/etc/greetd/config.toml"
-CONFIG_STATUS="Not modified (already configured)"
-
-COMPOSITOR=""
-for candidate in niri Hyprland sway; do
-    if command -v "$candidate" >/dev/null 2>&1; then
-        case "$candidate" in
-            Hyprland)
-                COMPOSITOR="hyprland"
-                ;;
-            *)
-                COMPOSITOR="$candidate"
-                ;;
-        esac
-        break
-    fi
-done
-
-if [ ! -f "$GREETD_CONFIG" ]; then
-    mkdir -p /etc/greetd
-    if [ -n "$COMPOSITOR" ]; then
-        cat > "$GREETD_CONFIG" << 'GREETD_EOF'
-[terminal]
-vt = 1
-
-[default_session]
-user = "GREETER_USER_PLACEHOLDER"
-command = "/usr/bin/dms-greeter --command COMPOSITOR_PLACEHOLDER"
-GREETD_EOF
-        sed -i "s|GREETER_USER_PLACEHOLDER|$GREETER_USER|" "$GREETD_CONFIG"
-        sed -i "s|COMPOSITOR_PLACEHOLDER|$COMPOSITOR|" "$GREETD_CONFIG"
-        CONFIG_STATUS="Created new config with $COMPOSITOR ✓"
-    else
-        cat > "$GREETD_CONFIG" << 'GREETD_EOF'
-[terminal]
-vt = 1
-
-[default_session]
-user = "GREETER_USER_PLACEHOLDER"
-command = "agreety --cmd /bin/login"
-GREETD_EOF
-        sed -i "s|GREETER_USER_PLACEHOLDER|$GREETER_USER|" "$GREETD_CONFIG"
-        CONFIG_STATUS="Created safe fallback config (no supported compositor detected)"
-    fi
-elif ! grep -q "dms-greeter" "$GREETD_CONFIG"; then
-    if [ -n "$COMPOSITOR" ]; then
-        BACKUP_FILE="${GREETD_CONFIG}.backup-$(date +%%Y%%m%%d-%%H%%M%%S)"
-        cp "$GREETD_CONFIG" "$BACKUP_FILE" 2>/dev/null || true
-        sed -i "/^\[default_session\]/,/^\[/ s|^command =.*|command = \"/usr/bin/dms-greeter --command $COMPOSITOR\"|" "$GREETD_CONFIG"
-        sed -i "/^\[default_session\]/,/^\[/ s|^user =.*|user = \"$GREETER_USER\"|" "$GREETD_CONFIG"
-        CONFIG_STATUS="Updated existing config (backed up) with $COMPOSITOR ✓"
-    else
-        CONFIG_STATUS="Skipped dms-greeter command update (no supported compositor detected)"
-    fi
-fi
-
-# Set graphical.target as default
-CURRENT_TARGET=$(systemctl get-default 2>/dev/null || echo "unknown")
-if [ "$CURRENT_TARGET" != "graphical.target" ]; then
-    systemctl set-default graphical.target >/dev/null 2>&1 || true
-    TARGET_STATUS="Set to graphical.target (was: $CURRENT_TARGET) ✓"
-else
-    TARGET_STATUS="Already graphical.target ✓"
-fi
-
-if [ "$1" -eq 1 ]; then
-cat << 'EOF'
-
-=========================================================================
-        DMS Greeter Installation Complete!
-=========================================================================
-
-Status:
-EOF
-echo "    ✓ Greetd config: $CONFIG_STATUS"
-echo "    ✓ Default target: $TARGET_STATUS"
-cat << 'EOF'
-    ✓ Greeter user: Created
-    ✓ Greeter directories: /var/cache/dms-greeter, /var/lib/greeter
-    ✓ SELinux contexts: Applied (if applicable)
-
-Next steps:
-
-1. Enable the greeter:
-     dms greeter enable
-
-2. Sync your theme with the greeter (optional):
-     dms greeter sync
-
-3. Check your setup:
-     dms greeter status
-
-Ready to test? Run: sudo systemctl start greetd
-Documentation: https://danklinux.com/docs/dankgreeter/
-=========================================================================
-
-EOF
-fi
-
-%postun
-if [ "$1" -eq 0 ] && [ -x /usr/sbin/semanage ]; then
-    semanage fcontext -d '%{_bindir}/dms-greeter' 2>/dev/null || true
-    semanage fcontext -d '%{_sharedstatedir}/greeter(/.*)?' 2>/dev/null || true
-    semanage fcontext -d '%{_localstatedir}/cache/dms-greeter(/.*)?' 2>/dev/null || true
-    semanage fcontext -d '%{_datadir}/quickshell/dms-greeter(/.*)?' 2>/dev/null || true
-fi
-
-%changelog
-* CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-RELEASE_PLACEHOLDER
-- Stable release VERSION_PLACEHOLDER
-- Initial OpenSUSE/OBS port from Fedora

distro/opensuse/dms.spec

@@ -27,7 +27,6 @@ Recommends:     danksearch
 Recommends:     matugen
 Recommends:     NetworkManager
 Recommends:     qt6-qtmultimedia
-Suggests:       cups-pk-helper
 Suggests:       qt6ct
 
 %description

distro/scripts/obs-status.sh

@@ -11,7 +11,7 @@
 OBS_BASE_PROJECT="home:AvengeMedia"
 OBS_BASE="$HOME/.cache/osc-checkouts"
 
-ALL_PACKAGES=(dms dms-git dms-greeter)
+ALL_PACKAGES=(dms dms-git)
 
 REPOS=("Debian_13" "openSUSE_Tumbleweed" "16.0")
 ARCHES=("x86_64" "aarch64")
@@ -41,9 +41,6 @@ for pkg in "${PACKAGES[@]}"; do
     dms-git)
         PROJECT="$OBS_BASE_PROJECT:dms-git"
         ;;
-    dms-greeter)
-        PROJECT="$OBS_BASE_PROJECT:danklinux"
-        ;;
     *)
         echo "Error: Unknown package '$pkg'"
         continue
@@ -77,15 +74,11 @@ for pkg in "${PACKAGES[@]}"; do
                         COLOR="\033[0;32m" # Green
                         SYMBOL="✅"
                         ;;
-                    failed|broken|broken*)
+                    failed)
                         COLOR="\033[0;31m" # Red
                         SYMBOL="❌"
                         FAILED_BUILDS+=("$repo $arch")
                         ;;
-                    blocked)
-                        COLOR="\033[0;33m" # Yellow
-                        SYMBOL="⏸️"
-                        ;;
                     unresolvable)
                         COLOR="\033[0;33m" # Yellow
                         SYMBOL="⚠️"

distro/scripts/obs-upload.sh

@@ -68,14 +68,13 @@ fi
 
 OBS_BASE_PROJECT="home:AvengeMedia"
 OBS_BASE="$HOME/.cache/osc-checkouts"
-AVAILABLE_PACKAGES=(dms dms-git dms-greeter)
+AVAILABLE_PACKAGES=(dms dms-git)
 
 if [[ -z "$PACKAGE" ]]; then
     echo "Available packages:"
     echo ""
     echo "  1. dms         - Stable DMS"
     echo "  2. dms-git     - Nightly DMS"
-    echo "  3. dms-greeter - DMS greeter for greetd"
     echo "  a. all"
     echo ""
     read -r -p "Select package (1-${#AVAILABLE_PACKAGES[@]}, a): " selection
@@ -142,12 +141,7 @@ check_obs_version_exists() {
             return 0
         fi
     else
-        # Empty/invalid response: expected on first upload (no spec on server yet), or actual API failure
-        if [[ -z "$OBS_SPEC" ]]; then
-            echo "  No existing spec on OBS (first upload?) - proceeding"
-        else
-            echo "⚠️  Could not fetch OBS spec (API may be unavailable), proceeding anyway"
-        fi
+        echo "⚠️  Could not fetch OBS spec (API may be unavailable), proceeding anyway"
         return 1
     fi
     return 1
@@ -174,22 +168,6 @@ update_debian_dms_service() {
     sed -i "s|/releases/download/v[0-9][^\"]*/dms-distropkg-arm64\.gz|/releases/download/v${base_version}/dms-distropkg-arm64.gz|" "$service_path"
 }
 
-update_debian_dms_greeter_service() {
-    local service_path="$1"
-    if [[ -z "$service_path" || ! -f "$service_path" ]]; then
-        return 0
-    fi
-    if [[ -z "$CHANGELOG_VERSION" ]]; then
-        return 0
-    fi
-    local base_version
-    base_version=$(echo "$CHANGELOG_VERSION" | sed -E 's/^([0-9]+(\.[0-9]+)*).*/\1/')
-    if [[ -z "$base_version" ]]; then
-        return 0
-    fi
-    sed -i "s|/releases/download/v[0-9][^\"]*/dms-qml\.tar\.gz|/releases/download/v${base_version}/dms-qml.tar.gz|" "$service_path"
-}
-
 update_opensuse_git_spec() {
     local spec_path="$1"
     if [[ -z "$spec_path" || ! -f "$spec_path" ]]; then
@@ -270,9 +248,6 @@ dms)
 dms-git)
     PROJECT="dms-git"
     ;;
-dms-greeter)
-    PROJECT="danklinux"
-    ;;
 *)
     echo "Error: Unknown package '$PACKAGE'"
     exit 1
@@ -354,11 +329,9 @@ if [[ -d "distro/debian/$PACKAGE/debian" ]]; then
         echo "  - Applied rebuild suffix: $CHANGELOG_VERSION"
     fi
 
-    # Keep Debian _service in sync with changelog version
+    # Keep Debian dms _service in sync with changelog version
     if [[ "$PACKAGE" == "dms" ]] && [[ -f "distro/debian/$PACKAGE/_service" ]]; then
         update_debian_dms_service "distro/debian/$PACKAGE/_service"
-    elif [[ "$PACKAGE" == "dms-greeter" ]] && [[ -f "distro/debian/$PACKAGE/_service" ]]; then
-        update_debian_dms_greeter_service "distro/debian/$PACKAGE/_service"
     fi
 
     # Check if this version already exists in OBS
@@ -368,12 +341,6 @@ if [[ -d "distro/debian/$PACKAGE/debian" ]]; then
                 if [[ "$PACKAGE" == *"-git" ]]; then
                     echo "==> Error: This commit is already uploaded to OBS"
                     echo "    The same git commit ($(echo "$CHANGELOG_VERSION" | grep -oP '[a-f0-9]{8}' | tail -1)) already exists on OBS."
-                    if [[ -n "${GITHUB_ACTIONS:-}" ]] || [[ -n "${CI:-}" ]]; then
-                        echo "    CI run detected: skipping upload as a no-op (already up to date)."
-                        echo "    If you need to force rebuild this same commit, set REBUILD_RELEASE (e.g. 2, 3, ...)."
-                        echo "✓ Exiting gracefully (no changes needed)"
-                        exit 0
-                    fi
                     echo "    To rebuild the same commit, specify a rebuild number:"
                     echo "      ./distro/scripts/obs-upload.sh $PACKAGE 2"
                     echo "      ./distro/scripts/obs-upload.sh $PACKAGE 3"
@@ -412,13 +379,6 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]];
 
     if [[ "$PACKAGE" == *"-git" ]] && [[ -n "$CHANGELOG_VERSION" ]]; then
         update_opensuse_git_spec "$WORK_DIR/$PACKAGE.spec"
-    elif [[ "$PACKAGE" == "dms-greeter" ]] && [[ -n "$CHANGELOG_VERSION" ]]; then
-        DMS_GREETER_BASE_VERSION=$(echo "$CHANGELOG_VERSION" | sed -E 's/^([0-9]+(\.[0-9]+)*).*/\1/')
-        DMS_GREETER_RELEASE=$(echo "$CHANGELOG_VERSION" | sed -E 's/.*db([0-9]+)$/\1/' || echo "1")
-        CHANGELOG_DATE=$(date '+%a %b %d %Y')
-        sed -i "s/VERSION_PLACEHOLDER/${DMS_GREETER_BASE_VERSION}/g" "$WORK_DIR/$PACKAGE.spec"
-        sed -i "s/RELEASE_PLACEHOLDER/${DMS_GREETER_RELEASE}/g" "$WORK_DIR/$PACKAGE.spec"
-        sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" "$WORK_DIR/$PACKAGE.spec"
     fi
 
     if [[ -f "$WORK_DIR/.osc/$PACKAGE.spec" ]]; then
@@ -484,24 +444,6 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ "$UPLOAD_DEBIAN" == false ]] && [[ -f
         fi
     fi
 
-    # For dms-greeter: download dms-qml.tar.gz from _service URL
-    if [[ -z "${SOURCE_DIR:-}" ]] && [[ "$PACKAGE" == "dms-greeter" ]] && [[ -f "distro/debian/$PACKAGE/_service" ]]; then
-        DMS_GREETER_URL=$(grep -A 5 'name="download_url"' "distro/debian/$PACKAGE/_service" | grep "path" | sed 's/.*<param name="path">\(.*\)<\/param>.*/\1/' | head -1)
-        if [[ -n "$DMS_GREETER_URL" ]]; then
-            DMS_GREETER_FULL_URL="https://github.com${DMS_GREETER_URL}"
-            echo "    Downloading dms-greeter source from: $DMS_GREETER_FULL_URL"
-            if wget -q -O "$TEMP_DIR/dms-qml.tar.gz" "$DMS_GREETER_FULL_URL" 2>/dev/null || \
-                curl -L -f -s -o "$TEMP_DIR/dms-qml.tar.gz" "$DMS_GREETER_FULL_URL" 2>/dev/null; then
-                cd "$TEMP_DIR"
-                tar -xzf dms-qml.tar.gz
-                if [[ -f "Modules/Greetd/assets/dms-greeter" ]]; then
-                    SOURCE_DIR="$TEMP_DIR"
-                fi
-                cd "$REPO_ROOT"
-            fi
-        fi
-    fi
-
     if [[ -n "$SOURCE_DIR" && -d "$SOURCE_DIR" ]]; then
         SOURCE0=$(grep "^Source0:" "distro/opensuse/$PACKAGE.spec" | awk '{print $2}' | head -1)
 
@@ -510,15 +452,6 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ "$UPLOAD_DEBIAN" == false ]] && [[ -f
             cd "$OBS_TARBALL_DIR"
 
             case "$PACKAGE" in
-            dms-greeter)
-                EXPECTED_DIR="dms-qml"
-                echo "    Creating $SOURCE0 (directory: $EXPECTED_DIR)"
-                mkdir -p "$EXPECTED_DIR"
-                cp -a "$SOURCE_DIR"/. "$EXPECTED_DIR/"
-                tar -czf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                rm -rf "$EXPECTED_DIR"
-                echo "    Created $SOURCE0 ($(stat -c%s "$WORK_DIR/$SOURCE0" 2>/dev/null || echo 0) bytes)"
-                ;;
             dms)
                 DMS_VERSION=$(grep "^Version:" "$REPO_ROOT/distro/opensuse/$PACKAGE.spec" | sed 's/^Version:[[:space:]]*//' | head -1)
                 EXPECTED_DIR="DankMaterialShell-${DMS_VERSION}"
@@ -651,17 +584,6 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ -d "distro/debian/$PACKAGE/debian" ]]; t
                         if [[ -z "$SOURCE_DIR" ]]; then
                             SOURCE_DIR=$(find . -maxdepth 1 -type d ! -name "." | head -1)
                         fi
-                        # dms-qml.tar.gz extracts flat (quickshell contents, no top-level dir)
-                        # Create dms-qml wrapper so combined tarball has correct top-level dir (like dms)
-                        if [[ "$PACKAGE" == "dms-greeter" ]] && [[ -f "Modules/Greetd/assets/dms-greeter" ]]; then
-                            mkdir -p dms-qml
-                            for f in *; do
-                                if [[ -e "$f" && "$f" != "dms-qml" && "$f" != "source-archive" ]]; then
-                                    mv "$f" dms-qml/ 2>/dev/null || true
-                                fi
-                            done
-                            SOURCE_DIR="dms-qml"
-                        fi
                         if [[ -z "$SOURCE_DIR" || ! -d "$SOURCE_DIR" ]]; then
                             echo "Error: Failed to extract source archive or find source directory"
                             echo "Contents of $TEMP_DIR:"
@@ -738,21 +660,6 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ -d "distro/debian/$PACKAGE/debian" ]]; t
                 cd "$OBS_TARBALL_DIR"
 
                 case "$PACKAGE" in
-                dms-greeter)
-                    EXPECTED_DIR="dms-qml"
-                    echo "    Creating $SOURCE0 (directory: $EXPECTED_DIR)"
-                    mkdir -p "$EXPECTED_DIR"
-                    cp -a "$SOURCE_DIR"/. "$EXPECTED_DIR/"
-                    if [[ "$SOURCE0" == *.tar.xz ]]; then
-                        tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -cJf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                    elif [[ "$SOURCE0" == *.tar.bz2 ]]; then
-                        tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -cjf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                    else
-                        tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                    fi
-                    rm -rf "$EXPECTED_DIR"
-                    echo "    Created $SOURCE0 ($(stat -c%s "$WORK_DIR/$SOURCE0" 2>/dev/null || echo 0) bytes)"
-                    ;;
                 dms)
                     DMS_VERSION=$(grep "^Version:" "$REPO_ROOT/distro/opensuse/$PACKAGE.spec" | sed 's/^Version:[[:space:]]*//' | head -1)
                     EXPECTED_DIR="DankMaterialShell-${DMS_VERSION}"
@@ -802,17 +709,10 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ -d "distro/debian/$PACKAGE/debian" ]]; t
                 echo "  - OpenSUSE source tarballs created"
             fi
 
-            # Copy and update OpenSUSE spec file with the correct version
+            # Copy and update OpenSUSE spec file with the correct version (for -git packages)
             cp "distro/opensuse/$PACKAGE.spec" "$WORK_DIR/"
             if [[ "$PACKAGE" == *"-git" ]] && [[ -n "$CHANGELOG_VERSION" ]]; then
                 update_opensuse_git_spec "$WORK_DIR/$PACKAGE.spec"
-            elif [[ "$PACKAGE" == "dms-greeter" ]] && [[ -n "$CHANGELOG_VERSION" ]]; then
-                DMS_GREETER_BASE_VERSION=$(echo "$CHANGELOG_VERSION" | sed -E 's/^([0-9]+(\.[0-9]+)*).*/\1/')
-                DMS_GREETER_RELEASE=$(echo "$CHANGELOG_VERSION" | sed -E 's/.*db([0-9]+)$/\1/' || echo "1")
-                CHANGELOG_DATE=$(date '+%a %b %d %Y')
-                sed -i "s/VERSION_PLACEHOLDER/${DMS_GREETER_BASE_VERSION}/g" "$WORK_DIR/$PACKAGE.spec"
-                sed -i "s/RELEASE_PLACEHOLDER/${DMS_GREETER_RELEASE}/g" "$WORK_DIR/$PACKAGE.spec"
-                sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" "$WORK_DIR/$PACKAGE.spec"
             fi
         fi
 
@@ -939,48 +839,8 @@ EOF
             echo "  - Quilt format detected: creating debian.tar.gz"
             tar -czf "$WORK_DIR/debian.tar.gz" -C "distro/debian/$PACKAGE" debian/
 
-            # For dms-greeter: create orig tarball so Debian build gets upstream (OBS only passes .dsc Files to Debian)
-            DSC_FILES_DEBIAN=""
-            if [[ "$PACKAGE" == "dms-greeter" ]]; then
-                UPSTREAM_VER=$(echo "$VERSION" | sed 's/-[^-]*$//')
-                ORIG_TARBALL="${PACKAGE}_${UPSTREAM_VER}.orig.tar.gz"
-                ORIG_DIR="${PACKAGE}-${UPSTREAM_VER}"
-
-                if [[ -f "distro/debian/$PACKAGE/_service" ]] && grep -q "download_url" "distro/debian/$PACKAGE/_service"; then
-                    DG_TEMP=$(mktemp -d)
-                    DMS_GREETER_PATH=$(grep -A 5 'name="download_url"' "distro/debian/$PACKAGE/_service" | grep "path" | sed 's/.*<param name="path">\(.*\)<\/param>.*/\1/' | head -1)
-                    if [[ -n "$DMS_GREETER_PATH" ]]; then
-                        DG_URL="https://github.com${DMS_GREETER_PATH}"
-                        echo "  - Downloading dms-greeter source for orig tarball: $DG_URL"
-                        if wget -q -O "$DG_TEMP/dms-qml.tar.gz" "$DG_URL" 2>/dev/null || curl -L -f -s -o "$DG_TEMP/dms-qml.tar.gz" "$DG_URL" 2>/dev/null; then
-                            ( cd "$DG_TEMP" && tar --no-same-owner -xzf dms-qml.tar.gz && mkdir -p "$ORIG_DIR" && \
-                              for f in *; do [[ "$f" != "dms-qml.tar.gz" && "$f" != "$ORIG_DIR" ]] && mv "$f" "$ORIG_DIR/"; done )
-                            if [[ -d "$DG_TEMP/$ORIG_DIR/Modules" ]] || [[ -f "$DG_TEMP/$ORIG_DIR/LICENSE" ]]; then
-                                tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$ORIG_TARBALL" -C "$DG_TEMP" "$ORIG_DIR"
-                                ORIG_MD5=$(md5sum "$WORK_DIR/$ORIG_TARBALL" | cut -d' ' -f1)
-                                ORIG_SIZE=$(stat -c%s "$WORK_DIR/$ORIG_TARBALL" 2>/dev/null || stat -f%z "$WORK_DIR/$ORIG_TARBALL" 2>/dev/null)
-                                DSC_FILES_DEBIAN=" $ORIG_MD5 $ORIG_SIZE $ORIG_TARBALL
-"
-                                echo "  - Created $ORIG_TARBALL for Debian orig"
-                            fi
-                            rm -rf "$DG_TEMP"
-                        fi
-                    fi
-                fi
-            fi
-
-            DEBIAN_MD5=$(md5sum "$WORK_DIR/debian.tar.gz" | cut -d' ' -f1)
-            DEBIAN_SIZE=$(stat -c%s "$WORK_DIR/debian.tar.gz" 2>/dev/null || stat -f%z "$WORK_DIR/debian.tar.gz" 2>/dev/null)
-
             echo "  - Generating $PACKAGE.dsc for quilt format"
-            # debtransform: DEBTRANSFORM-TAR = orig (upstream), DEBTRANSFORM-FILES-TAR = debian archive
-            DEBTRANSFORM_EXTRA=""
-            if [[ -n "$DSC_FILES_DEBIAN" ]] && [[ -n "$ORIG_TARBALL" ]]; then
-                DEBTRANSFORM_EXTRA="DEBTRANSFORM-TAR: $ORIG_TARBALL
-DEBTRANSFORM-FILES-TAR: debian.tar.gz
-"
-            fi
-            cat >"$WORK_DIR/$PACKAGE.dsc" <<DSCEOF
+            cat >"$WORK_DIR/$PACKAGE.dsc" <<EOF
 Format: 3.0 (quilt)
 Source: $PACKAGE
 Binary: $PACKAGE
@@ -988,9 +848,10 @@ Architecture: any
 Version: $VERSION
 Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
 Build-Depends: debhelper-compat (= 13), wget, gzip
-${DEBTRANSFORM_EXTRA}Files:${DSC_FILES_DEBIAN}
- $DEBIAN_MD5 $DEBIAN_SIZE debian.tar.gz
-DSCEOF
+DEBTRANSFORM-TAR: debian.tar.gz
+Files:
+ 00000000000000000000000000000000 1 debian.tar.gz
+EOF
         fi
     fi
 fi
@@ -1021,13 +882,6 @@ if [[ -n "$OBS_FILES" ]]; then
             continue
         fi
 
-        # Keep current orig tarball for dms-greeter (Debian 3.0 quilt needs it)
-        UPSTREAM_VER_CLEAN=$(echo "$CHANGELOG_VERSION" | sed 's/-[^-]*$//' 2>/dev/null)
-        if [[ "$PACKAGE" == "dms-greeter" ]] && [[ "$old_file" == "${PACKAGE}_${UPSTREAM_VER_CLEAN}.orig.tar.gz" ]]; then
-            echo "  - Keeping orig tarball: $old_file"
-            continue
-        fi
-
         if [[ "$old_file" == "${PACKAGE}-source.tar.gz" ]]; then
             echo "  - Keeping source tarball: $old_file"
             continue

distro/ubuntu/dms-git/debian/rules

@@ -28,17 +28,8 @@ override_dh_auto_build:
 	# Launchpad build environment has no internet access
 	test -d dms-git-repo || (echo "ERROR: dms-git-repo directory not found!" && exit 1)
 
-	# Patch go.mod for Launchpad: align go directive w/latest Go toolchain
-	GO_VERSION=$$(go env GOVERSION | sed -E 's/^go([0-9]+\.[0-9]+).*/\1/'); \
-	if [ -n "$$GO_VERSION" ]; then \
-		sed -E -i "s/^go 1\.[0-9]+(\.[0-9]+)?/go $$GO_VERSION/" dms-git-repo/core/go.mod; \
-		if [ -f dms-git-repo/core/vendor/modules.txt ]; then \
-			sed -E -i "s/^(## explicit; go )1\.[0-9]+(\.[0-9]+)?$$/\1$$GO_VERSION/" dms-git-repo/core/vendor/modules.txt; \
-		fi; \
-	else \
-		echo "Warning: Could not detect Go version, leaving go.mod go directive unchanged"; \
-	fi
-	sed -E -i '/^toolchain go[0-9.]+$$/d' dms-git-repo/core/go.mod
+	# Patch go.mod to use Go 1.24 base version (Ubuntu has 1.24.4, project requires 1.24.6)
+	sed -i 's/^go 1\.24\.[0-9]*/go 1.24/' dms-git-repo/core/go.mod
 
 	# Build dms-cli from source
 	# Detect architecture

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "lastModified": 1769018530,
+        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
         "type": "github"
       },
       "original": {

flake.nix

@@ -80,7 +80,7 @@
               inherit version;
               pname = "dms-shell";
               src = ./core;
-              vendorHash = "sha256-dEk7IOd6aQwaxZruxQclN7TGMyb8EJOl6NBWRsoZ9HQ=";
+              vendorHash = "sha256-cVUJXgzYMRSM0od1xzDVkMTdxHu3OIQX2bQ8AJbGQ1Q=";
 
               subPackages = [ "cmd/dms" ];
 
@@ -181,7 +181,7 @@
             buildInputs =
               with pkgs;
               [
-                go_1_25
+                go_1_24
                 gopls
                 delve
                 go-tools
@@ -189,7 +189,6 @@
 
                 prek
                 uv # for prek
-                shellcheck
 
                 # Nix development tools
                 nixd

quickshell/CODENAME

@@ -1 +1 @@
-Saffron Bloom
+The Wolverine

quickshell/Common/Paths.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtCore
-import qs.Services
 
 Singleton {
     id: root
@@ -84,12 +83,7 @@ Singleton {
         if (desktopEntry && desktopEntry.icon) {
             return Quickshell.iconPath(desktopEntry.icon, true);
         }
-
-        const icon = Quickshell.iconPath(appId, true);
-        if (icon && icon !== "")
-            return icon;
-
-        return DesktopService.resolveIconPath(appId);
+        return Quickshell.iconPath(appId, true);
     }
 
     function getAppName(appId: string, desktopEntry: var): string {

quickshell/Common/PopoutManager.qml

@@ -142,8 +142,6 @@ Singleton {
             if (tabIndex !== undefined && popout.currentTabIndex !== undefined) {
                 popout.currentTabIndex = tabIndex;
             }
-            if (popout.updateSurfacePosition)
-                popout.updateSurfacePosition();
             currentPopoutTriggers[screenName] = triggerId;
             return;
         }

quickshell/Common/SessionData.qml

@@ -126,10 +126,6 @@ Singleton {
     property var hiddenOutputDeviceNames: []
     property var hiddenInputDeviceNames: []
 
-    property string launcherLastMode: "all"
-    property string appDrawerLastMode: "apps"
-    property string niriOverviewLastMode: "apps"
-
     Component.onCompleted: {
         if (!isGreeterMode) {
             loadSettings();
@@ -1104,21 +1100,6 @@ Singleton {
         saveSettings();
     }
 
-    function setLauncherLastMode(mode) {
-        launcherLastMode = mode;
-        saveSettings();
-    }
-
-    function setAppDrawerLastMode(mode) {
-        appDrawerLastMode = mode;
-        saveSettings();
-    }
-
-    function setNiriOverviewLastMode(mode) {
-        niriOverviewLastMode = mode;
-        saveSettings();
-    }
-
     function syncWallpaperForCurrentMode() {
         if (!perModeWallpaper)
             return;

quickshell/Common/SettingsData.qml

@@ -518,7 +518,7 @@ Singleton {
     property int osdPosition: SettingsData.Position.BottomCenter
     property bool osdVolumeEnabled: true
     property bool osdMediaVolumeEnabled: true
-    property bool osdMediaPlaybackEnabled: false
+    property bool osdMediaPlaybackEnabled: true
     property bool osdBrightnessEnabled: true
     property bool osdIdleInhibitorEnabled: true
     property bool osdMicMuteEnabled: true
@@ -572,10 +572,6 @@ Singleton {
             "widgetTransparency": 1.0,
             "squareCorners": false,
             "noBackground": false,
-            "maximizeWidgetIcons": false,
-            "maximizeWidgetText": false,
-            "removeWidgetPadding": false,
-            "widgetPadding": 8,
             "gothCornersEnabled": false,
             "gothCornerRadiusOverride": false,
             "gothCornerRadiusValue": 12,
@@ -588,7 +584,6 @@ Singleton {
             "widgetOutlineOpacity": 1.0,
             "widgetOutlineThickness": 1,
             "fontScale": 1.0,
-            "iconScale": 1.0,
             "autoHide": false,
             "autoHideDelay": 250,
             "showOnWindowsOpen": false,
@@ -1031,7 +1026,6 @@ Singleton {
             elif command -v dconf >/dev/null 2>&1; then
             dconf read /org/gnome/desktop/interface/icon-theme 2>/dev/null | sed "s/'//g"
             fi`;
-
             Proc.runCommand("detectCosmicIconTheme", ["sh", "-c", detectScript], (output, exitCode) => {
                 if (exitCode !== 0)
                     return;

quickshell/Common/Theme.qml

@@ -961,6 +961,7 @@ Singleton {
         }
 
         if (!isGreeterMode) {
+            // Skip with matugen because, our script runner will do it.
             if (!matugenAvailable) {
                 PortalService.setLightMode(light);
             }
@@ -1169,23 +1170,21 @@ Singleton {
         return (0.299 * c.r + 0.587 * c.g + 0.114 * c.b) < 0.5;
     }
 
-    function barIconSize(barThickness, offset, maximizeIcon, iconScale) {
+    function barIconSize(barThickness, offset, noBackground) {
         const defaultOffset = offset !== undefined ? offset : -6;
-        const size = (maximizeIcon ?? false) ? iconSizeLarge : iconSize;
-        const s = iconScale !== undefined ? iconScale : 1.0;
+        const size = (noBackground ?? false) ? iconSizeLarge : iconSize;
 
-        return Math.round((barThickness / 48) * (size + defaultOffset) * s);
+        return Math.round((barThickness / 48) * (size + defaultOffset));
     }
 
-    function barTextSize(barThickness, fontScale, maximizeText) {
+    function barTextSize(barThickness, fontScale) {
         const scale = barThickness / 48;
         const dankBarScale = fontScale !== undefined ? fontScale : 1.0;
-        const maxScale = (maximizeText ?? false) ? 1.5 : 1.0;
         if (scale <= 0.75)
-            return Math.round(fontSizeSmall * 0.9 * dankBarScale * maxScale);
+            return Math.round(fontSizeSmall * 0.9 * dankBarScale);
         if (scale >= 1.25)
-            return Math.round(fontSizeMedium * dankBarScale * maxScale);
-        return Math.round(fontSizeSmall * dankBarScale * maxScale);
+            return Math.round(fontSizeMedium * dankBarScale);
+        return Math.round(fontSizeSmall * dankBarScale);
     }
 
     function getBatteryIcon(level, isCharging, batteryAvailable) {

quickshell/Common/settings/SessionSpec.js

@@ -77,11 +77,7 @@ var SPEC = {
 
     deviceMaxVolumes: { def: {} },
     hiddenOutputDeviceNames: { def: [] },
-    hiddenInputDeviceNames: { def: [] },
-
-    launcherLastMode: { def: "all" },
-    appDrawerLastMode: { def: "apps" },
-    niriOverviewLastMode: { def: "apps" }
+    hiddenInputDeviceNames: { def: [] }
 };
 
 function getValidKeys() {

quickshell/Common/settings/SettingsSpec.js

@@ -341,7 +341,7 @@ var SPEC = {
     osdPosition: { def: 5 },
     osdVolumeEnabled: { def: true },
     osdMediaVolumeEnabled: { def: true },
-    osdMediaPlaybackEnabled: { def: false },
+    osdMediaPlaybackEnabled: { def: true },
     osdBrightnessEnabled: { def: true },
     osdIdleInhibitorEnabled: { def: true },
     osdMicMuteEnabled: { def: true },
@@ -395,10 +395,6 @@ var SPEC = {
             widgetTransparency: 1.0,
             squareCorners: false,
             noBackground: false,
-            maximizeWidgetIcons: false,
-            maximizeWidgetText: false,
-            removeWidgetPadding: false,
-            widgetPadding: 8,
             gothCornersEnabled: false,
             gothCornerRadiusOverride: false,
             gothCornerRadiusValue: 12,
@@ -411,7 +407,6 @@ var SPEC = {
             widgetOutlineOpacity: 1.0,
             widgetOutlineThickness: 1,
             fontScale: 1.0,
-            iconScale: 1.0,
             autoHide: false,
             autoHideDelay: 250,
             showOnWindowsOpen: false,

quickshell/DMSShell.qml

@@ -142,45 +142,25 @@ Item {
                         fadeDpmsWindowLoader.item.cancelFade();
                     }
                 }
-
-                function onRequestMonitorOn() {
-                    if (!fadeDpmsWindowLoader.item)
-                        return;
-                    fadeDpmsWindowLoader.item.cancelFade();
-                }
             }
         }
     }
 
-    property string _barLayoutStateJson: {
-        const configs = SettingsData.barConfigs;
-        const mapped = configs.map(c => ({
-                    id: c.id,
-                    position: c.position,
-                    autoHide: c.autoHide,
-                    visible: c.visible
-                })).sort((a, b) => {
-            const aVertical = a.position === SettingsData.Position.Left || a.position === SettingsData.Position.Right;
-            const bVertical = b.position === SettingsData.Position.Left || b.position === SettingsData.Position.Right;
-            if (aVertical !== bVertical) {
-                return aVertical - bVertical;
-            }
-            return String(a.id).localeCompare(String(b.id));
-        });
-        return JSON.stringify(mapped);
-    }
-
-    on_BarLayoutStateJsonChanged: {
-        if (typeof dockRecreateDebounce !== "undefined") {
-            dockRecreateDebounce.restart();
-        }
-    }
-
     Repeater {
         id: dankBarRepeater
         model: ScriptModel {
             id: barRepeaterModel
-            values: JSON.parse(root._barLayoutStateJson)
+            values: {
+                const configs = SettingsData.barConfigs;
+                return configs.map(c => ({
+                            id: c.id,
+                            position: c.position
+                        })).sort((a, b) => {
+                    const aVertical = a.position === SettingsData.Position.Left || a.position === SettingsData.Position.Right;
+                    const bVertical = b.position === SettingsData.Position.Left || b.position === SettingsData.Position.Right;
+                    return aVertical - bVertical;
+                });
+            }
         }
 
         property var hyprlandOverviewLoaderRef: hyprlandOverviewLoader
@@ -227,6 +207,13 @@ Item {
         PolkitService.polkitAvailable;
     }
 
+    Connections {
+        target: SettingsData
+        function onBarConfigsChanged() {
+            dockRecreateDebounce.restart();
+        }
+    }
+
     Loader {
         id: dockLoader
         active: root.dockEnabled
@@ -278,7 +265,6 @@ Item {
         sourceComponent: Component {
             DankDashPopout {
                 id: dankDashPopout
-                onPopoutClosed: PopoutService.unloadDankDash()
             }
         }
     }
@@ -298,13 +284,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.notificationCenterLoader = notificationCenterLoader;
-        }
-
         NotificationCenterPopout {
             id: notificationCenter
-            onPopoutClosed: PopoutService.unloadNotificationCenter()
 
             Component.onCompleted: {
                 PopoutService.notificationCenterPopout = notificationCenter;
@@ -328,15 +309,10 @@ Item {
         property var modalRef: colorPickerModal
         property LazyLoader powerModalLoaderRef: powerMenuModalLoader
 
-        Component.onCompleted: {
-            PopoutService.controlCenterLoader = controlCenterLoader;
-        }
-
         ControlCenterPopout {
             id: controlCenterPopout
             colorPickerModal: controlCenterLoader.modalRef
             powerMenuModalLoader: controlCenterLoader.powerModalLoaderRef
-            onPopoutClosed: PopoutService.unloadControlCenter()
 
             onLockRequested: {
                 lock.activate();
@@ -444,13 +420,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.batteryPopoutLoader = batteryPopoutLoader;
-        }
-
         BatteryPopout {
             id: batteryPopout
-            onPopoutClosed: PopoutService.unloadBattery()
 
             Component.onCompleted: {
                 PopoutService.batteryPopout = batteryPopout;
@@ -463,13 +434,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.layoutPopoutLoader = layoutPopoutLoader;
-        }
-
         DWLLayoutPopout {
             id: layoutPopout
-            onPopoutClosed: PopoutService.unloadLayoutPopout()
 
             Component.onCompleted: {
                 PopoutService.layoutPopout = layoutPopout;
@@ -482,13 +448,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.vpnPopoutLoader = vpnPopoutLoader;
-        }
-
         VpnPopout {
             id: vpnPopout
-            onPopoutClosed: PopoutService.unloadVpn()
 
             Component.onCompleted: {
                 PopoutService.vpnPopout = vpnPopout;
@@ -501,13 +462,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.processListPopoutLoader = processListPopoutLoader;
-        }
-
         ProcessListPopout {
             id: processListPopout
-            onPopoutClosed: PopoutService.unloadProcessListPopout()
 
             Component.onCompleted: {
                 PopoutService.processListPopout = processListPopout;
@@ -550,13 +506,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.appDrawerLoader = appDrawerLoader;
-        }
-
         AppDrawerPopout {
             id: appDrawerPopout
-            onPopoutClosed: PopoutService.unloadAppDrawer()
 
             Component.onCompleted: {
                 PopoutService.appDrawerPopout = appDrawerPopout;
@@ -588,13 +539,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.clipboardHistoryPopoutLoader = clipboardHistoryPopoutLoader;
-        }
-
         ClipboardHistoryPopout {
             id: clipboardHistoryPopout
-            onPopoutClosed: PopoutService.unloadClipboardHistoryPopout()
 
             Component.onCompleted: {
                 PopoutService.clipboardHistoryPopout = clipboardHistoryPopout;
@@ -769,13 +715,8 @@ Item {
 
         active: false
 
-        Component.onCompleted: {
-            PopoutService.systemUpdateLoader = systemUpdateLoader;
-        }
-
         SystemUpdatePopout {
             id: systemUpdatePopout
-            onPopoutClosed: PopoutService.unloadSystemUpdate()
 
             Component.onCompleted: {
                 PopoutService.systemUpdatePopout = systemUpdatePopout;

quickshell/Modals/Changelog/ChangelogModal.qml

@@ -18,7 +18,7 @@ FloatingWindow {
     }
 
     objectName: "changelogModal"
-    title: i18n("What's New")
+    title: "What's New"
     minimumSize: Qt.size(modalWidth, modalHeight)
     maximumSize: Qt.size(modalWidth, modalHeight)
     color: Theme.surfaceContainer
@@ -81,7 +81,7 @@ FloatingWindow {
                     onClicked: root.dismiss()
 
                     DankTooltip {
-                        text: i18n("Close")
+                        text: "Close"
                     }
                 }
             }
@@ -125,7 +125,7 @@ FloatingWindow {
                 spacing: Theme.spacingM
 
                 DankButton {
-                    text: i18n("Read Full Release Notes")
+                    text: "Read Full Release Notes"
                     iconName: "open_in_new"
                     backgroundColor: Theme.surfaceContainerHighest
                     textColor: Theme.surfaceText
@@ -133,7 +133,7 @@ FloatingWindow {
                 }
 
                 DankButton {
-                    text: i18n("Got It")
+                    text: "Got It"
                     iconName: "check"
                     backgroundColor: Theme.primary
                     textColor: Theme.primaryText

quickshell/Modals/Clipboard/ClipboardConstants.qml

@@ -12,7 +12,7 @@ Singleton {
     readonly property int popoutWidth: 550
     readonly property int popoutHeight: 500
     readonly property int itemHeight: 72
-    readonly property int thumbnailSize: 100
+    readonly property int thumbnailSize: 48
     readonly property int retryInterval: 50
     readonly property int viewportBuffer: 100
     readonly property int extendedBuffer: 200

quickshell/Modals/Clipboard/ClipboardEntry.qml

@@ -84,8 +84,7 @@ Rectangle {
         anchors.right: actionButtons.left
         anchors.rightMargin: Theme.spacingM
         anchors.verticalCenter: parent.verticalCenter
-        // height: contentColumn.implicitHeight
-        height: ClipboardConstants.itemHeight
+        height: contentColumn.implicitHeight
         clip: true
 
         ClipboardThumbnail {
@@ -93,7 +92,7 @@ Rectangle {
             anchors.left: parent.left
             anchors.verticalCenter: parent.verticalCenter
             width: entryType === "image" ? ClipboardConstants.thumbnailSize : Theme.iconSize
-            height: entryType === "image" ? ClipboardConstants.itemHeight - 4 : Theme.iconSize // 100 - 4 = 96, 96:72 = 4:3
+            height: entryType === "image" ? ClipboardConstants.thumbnailSize : Theme.iconSize
             entry: root.entry
             entryType: root.entryType
             modal: root.modal
@@ -135,7 +134,6 @@ Rectangle {
                 wrapMode: Text.WordWrap
                 maximumLineCount: entryType === "long_text" ? 3 : 1
                 elide: Text.ElideRight
-                textFormat: Text.PlainText
             }
         }
     }

quickshell/Modals/Clipboard/ClipboardThumbnail.qml

@@ -137,23 +137,23 @@ Item {
         anchors.margins: 2
         source: thumbnailImage
         maskEnabled: true
-        maskSource: clipboardRoundedRectangularMask
+        maskSource: clipboardCircularMask
         visible: entryType === "image" && thumbnailImage.status === Image.Ready && thumbnailImage.source != ""
         maskThresholdMin: 0.5
         maskSpreadAtMin: 1
     }
 
     Item {
-        id: clipboardRoundedRectangularMask
-        width: ClipboardConstants.thumbnailSize
-        height: ClipboardConstants.itemHeight - 4
+        id: clipboardCircularMask
+        width: ClipboardConstants.thumbnailSize - 4
+        height: ClipboardConstants.thumbnailSize - 4
         layer.enabled: true
         layer.smooth: true
         visible: false
 
         Rectangle {
             anchors.fill: parent
-            radius: Theme.cornerRadius / 2 // Thumbnail corner radius is divided by 2 so it doesnt look weird on large corner radius (eg: 32px)
+            radius: width / 2
             color: "black"
             antialiasing: true
         }

quickshell/Modals/DankLauncherV2/Controller.qml

@@ -676,14 +676,16 @@ Item {
 
         var apps = searchApps(searchQuery);
         for (var i = 0; i < apps.length; i++) {
+            if (searchQuery)
+                apps[i]._preScored = 11000 - i;
             allItems.push(apps[i]);
         }
 
         if (searchMode === "all") {
             if (searchQuery && searchQuery.length >= 2) {
                 _pluginPhasePending = true;
-                _phase1Items = allItems.slice();
                 _pluginPhaseForceFirst = shouldResetSelection;
+                _phase1Items = allItems;
                 pluginPhaseTimer.restart();
                 isSearching = true;
                 searchCompleted();

quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml

@@ -102,7 +102,7 @@ Item {
             spotlightContent.searchField.text = query;
         }
         if (spotlightContent.controller) {
-            var targetMode = mode || SessionData.launcherLastMode || "all";
+            var targetMode = mode || "all";
             spotlightContent.controller.searchMode = targetMode;
             spotlightContent.controller.activePluginId = "";
             spotlightContent.controller.activePluginName = "";
@@ -226,15 +226,6 @@ Item {
         }
     }
 
-    Connections {
-        target: spotlightContent?.controller ?? null
-        function onModeChanged(mode) {
-            if (spotlightContent.controller.autoSwitchedToFiles)
-                return;
-            SessionData.setLauncherLastMode(mode);
-        }
-    }
-
     HyprlandFocusGrab {
         id: focusGrab
         windows: [launcherWindow]
@@ -293,7 +284,7 @@ Item {
 
     PanelWindow {
         id: launcherWindow
-        visible: root._windowEnabled && (spotlightOpen || isClosing)
+        visible: root._windowEnabled && (!root.unloadContentOnClose || spotlightOpen || isClosing)
         color: "transparent"
         exclusionMode: ExclusionMode.Ignore
 

quickshell/Modals/DankLauncherV2/LauncherContent.qml

@@ -470,6 +470,9 @@ FocusScope {
 
                     onTextChanged: {
                         controller.setSearchQuery(text);
+                        if (text.length === 0) {
+                            controller.restorePreviousMode();
+                        }
                         if (actionPanel.expanded) {
                             actionPanel.hide();
                         }

quickshell/Modals/DankLauncherV2/Scorer.js

@@ -3,7 +3,7 @@
 const Weights = {
     exactMatch: 10000,
     prefixMatch: 5000,
-    wordBoundary: 3000,
+    wordBoundary: 1000,
     substring: 500,
     fuzzy: 100,
     frecency: 2000,
@@ -99,8 +99,8 @@ function getTimeBucketWeight(daysSinceUsed) {
 function calculateTextScore(name, query) {
     if (name === query) return Weights.exactMatch
     if (name.startsWith(query)) return Weights.prefixMatch
-    if (hasWordBoundaryMatch(name, query)) return Weights.wordBoundary
     if (name.includes(query)) return Weights.substring
+    if (hasWordBoundaryMatch(name, query)) return Weights.wordBoundary
 
     if (query.length >= 3) {
         var fs = fuzzyScore(name, query)
@@ -140,7 +140,7 @@ function score(item, query, frecencyData) {
 
     if (textScore === 0) return 0
 
-    var usageBonus = frecencyData ? Math.min(frecencyData.usageCount * 50, Weights.frecency) : 0
+    var usageBonus = frecencyData ? Math.min(frecencyData.usageCount * 10, Weights.frecency) : 0
 
     return textScore + usageBonus + typeBonus
 }

quickshell/Modals/KeybindsModal.qml

@@ -123,7 +123,6 @@ DankModal {
 
                     function generateCategories(query) {
                         const lowerQuery = query ? query.toLowerCase().trim() : "";
-                        const lowerQueryWords = query.split(/\s+/);
                         const processed = {};
 
                         for (const cat in rawBinds) {
@@ -136,24 +135,9 @@ DankModal {
                                 const keyLower = bind.key.toLowerCase();
                                 const descLower = bind.desc.toLowerCase();
                                 const actionLower = bind.action.toLowerCase();
-
-                                if (bind.hideOnOverlay)
+                                if (!(lowerQuery.length === 0 || keyLower.includes(lowerQuery) || descLower.includes(lowerQuery) || catLower.includes(lowerQuery) || actionLower.includes(lowerQuery)))
                                     continue;
-                                let shouldContinue = false;
-                                for (let j = 0; j < lowerQueryWords.length; j++) {
-                                    const word = lowerQueryWords[j];
-                                    if (!(
-                                        word.length === 0 ||
-                                        keyLower.includes(word) ||
-                                        descLower.includes(word) ||
-                                        catLower.includes(word) ||
-                                        actionLower.includes(word)
-                                    )) {
-                                        shouldContinue = true;
-                                        break;
-                                    }
-                                }
-                                if (shouldContinue)
+                                if (bind.hideOnOverlay)
                                     continue;
 
                                 if (bind.subcat) {

quickshell/Modals/WindowRuleModal.qml

@@ -631,7 +631,7 @@ FloatingWindow {
                                 anchors.fill: parent
                                 font.pixelSize: Theme.fontSizeSmall
                                 textColor: Theme.surfaceText
-                                placeholderText: "800"
+                                placeholderText: "fixed 800"
                                 backgroundColor: "transparent"
                                 enabled: root.visible
                             }
@@ -658,7 +658,7 @@ FloatingWindow {
                                 anchors.fill: parent
                                 font.pixelSize: Theme.fontSizeSmall
                                 textColor: Theme.surfaceText
-                                placeholderText: "600"
+                                placeholderText: "fixed 600"
                                 backgroundColor: "transparent"
                                 enabled: root.visible
                             }

quickshell/Modules/AppDrawer/AppDrawerPopout.qml

@@ -61,7 +61,7 @@ DankPopout {
             return;
 
         const query = _pendingQuery;
-        const mode = _pendingMode || SessionData.appDrawerLastMode || "apps";
+        const mode = _pendingMode || "apps";
         _pendingMode = "";
         _pendingQuery = "";
 
@@ -83,15 +83,6 @@ DankPopout {
         lc.actionPanel?.hide();
     }
 
-    Connections {
-        target: contentLoader.item?.launcherContent?.controller ?? null
-        function onModeChanged(mode) {
-            if (contentLoader.item.launcherContent.controller.autoSwitchedToFiles)
-                return;
-            SessionData.setAppDrawerLastMode(mode);
-        }
-    }
-
     content: Component {
         Rectangle {
             id: contentContainer

quickshell/Modules/BlurredWallpaperBackground.qml

@@ -85,12 +85,12 @@ Variants {
             }
 
             Component.onCompleted: {
-                if (typeof blurWallpaperWindow.updatesEnabled !== "undefined")
-                    blurWallpaperWindow.updatesEnabled = Qt.binding(() => root.effectActive || root._renderSettling || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading);
-
                 if (!source) {
-                    root._renderSettling = false;
+                    isInitialized = true;
+                    return;
                 }
+                const formattedSource = source.startsWith("file://") ? source : encodeFileUrl(source);
+                setWallpaperImmediate(formattedSource);
                 isInitialized = true;
             }
 
@@ -98,25 +98,8 @@ Variants {
             property real transitionProgress: 0
             readonly property bool transitioning: transitionAnimation.running
             property bool effectActive: false
-            property bool _renderSettling: true
             property bool useNextForEffect: false
 
-            Connections {
-                target: currentWallpaper
-                function onStatusChanged() {
-                    if (currentWallpaper.status === Image.Ready) {
-                        root._renderSettling = true;
-                        renderSettleTimer.restart();
-                    }
-                }
-            }
-
-            Timer {
-                id: renderSettleTimer
-                interval: 100
-                onTriggered: root._renderSettling = false
-            }
-
             onSourceChanged: {
                 if (!source || source.startsWith("#")) {
                     setWallpaperImmediate("");
@@ -141,8 +124,6 @@ Variants {
                 transitionAnimation.stop();
                 root.transitionProgress = 0.0;
                 root.effectActive = false;
-                root._renderSettling = true;
-                renderSettleTimer.restart();
                 currentWallpaper.source = newSource;
                 nextWallpaper.source = "";
             }

quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml

@@ -40,24 +40,6 @@ Rectangle {
             font.weight: Font.Medium
             anchors.verticalCenter: parent.verticalCenter
         }
-
-        Item {
-            height: 1
-            width: parent.width - headerText.width - settingsButton.width
-        }
-
-        DankActionButton {
-            id: settingsButton
-            anchors.verticalCenter: parent.verticalCenter
-            iconName: "settings"
-            buttonSize: 28
-            iconSize: 16
-            iconColor: Theme.surfaceVariantText
-            onClicked: {
-                PopoutService.closeControlCenter();
-                PopoutService.openSettingsWithTab("audio");
-            }
-        }
     }
 
     Row {
@@ -169,11 +151,8 @@ Rectangle {
             Repeater {
                 model: ScriptModel {
                     values: {
-                        const hidden = SessionData.hiddenInputDeviceNames ?? [];
                         const nodes = Pipewire.nodes.values.filter(node => {
-                            if (!node.audio || node.isSink || node.isStream)
-                                return false;
-                            return !hidden.includes(node.name);
+                            return node.audio && !node.isSink && !node.isStream;
                         });
                         const pinnedList = audioContent.getPinnedInputs();
 

quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -40,24 +40,6 @@ Rectangle {
             font.weight: Font.Medium
             anchors.verticalCenter: parent.verticalCenter
         }
-
-        Item {
-            height: 1
-            width: parent.width - headerText.width - settingsButton.width
-        }
-
-        DankActionButton {
-            id: settingsButton
-            anchors.verticalCenter: parent.verticalCenter
-            iconName: "settings"
-            buttonSize: 28
-            iconSize: 16
-            iconColor: Theme.surfaceVariantText
-            onClicked: {
-                PopoutService.closeControlCenter();
-                PopoutService.openSettingsWithTab("audio");
-            }
-        }
     }
 
     Row {
@@ -179,11 +161,8 @@ Rectangle {
             Repeater {
                 model: ScriptModel {
                     values: {
-                        const hidden = SessionData.hiddenOutputDeviceNames ?? [];
                         const nodes = Pipewire.nodes.values.filter(node => {
-                            if (!node.audio || !node.isSink || node.isStream)
-                                return false;
-                            return !hidden.includes(node.name);
+                            return node.audio && node.isSink && !node.isStream;
                         });
                         const pinnedList = audioContent.getPinnedOutputs();
 
@@ -234,7 +213,16 @@ Rectangle {
                         spacing: Theme.spacingS
 
                         DankIcon {
-                            name: AudioService.sinkIcon(modelData)
+                            name: {
+                                if (modelData.name.includes("bluez"))
+                                    return "headset";
+                                else if (modelData.name.includes("hdmi"))
+                                    return "tv";
+                                else if (modelData.name.includes("usb"))
+                                    return "headset";
+                                else
+                                    return "speaker";
+                            }
                             size: Theme.iconSize - 4
                             color: modelData === AudioService.sink ? Theme.primary : Theme.surfaceText
                             anchors.verticalCenter: parent.verticalCenter

quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml

@@ -669,30 +669,6 @@ Rectangle {
             }
         }
 
-        MenuItem {
-            text: bluetoothContextMenu.currentDevice?.trusted ? I18n.tr("Untrust") : I18n.tr("Trust")
-            height: 32
-
-            contentItem: StyledText {
-                text: parent.text
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.surfaceText
-                leftPadding: Theme.spacingS
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            background: Rectangle {
-                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-                radius: Theme.cornerRadius / 2
-            }
-
-            onTriggered: {
-                if (!bluetoothContextMenu.hasDevice)
-                    return;
-                bluetoothContextMenu.currentDevice.trusted = !bluetoothContextMenu.currentDevice.trusted;
-            }
-        }
-
         MenuItem {
             text: I18n.tr("Forget Device")
             height: 32

quickshell/Modules/DankBar/DankBar.qml

@@ -21,82 +21,73 @@ Item {
     property alias centerWidgetsModel: centerWidgetsModel
     property alias rightWidgetsModel: rightWidgetsModel
 
-    property string _leftWidgetsJson: {
-        root.barConfig;
-        const leftWidgets = root.barConfig?.leftWidgets || [];
-        const mapped = leftWidgets.map((w, index) => {
-            if (typeof w === "string") {
-                return {
-                    widgetId: w,
-                    id: w + "_" + index,
-                    enabled: true
-                };
-            } else {
-                const obj = Object.assign({}, w);
-                obj.widgetId = w.id || w.widgetId;
-                obj.id = (w.id || w.widgetId) + "_" + index;
-                obj.enabled = w.enabled !== false;
-                return obj;
-            }
-        });
-        return JSON.stringify(mapped);
-    }
-
-    property string _centerWidgetsJson: {
-        root.barConfig;
-        const centerWidgets = root.barConfig?.centerWidgets || [];
-        const mapped = centerWidgets.map((w, index) => {
-            if (typeof w === "string") {
-                return {
-                    widgetId: w,
-                    id: w + "_" + index,
-                    enabled: true
-                };
-            } else {
-                const obj = Object.assign({}, w);
-                obj.widgetId = w.id || w.widgetId;
-                obj.id = (w.id || w.widgetId) + "_" + index;
-                obj.enabled = w.enabled !== false;
-                return obj;
-            }
-        });
-        return JSON.stringify(mapped);
-    }
-
-    property string _rightWidgetsJson: {
-        root.barConfig;
-        const rightWidgets = root.barConfig?.rightWidgets || [];
-        const mapped = rightWidgets.map((w, index) => {
-            if (typeof w === "string") {
-                return {
-                    widgetId: w,
-                    id: w + "_" + index,
-                    enabled: true
-                };
-            } else {
-                const obj = Object.assign({}, w);
-                obj.widgetId = w.id || w.widgetId;
-                obj.id = (w.id || w.widgetId) + "_" + index;
-                obj.enabled = w.enabled !== false;
-                return obj;
-            }
-        });
-        return JSON.stringify(mapped);
-    }
-
     ScriptModel {
         id: leftWidgetsModel
-        values: JSON.parse(root._leftWidgetsJson)
+        values: {
+            root.barConfig;
+            const leftWidgets = root.barConfig?.leftWidgets || [];
+            return leftWidgets.map((w, index) => {
+                if (typeof w === "string") {
+                    return {
+                        widgetId: w,
+                        id: w + "_" + index,
+                        enabled: true
+                    };
+                } else {
+                    const obj = Object.assign({}, w);
+                    obj.widgetId = w.id || w.widgetId;
+                    obj.id = (w.id || w.widgetId) + "_" + index;
+                    obj.enabled = w.enabled !== false;
+                    return obj;
+                }
+            });
+        }
     }
 
     ScriptModel {
         id: centerWidgetsModel
-        values: JSON.parse(root._centerWidgetsJson)
+        values: {
+            root.barConfig;
+            const centerWidgets = root.barConfig?.centerWidgets || [];
+            return centerWidgets.map((w, index) => {
+                if (typeof w === "string") {
+                    return {
+                        widgetId: w,
+                        id: w + "_" + index,
+                        enabled: true
+                    };
+                } else {
+                    const obj = Object.assign({}, w);
+                    obj.widgetId = w.id || w.widgetId;
+                    obj.id = (w.id || w.widgetId) + "_" + index;
+                    obj.enabled = w.enabled !== false;
+                    return obj;
+                }
+            });
+        }
     }
 
     ScriptModel {
         id: rightWidgetsModel
-        values: JSON.parse(root._rightWidgetsJson)
+        values: {
+            root.barConfig;
+            const rightWidgets = root.barConfig?.rightWidgets || [];
+            return rightWidgets.map((w, index) => {
+                if (typeof w === "string") {
+                    return {
+                        widgetId: w,
+                        id: w + "_" + index,
+                        enabled: true
+                    };
+                } else {
+                    const obj = Object.assign({}, w);
+                    obj.widgetId = w.id || w.widgetId;
+                    obj.id = (w.id || w.widgetId) + "_" + index;
+                    obj.enabled = w.enabled !== false;
+                    return obj;
+                }
+            });
+        }
     }
 
     function triggerControlCenterOnFocusedScreen() {

quickshell/Modules/DankBar/DankBarContent.qml

@@ -561,7 +561,10 @@ Item {
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent)
             parentScreen: barWindow.screen
-            popoutTarget: clipboardHistoryPopoutLoader.item ?? null
+            popoutTarget: {
+                clipboardHistoryPopoutLoader.active = true;
+                return clipboardHistoryPopoutLoader.item;
+            }
 
             function openClipboardPopout(initialTab) {
                 clipboardHistoryPopoutLoader.active = true;
@@ -756,7 +759,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             widgetThickness: barWindow.widgetThickness
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: dankDashPopoutLoader.item ?? null
+            popoutTarget: {
+                dankDashPopoutLoader.active = true;
+                return dankDashPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
 
             Component.onCompleted: {
@@ -805,7 +811,7 @@ Item {
                     } else {
                         dankDashPopoutLoader.item.triggerScreen = barWindow.screen;
                     }
-                    PopoutManager.requestPopout(dankDashPopoutLoader.item, 0, (effectiveBarConfig?.id ?? "default") + "-" + section + "-0");
+                    PopoutManager.requestPopout(dankDashPopoutLoader.item, 0, (effectiveBarConfig?.id ?? "default") + "-0");
                 }
             }
         }
@@ -820,7 +826,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             widgetThickness: barWindow.widgetThickness
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: dankDashPopoutLoader.item ?? null
+            popoutTarget: {
+                dankDashPopoutLoader.active = true;
+                return dankDashPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             onClicked: {
                 dankDashPopoutLoader.active = true;
@@ -858,7 +867,7 @@ Item {
                     } else {
                         dankDashPopoutLoader.item.triggerScreen = barWindow.screen;
                     }
-                    PopoutManager.requestPopout(dankDashPopoutLoader.item, 1, (effectiveBarConfig?.id ?? "default") + "-" + section + "-1");
+                    PopoutManager.requestPopout(dankDashPopoutLoader.item, 1, (effectiveBarConfig?.id ?? "default") + "-1");
                 }
             }
         }
@@ -872,7 +881,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             widgetThickness: barWindow.widgetThickness
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: dankDashPopoutLoader.item ?? null
+            popoutTarget: {
+                dankDashPopoutLoader.active = true;
+                return dankDashPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             onClicked: {
                 dankDashPopoutLoader.active = true;
@@ -914,7 +926,7 @@ Item {
                     } else {
                         dankDashPopoutLoader.item.triggerScreen = barWindow.screen;
                     }
-                    PopoutManager.requestPopout(dankDashPopoutLoader.item, 3, (effectiveBarConfig?.id ?? "default") + "-" + section + "-3");
+                    PopoutManager.requestPopout(dankDashPopoutLoader.item, 3, (effectiveBarConfig?.id ?? "default") + "-3");
                 }
             }
         }
@@ -956,7 +968,10 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: processListPopoutLoader.item ?? null
+            popoutTarget: {
+                processListPopoutLoader.active = true;
+                return processListPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onCpuClicked: {
@@ -989,7 +1004,10 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: processListPopoutLoader.item ?? null
+            popoutTarget: {
+                processListPopoutLoader.active = true;
+                return processListPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onRamClicked: {
@@ -1036,7 +1054,10 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: processListPopoutLoader.item ?? null
+            popoutTarget: {
+                processListPopoutLoader.active = true;
+                return processListPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onCpuTempClicked: {
@@ -1069,7 +1090,10 @@ Item {
             widgetThickness: barWindow.widgetThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: processListPopoutLoader.item ?? null
+            popoutTarget: {
+                processListPopoutLoader.active = true;
+                return processListPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             widgetData: parent.widgetData
             onGpuTempClicked: {
@@ -1110,7 +1134,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: notificationCenterLoader.item ?? null
+            popoutTarget: {
+                notificationCenterLoader.active = true;
+                return notificationCenterLoader.item;
+            }
             parentScreen: barWindow.screen
             onClicked: {
                 notificationCenterLoader.active = true;
@@ -1145,7 +1172,10 @@ Item {
             section: topBarContent.getWidgetSection(parent) || "right"
             barSpacing: barConfig?.spacing ?? 4
             barConfig: topBarContent.barConfig
-            popoutTarget: batteryPopoutLoader.item ?? null
+            popoutTarget: {
+                batteryPopoutLoader.active = true;
+                return batteryPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             onToggleBatteryPopup: {
                 batteryPopoutLoader.active = true;
@@ -1178,7 +1208,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "center"
-            popoutTarget: layoutPopoutLoader.item ?? null
+            popoutTarget: {
+                layoutPopoutLoader.active = true;
+                return layoutPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             onToggleLayoutPopup: {
                 layoutPopoutLoader.active = true;
@@ -1211,7 +1244,10 @@ Item {
             barSpacing: barConfig?.spacing ?? 4
             barConfig: topBarContent.barConfig
             isAutoHideBar: topBarContent.barConfig?.autoHide ?? false
-            popoutTarget: vpnPopoutLoader.item ?? null
+            popoutTarget: {
+                vpnPopoutLoader.active = true;
+                return vpnPopoutLoader.item;
+            }
             parentScreen: barWindow.screen
             onToggleVpnPopup: {
                 vpnPopoutLoader.active = true;
@@ -1245,7 +1281,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: controlCenterLoader.item ?? null
+            popoutTarget: {
+                controlCenterLoader.active = true;
+                return controlCenterLoader.item;
+            }
             parentScreen: barWindow.screen
             screenName: barWindow.screen?.name || ""
             screenModel: barWindow.screen?.model || ""
@@ -1395,7 +1434,10 @@ Item {
             barThickness: barWindow.effectiveBarThickness
             axis: barWindow.axis
             section: topBarContent.getWidgetSection(parent) || "right"
-            popoutTarget: systemUpdateLoader.item ?? null
+            popoutTarget: {
+                systemUpdateLoader.active = true;
+                return systemUpdateLoader.item;
+            }
             parentScreen: barWindow.screen
             onClicked: {
                 systemUpdateLoader.active = true;

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -48,11 +48,10 @@ PanelWindow {
             return;
         }
 
-        let section = "center";
         if (clockButtonRef && clockButtonRef.visualContent && dankDashPopoutLoader.item.setTriggerPosition) {
             // Calculate barPosition from axis.edge
             const barPosition = axis?.edge === "left" ? 2 : (axis?.edge === "right" ? 3 : (axis?.edge === "top" ? 0 : 1));
-            section = clockButtonRef.section || "center";
+            const section = clockButtonRef.section || "center";
 
             let triggerPos, triggerWidth;
             if (section === "center") {
@@ -81,7 +80,7 @@ PanelWindow {
             dankDashPopoutLoader.item.triggerScreen = barWindow.screen;
         }
 
-        PopoutManager.requestPopout(dankDashPopoutLoader.item, 2, (barConfig?.id ?? "default") + "-" + section + "-2");
+        PopoutManager.requestPopout(dankDashPopoutLoader.item, 2, (barConfig?.id ?? "default") + "-2");
     }
 
     readonly property var dBarLayer: {
@@ -131,55 +130,38 @@ PanelWindow {
     readonly property real _wingR: Math.max(0, wingtipsRadius)
     readonly property color _surfaceContainer: Theme.surfaceContainer
     readonly property string _barId: barConfig?.id ?? "default"
-    property real _backgroundAlpha: barConfig?.transparency ?? 1.0
+    readonly property var _liveBarConfig: SettingsData.barConfigs.find(c => c.id === _barId) || barConfig
+    readonly property real _backgroundAlpha: _liveBarConfig?.transparency ?? 1.0
     readonly property color _bgColor: Theme.withAlpha(_surfaceContainer, _backgroundAlpha)
-
-    function _updateBackgroundAlpha() {
-        const live = SettingsData.barConfigs.find(c => c.id === _barId);
-        _backgroundAlpha = (live ?? barConfig)?.transparency ?? 1.0;
-    }
     readonly property real _dpr: CompositorService.getScreenScale(barWindow.screen)
 
     property string screenName: modelData.name
 
-    property bool hasMaximizedToplevel: false
-    property bool shouldHideForWindows: false
-
-    function _updateHasMaximizedToplevel() {
-        if (!(barConfig?.maximizeDetection ?? true)) {
-            hasMaximizedToplevel = false;
-            return;
-        }
-        if (!CompositorService.isHyprland && !CompositorService.isNiri) {
-            hasMaximizedToplevel = false;
-            return;
-        }
+    readonly property bool hasMaximizedToplevel: {
+        if (!(barConfig?.maximizeDetection ?? true))
+            return false;
+        if (!CompositorService.isHyprland && !CompositorService.isNiri)
+            return false;
 
         const filtered = CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
         for (let i = 0; i < filtered.length; i++) {
-            if (filtered[i]?.maximized) {
-                hasMaximizedToplevel = true;
-                return;
-            }
+            if (filtered[i]?.maximized)
+                return true;
         }
-        hasMaximizedToplevel = false;
+        return false;
     }
 
-    function _updateShouldHideForWindows() {
-        if (!(barConfig?.showOnWindowsOpen ?? false)) {
-            shouldHideForWindows = false;
-            return;
-        }
-        if (!(barConfig?.autoHide ?? false)) {
-            shouldHideForWindows = false;
-            return;
-        }
-        if (!CompositorService.isNiri && !CompositorService.isHyprland) {
-            shouldHideForWindows = false;
-            return;
-        }
+    readonly property bool shouldHideForWindows: {
+        if (!(barConfig?.showOnWindowsOpen ?? false))
+            return false;
+        if (!(barConfig?.autoHide ?? false))
+            return false;
+        if (!CompositorService.isNiri && !CompositorService.isHyprland)
+            return false;
 
         if (CompositorService.isNiri) {
+            NiriService.windows;
+
             let currentWorkspaceId = null;
             for (let i = 0; i < NiriService.allWorkspaces.length; i++) {
                 const ws = NiriService.allWorkspaces[i];
@@ -189,10 +171,8 @@ PanelWindow {
                 }
             }
 
-            if (currentWorkspaceId === null) {
-                shouldHideForWindows = false;
-                return;
-            }
+            if (currentWorkspaceId === null)
+                return false;
 
             let hasTiled = false;
             let hasFloatingTouchingBar = false;
@@ -236,12 +216,14 @@ PanelWindow {
                 }
             }
 
-            shouldHideForWindows = hasTiled || hasFloatingTouchingBar;
-            return;
+            if (hasTiled)
+                return true;
+
+            return hasFloatingTouchingBar;
         }
 
         const filtered = CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
-        shouldHideForWindows = filtered.length > 0;
+        return filtered.length > 0;
     }
 
     property real effectiveSpacing: hasMaximizedToplevel ? 0 : (barConfig?.spacing ?? 4)
@@ -373,9 +355,6 @@ PanelWindow {
         }
 
         updateGpuTempConfig();
-        _updateBackgroundAlpha();
-        _updateHasMaximizedToplevel();
-        _updateShouldHideForWindows();
 
         inhibitorInitTimer.start();
     }
@@ -452,37 +431,11 @@ PanelWindow {
     Connections {
         function onBarConfigChanged() {
             barWindow.updateGpuTempConfig();
-            barWindow._updateBackgroundAlpha();
-            barWindow._updateHasMaximizedToplevel();
-            barWindow._updateShouldHideForWindows();
         }
 
         target: rootWindow
     }
 
-    Connections {
-        target: SettingsData
-        function onBarConfigsChanged() {
-            barWindow._updateBackgroundAlpha();
-        }
-    }
-
-    Connections {
-        target: CompositorService
-        function onToplevelsChanged() {
-            barWindow._updateHasMaximizedToplevel();
-            barWindow._updateShouldHideForWindows();
-        }
-    }
-
-    Connections {
-        target: NiriService
-        function onAllWorkspacesChanged() {
-            barWindow._updateHasMaximizedToplevel();
-            barWindow._updateShouldHideForWindows();
-        }
-    }
-
     Connections {
         function onNvidiaGpuTempEnabledChanged() {
             barWindow.updateGpuTempConfig();

quickshell/Modules/DankBar/Widgets/AppsDock.qml

@@ -400,7 +400,7 @@ BasePill {
     Component.onCompleted: updateModel()
 
     visible: dockItems.length > 0
-    readonly property real iconCellSize: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) + 6
+    readonly property real iconCellSize: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground) + 6
 
     content: Component {
         Item {
@@ -584,7 +584,8 @@ BasePill {
 
                 property string tooltipText: {
                     root._desktopEntriesUpdateTrigger;
-                    const desktopEntry = appId ? DesktopEntries.heuristicLookup(appId) : null;
+                    const moddedId = Paths.moddedAppId(appId);
+                    const desktopEntry = moddedId ? DesktopEntries.heuristicLookup(moddedId) : null;
                     const appName = appId ? Paths.getAppName(appId, desktopEntry) : "Unknown";
 
                     if (modelData.type === "grouped" && windowCount > 1) {
@@ -596,7 +597,7 @@ BasePill {
                 readonly property bool enlargeEnabled: (widgetData?.appsDockEnlargeOnHover !== undefined ? widgetData.appsDockEnlargeOnHover : SettingsData.appsDockEnlargeOnHover)
                 readonly property real enlargeScale: enlargeEnabled && mouseArea.containsMouse ? (widgetData?.appsDockEnlargePercentage !== undefined ? widgetData.appsDockEnlargePercentage : SettingsData.appsDockEnlargePercentage) / 100.0 : 1.0
                 readonly property real baseIconSizeMultiplier: (widgetData?.appsDockIconSizePercentage !== undefined ? widgetData.appsDockIconSizePercentage : SettingsData.appsDockIconSizePercentage) / 100.0
-                readonly property real effectiveIconSize: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale) * baseIconSizeMultiplier
+                readonly property real effectiveIconSize: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground) * baseIconSizeMultiplier
 
                 readonly property color activeOverlayColor: {
                     switch (SettingsData.appsDockActiveColorMode) {
@@ -689,8 +690,9 @@ BasePill {
                             if (!appItem.appId)
                                 return "";
                             if (modelData.isCoreApp)
-                                return "";
-                            const desktopEntry = DesktopEntries.heuristicLookup(appItem.appId);
+                                return ""; // Explicitly skip if core app to avoid flickering or wrong look ups
+                            const moddedId = Paths.moddedAppId(appItem.appId);
+                            const desktopEntry = DesktopEntries.heuristicLookup(moddedId);
                             return Paths.getAppIcon(appItem.appId, desktopEntry);
                         }
                         smooth: true
@@ -747,7 +749,8 @@ BasePill {
                             root._desktopEntriesUpdateTrigger;
                             if (!appItem.appId)
                                 return "?";
-                            const desktopEntry = DesktopEntries.heuristicLookup(appItem.appId);
+                            const moddedId = Paths.moddedAppId(appItem.appId);
+                            const desktopEntry = DesktopEntries.heuristicLookup(moddedId);
                             const appName = Paths.getAppName(appItem.appId, desktopEntry);
                             return appName.charAt(0).toUpperCase();
                         }
@@ -792,7 +795,7 @@ BasePill {
                         anchors.rightMargin: Theme.spacingS
                         anchors.verticalCenter: parent.verticalCenter
                         text: appItem.windowTitle || appItem.appId
-                        font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         elide: Text.ElideRight
                         maximumLineCount: 1

quickshell/Modules/DankBar/Widgets/Battery.qml

@@ -42,7 +42,7 @@ BasePill {
 
                 DankIcon {
                     name: BatteryService.getBatteryIcon()
-                    size: Theme.barIconSize(battery.barThickness, undefined, battery.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(battery.barThickness, undefined, battery.barConfig?.noBackground)
                     color: {
                         if (!BatteryService.batteryAvailable) {
                             return Theme.widgetIconColor;
@@ -63,7 +63,7 @@ BasePill {
 
                 StyledText {
                     text: BatteryService.batteryLevel.toString()
-                    font.pixelSize: Theme.barTextSize(battery.barThickness, battery.barConfig?.fontScale, battery.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(battery.barThickness, battery.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                     visible: BatteryService.batteryAvailable
@@ -78,7 +78,7 @@ BasePill {
 
                 DankIcon {
                     name: BatteryService.getBatteryIcon()
-                    size: Theme.barIconSize(battery.barThickness, -4, battery.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(battery.barThickness, -4, battery.barConfig?.noBackground)
                     color: {
                         if (!BatteryService.batteryAvailable) {
                             return Theme.widgetIconColor;
@@ -99,7 +99,7 @@ BasePill {
 
                 StyledText {
                     text: `${BatteryService.batteryLevel}%`
-                    font.pixelSize: Theme.barTextSize(battery.barThickness, battery.barConfig?.fontScale, battery.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(battery.barThickness, battery.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                     visible: BatteryService.batteryAvailable

quickshell/Modules/DankBar/Widgets/CapsLockIndicator.qml

@@ -54,7 +54,7 @@ BasePill {
                 id: icon
                 anchors.centerIn: parent
                 name: "shift_lock"
-                size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                 color: Theme.primary
             }
         }

quickshell/Modules/DankBar/Widgets/ClipboardButton.qml

@@ -9,6 +9,9 @@ BasePill {
     id: root
 
     property bool isActive: false
+    property var popoutTarget: null
+    property var parentScreen: null
+    property Item windowRoot: (Window.window ? Window.window.contentItem : null)
     property bool isAutoHideBar: false
 
     signal clipboardClicked
@@ -84,7 +87,7 @@ BasePill {
                 id: icon
                 anchors.centerIn: parent
                 name: "content_paste"
-                size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                 color: Theme.widgetIconColor
             }
         }

quickshell/Modules/DankBar/Widgets/Clock.qml

@@ -38,7 +38,7 @@ BasePill {
                             const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours;
                             return String(display).padStart(2, '0').charAt(0);
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -53,7 +53,7 @@ BasePill {
                             const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours;
                             return String(display).padStart(2, '0').charAt(1);
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -67,7 +67,7 @@ BasePill {
 
                     StyledText {
                         text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(0)
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -76,7 +76,7 @@ BasePill {
 
                     StyledText {
                         text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(1)
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -91,7 +91,7 @@ BasePill {
 
                     StyledText {
                         text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(0)
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -100,7 +100,7 @@ BasePill {
 
                     StyledText {
                         text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(1)
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -135,7 +135,7 @@ BasePill {
                             const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0');
                             return value.charAt(0);
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.primary
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -150,7 +150,7 @@ BasePill {
                             const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0');
                             return value.charAt(1);
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.primary
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -171,7 +171,7 @@ BasePill {
                             const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0');
                             return value.charAt(0);
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.primary
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -186,7 +186,7 @@ BasePill {
                             const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0');
                             return value.charAt(1);
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.primary
                         width: Math.round(font.pixelSize * 0.6)
                         horizontalAlignment: Text.AlignHCenter
@@ -201,7 +201,7 @@ BasePill {
                 anchors.centerIn: parent
                 spacing: Theme.spacingS
 
-                property real fontSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                property real fontSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                 property real digitWidth: fontSize * 0.6
 
                 property string hoursStr: {

quickshell/Modules/DankBar/Widgets/ColorPicker.qml

@@ -19,7 +19,7 @@ BasePill {
                 id: icon
                 anchors.centerIn: parent
                 name: "palette"
-                size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                 color: root.isActive ? Theme.primary : Theme.surfaceText
             }
         }

quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -29,7 +29,7 @@ BasePill {
     property real micAccumulator: 0
     property real volumeAccumulator: 0
     property real brightnessAccumulator: 0
-    readonly property real vIconSize: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+    readonly property real vIconSize: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
     property var _hRow: null
     property var _vCol: null
     property var _hAudio: null
@@ -394,7 +394,7 @@ BasePill {
                         id: audioPercentV
                         visible: root.showAudioPercent
                         text: Math.round((AudioService.sink?.audio?.volume ?? 0) * 100) + "%"
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.top: audioIconV.bottom
@@ -420,7 +420,7 @@ BasePill {
                         id: micPercentV
                         visible: root.showMicPercent
                         text: Math.round((AudioService.source?.audio?.volume ?? 0) * 100) + "%"
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.top: micIconV.bottom
@@ -446,7 +446,7 @@ BasePill {
                         id: brightnessPercentV
                         visible: root.showBrightnessPercent
                         text: Math.round(getBrightness() * 100) + "%"
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.top: brightnessIconV.bottom
@@ -502,7 +502,7 @@ BasePill {
 
                 DankIcon {
                     name: "screen_record"
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: NiriService.hasActiveCast ? Theme.primary : Theme.surfaceText
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showScreenSharingIcon && NiriService.hasCasts
@@ -511,7 +511,7 @@ BasePill {
                 DankIcon {
                     id: networkIcon
                     name: root.getNetworkIconName()
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: root.getNetworkIconColor()
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showNetworkIcon && NetworkService.networkAvailable
@@ -520,7 +520,7 @@ BasePill {
                 DankIcon {
                     id: vpnIcon
                     name: "vpn_lock"
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected
@@ -529,7 +529,7 @@ BasePill {
                 DankIcon {
                     id: bluetoothIcon
                     name: "bluetooth"
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
@@ -545,7 +545,7 @@ BasePill {
                     DankIcon {
                         id: audioIcon
                         name: root.getVolumeIconName()
-                        size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                        size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                         color: Theme.widgetIconColor
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: parent.left
@@ -556,7 +556,7 @@ BasePill {
                         id: audioPercent
                         visible: root.showAudioPercent
                         text: Math.round((AudioService.sink?.audio?.volume ?? 0) * 100) + "%"
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: audioIcon.right
@@ -574,7 +574,7 @@ BasePill {
                     DankIcon {
                         id: micIcon
                         name: root.getMicIconName()
-                        size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                        size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                         color: root.getMicIconColor()
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: parent.left
@@ -585,7 +585,7 @@ BasePill {
                         id: micPercent
                         visible: root.showMicPercent
                         text: Math.round((AudioService.source?.audio?.volume ?? 0) * 100) + "%"
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: micIcon.right
@@ -603,7 +603,7 @@ BasePill {
                     DankIcon {
                         id: brightnessIcon
                         name: root.getBrightnessIconName()
-                        size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                        size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                         color: Theme.widgetIconColor
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: parent.left
@@ -614,7 +614,7 @@ BasePill {
                         id: brightnessPercent
                         visible: root.showBrightnessPercent
                         text: Math.round(getBrightness() * 100) + "%"
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: brightnessIcon.right
@@ -625,7 +625,7 @@ BasePill {
                 DankIcon {
                     id: batteryIcon
                     name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable)
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: root.getBatteryIconColor()
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showBatteryIcon && BatteryService.batteryAvailable
@@ -634,7 +634,7 @@ BasePill {
                 DankIcon {
                     id: printerIcon
                     name: "print"
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: Theme.primary
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs()
@@ -642,7 +642,7 @@ BasePill {
 
                 DankIcon {
                     name: "settings"
-                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, -4, root.barConfig?.noBackground)
                     color: root.isActive ? Theme.primary : Theme.widgetIconColor
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.hasNoVisibleIcons()

quickshell/Modules/DankBar/Widgets/CpuMonitor.qml

@@ -36,7 +36,7 @@ BasePill {
 
                 DankIcon {
                     name: "memory"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (DgopService.cpuUsage > 80) {
                             return Theme.tempDanger;
@@ -59,7 +59,7 @@ BasePill {
 
                         return DgopService.cpuUsage.toFixed(0);
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
@@ -74,7 +74,7 @@ BasePill {
                 DankIcon {
                     id: cpuIcon
                     name: "memory"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (DgopService.cpuUsage > 80) {
                             return Theme.tempDanger;
@@ -93,22 +93,23 @@ BasePill {
                     id: textBox
                     anchors.verticalCenter: parent.verticalCenter
 
-                    implicitWidth: root.minimumWidth ? Math.max(cpuBaseline.width, cpuCurrent.width) : cpuCurrent.width
+                    implicitWidth: root.minimumWidth ? Math.max(cpuBaseline.width, cpuText.paintedWidth) : cpuText.paintedWidth
                     implicitHeight: cpuText.implicitHeight
 
                     width: implicitWidth
                     height: implicitHeight
 
-                    StyledTextMetrics {
-                        id: cpuBaseline
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
-                        text: "88%"
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Easing.OutCubic
+                        }
                     }
 
                     StyledTextMetrics {
-                        id: cpuCurrent
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
-                        text: cpuText.text
+                        id: cpuBaseline
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
+                        text: "88%"
                     }
 
                     StyledText {
@@ -120,7 +121,7 @@ BasePill {
                             }
                             return v.toFixed(0) + "%";
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
 
                         anchors.fill: parent

quickshell/Modules/DankBar/Widgets/CpuTemperature.qml

@@ -36,7 +36,7 @@ BasePill {
 
                 DankIcon {
                     name: "device_thermostat"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (DgopService.cpuTemperature > 85) {
                             return Theme.tempDanger;
@@ -59,7 +59,7 @@ BasePill {
 
                         return Math.round(DgopService.cpuTemperature).toString();
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
@@ -74,7 +74,7 @@ BasePill {
                 DankIcon {
                     id: cpuTempIcon
                     name: "device_thermostat"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (DgopService.cpuTemperature > 85) {
                             return Theme.tempDanger;
@@ -99,9 +99,16 @@ BasePill {
                     width: implicitWidth
                     height: implicitHeight
 
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+
                     StyledTextMetrics {
                         id: tempBaseline
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         text: "88°"
                     }
 
@@ -114,7 +121,7 @@ BasePill {
 
                             return Math.round(DgopService.cpuTemperature) + "°";
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
 
                         anchors.fill: parent

quickshell/Modules/DankBar/Widgets/DWLLayout.qml

@@ -57,14 +57,14 @@ BasePill {
 
                 DankIcon {
                     name: layout.getLayoutIcon(layout.currentLayoutSymbol)
-                    size: Theme.barIconSize(layout.barThickness, undefined, layout.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(layout.barThickness, undefined, layout.barConfig?.noBackground)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
 
                 StyledText {
                     text: layout.currentLayoutSymbol
-                    font.pixelSize: Theme.barTextSize(layout.barThickness, layout.barConfig?.fontScale, layout.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(layout.barThickness, layout.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
@@ -78,14 +78,14 @@ BasePill {
 
                 DankIcon {
                     name: layout.getLayoutIcon(layout.currentLayoutSymbol)
-                    size: Theme.barIconSize(layout.barThickness, -4, layout.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(layout.barThickness, -4, layout.barConfig?.noBackground)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                 }
 
                 StyledText {
                     text: layout.currentLayoutSymbol
-                    font.pixelSize: Theme.barTextSize(layout.barThickness, layout.barConfig?.fontScale, layout.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(layout.barThickness, layout.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                 }

quickshell/Modules/DankBar/Widgets/DiskUsage.qml

@@ -112,7 +112,7 @@ BasePill {
 
                 DankIcon {
                     name: "storage"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (root.diskUsagePercent > 90) {
                             return Theme.tempDanger;
@@ -132,7 +132,7 @@ BasePill {
                         }
                         return root.diskUsagePercent.toFixed(0);
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
@@ -146,7 +146,7 @@ BasePill {
 
                 DankIcon {
                     name: "storage"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (root.diskUsagePercent > 90) {
                             return Theme.tempDanger;
@@ -166,7 +166,7 @@ BasePill {
                         }
                         return root.selectedMount.mount;
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                     horizontalAlignment: Text.AlignLeft
@@ -180,7 +180,7 @@ BasePill {
                         }
                         return root.diskUsagePercent.toFixed(0) + "%";
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                     horizontalAlignment: Text.AlignLeft
@@ -188,11 +188,18 @@ BasePill {
 
                     StyledTextMetrics {
                         id: diskBaseline
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         text: "100%"
                     }
 
                     width: Math.max(diskBaseline.width, paintedWidth)
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 120
+                            easing.type: Easing.OutCubic
+                        }
+                    }
                 }
             }
         }

quickshell/Modules/DankBar/Widgets/FocusedApp.qml

@@ -189,7 +189,7 @@ BasePill {
                             return "";
                         return Paths.getAppName(activeWindow.appId, activeDesktopEntry);
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                     elide: Text.ElideRight
@@ -200,7 +200,7 @@ BasePill {
 
                 StyledText {
                     text: "•"
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.outlineButton
                     anchors.verticalCenter: parent.verticalCenter
                     visible: !compactMode && appText.text && titleText.text
@@ -225,7 +225,7 @@ BasePill {
 
                         return title;
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.verticalCenter: parent.verticalCenter
                     elide: Text.ElideRight

quickshell/Modules/DankBar/Widgets/GpuTemperature.qml

@@ -104,7 +104,7 @@ BasePill {
 
                 DankIcon {
                     name: "auto_awesome_mosaic"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (root.displayTemp > 80) {
                             return Theme.tempDanger;
@@ -127,7 +127,7 @@ BasePill {
 
                         return Math.round(root.displayTemp).toString();
                     }
-                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                    font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                     color: Theme.widgetTextColor
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
@@ -142,7 +142,7 @@ BasePill {
                 DankIcon {
                     id: gpuTempIcon
                     name: "auto_awesome_mosaic"
-                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                    size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.noBackground)
                     color: {
                         if (root.displayTemp > 80) {
                             return Theme.tempDanger;
@@ -167,9 +167,16 @@ BasePill {
                     width: implicitWidth
                     height: implicitHeight
 
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+
                     StyledTextMetrics {
                         id: gpuTempBaseline
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         text: "88°"
                     }
 
@@ -182,7 +189,7 @@ BasePill {
 
                             return Math.round(root.displayTemp) + "°";
                         }
-                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                        font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale)
                         color: Theme.widgetTextColor
 
                         anchors.fill: parent