chore: bump version to v0.6.0

- replace fzf.js with custom levenshtein distance matching
- tweak scoring system
- more graceful fuzzy, more weight to prefixes
- basic tokenization

.githooks/pre-commit

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# DISABLED for now
+exit 0
+
+set -euo pipefail
+
+HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$HOOK_DIR/.." && pwd)"
+
+cd "$REPO_ROOT"
+
+if [[ -z "${POEDITOR_API_TOKEN:-}" ]] || [[ -z "${POEDITOR_PROJECT_ID:-}" ]]; then
+    exit 0
+fi
+
+if ! command -v python3 &>/dev/null; then
+    exit 0
+fi
+
+if ! python3 scripts/i18nsync.py check &>/dev/null; then
+    echo "Translations out of sync"
+    echo "run python3 scripts/i18nsync.py sync"
+    exit 1
+fi
+
+exit 0

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [avengemedia]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: danklinux
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,23 +9,25 @@ assignees: ""
 <!-- If your issue is related to ICONS 
 - Purple and black checkerboards are QT's way of signalling an icon doesn't exist
   - FIX: Configure a QT6 or Icon Pack in DMS Settings that has the icon you want
-  - Follow the [THEMING](https://github.com/AvengeMedia/DankMaterialShell/tree/master?tab=readme-ov-file#theming) section to ensure your QT environment variable is configured correctl for themes.
+  - Follow the [THEMING](https://danklinux.com/docs/dankmaterialshell/icon-theming) section to ensure your QT environment variable is configured correctly for themes.
   - Once done, configure an icon theme - either however you normally do with gtk3 or qt6ct, or through the built-in settings modal. -->
 
-<!-- If your issue is related to APP LAUNCHER/DOCK/Running Apps being stale
- Quickshell does not ever update its DesktopEntires.
- There is an open PR for it, that has been stuck unmerged over there to fix it.
- We unfortunately are at the mercy of quickshell to merge it.
- Until then, newly installed and removed apps will not react until the
- shell is restarted.
-  -->
-
 ## Compositor
 
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 - [ ] Other (specify)
 
+## Distribution
+
+<!-- Arch, Fedora, Debian, etc. -->
+
+## dms version
+
+<!-- Output of dms version command -->
+
 ## Description
 
 <!-- Brief description of the issue -->
@@ -45,6 +47,14 @@ assignees: ""
 ## Error Messages/Logs
 
 <!-- Please include any error messages, stack traces, or relevant logs -->
+<!-- you can get a log file with the following steps:
+dms kill
+mkdir ~/dms_logs
+nohup dms run > ~/dms_logs/dms-$(date +%s).txt 2>&1 &
+
+Then trigger your issue, and share the contents of ~/dms_logs/dms-<timestamp>.txt
+
+-->
 
 ```
 Paste error messages or logs here

.github/ISSUE_TEMPLATE/feature_request.md

@@ -21,6 +21,8 @@ Is this feature specific to one compositor?
 - [ ] All compositors
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 
 ## Proposed Solution
 

.github/ISSUE_TEMPLATE/support_request.md

@@ -10,8 +10,18 @@ assignees: ""
 
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 - [ ] other
 
+## Distribution
+
+<!-- Arch, Fedora, Debian, etc. -->
+
+## dms version
+
+<!-- Output of dms version command -->
+
 ## Description
 
 <!-- Brief description of the support needed -->

.github/workflows/copr-release.yml

@@ -0,0 +1,315 @@
+name: DMS Copr Stable Release (Manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Versioning (e.g., 0.1.14, leave empty for latest release)'
+        required: false
+        default: ''
+      release:
+        description: 'Release number (e.g., 1, 2, 3 for hotfixes)'
+        required: false
+        default: '1'
+
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      
+      - name: Determine version
+        id: version
+        run: |
+          # Get version from manual input or latest release
+          if [ -n "${{ github.event.inputs.version }}" ]; then
+            VERSION="${{ github.event.inputs.version }}"
+            echo "Using manual version: $VERSION"
+          else
+            VERSION=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name' | sed 's/^v//')
+            echo "Using latest release version: $VERSION"
+          fi
+
+          RELEASE="${{ github.event.inputs.release }}"
+          if [ -z "$RELEASE" ]; then
+            RELEASE="1"
+          fi
+
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "release=$RELEASE" >> $GITHUB_OUTPUT
+          echo "✅ Building DMS hotfix version: $VERSION-$RELEASE"
+      
+      - name: Setup build environment
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y rpm wget curl jq gzip
+          mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+          echo "✅ RPM build environment ready"
+      
+      - name: Download release assets
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          cd ~/rpmbuild/SOURCES
+          
+          echo "📦 Downloading DMS QML source for v${VERSION}..."
+          
+          # Download DMS QML source
+          wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
+            echo "❌ Failed to download dms-qml.tar.gz for v${VERSION}"
+            exit 1
+          }
+          
+          echo "✅ Source downloaded"
+          echo "Note: dms-cli and dgop binaries will be downloaded during build based on target architecture"
+          ls -lh
+      
+      - name: Generate stable spec file
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          RELEASE="${{ steps.version.outputs.release }}"
+          CHANGELOG_DATE="$(date '+%a %b %d %Y')"
+
+          cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+          # Spec for DMS stable releases - Generated by GitHub Actions
+
+          %global debug_package %{nil}
+          %global version VERSION_PLACEHOLDER
+          %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+
+          Name:           dms
+          Version:        %{version}
+          Release:        RELEASE_PLACEHOLDER%{?dist}
+          Summary:        %{pkg_summary}
+
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          Source0:        dms-qml.tar.gz
+
+          BuildRequires:  gzip
+          BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros
+
+          Requires:       (quickshell or quickshell-git)
+          Requires:       accountsservice
+          Requires:       dms-cli
+          Requires:       dgop
+
+          Recommends:     cava
+          Recommends:     cliphist
+          Recommends:     danksearch
+          Recommends:     hyprpicker
+          Recommends:     matugen
+          Recommends:     wl-clipboard
+          Recommends:     NetworkManager
+          Recommends:     qt6-qtmultimedia
+          Suggests:       qt6ct
+
+          %description
+          DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+          and optimized for the niri and hyprland compositors. Features notifications,
+          app launcher, wallpaper customization, and fully customizable with plugins.
+
+          Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+          process monitoring, notification center, clipboard history, dock, control center,
+          lock screen, and comprehensive plugin system.
+
+          %package -n dms-cli
+          Summary:        DankMaterialShell CLI tool
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          %description -n dms-cli
+          Command-line interface for DankMaterialShell configuration and management.
+          Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+          %package -n dgop
+          Summary:        Stateless CPU/GPU monitor for DankMaterialShell
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/dgop
+          Provides:       dgop
+
+          %description -n dgop
+          DGOP is a stateless system monitoring tool that provides CPU, GPU, memory, and
+          network statistics. Designed for integration with DankMaterialShell but can be
+          used standalone. This package always includes the latest stable dgop release.
+
+          %prep
+          %setup -q -c -n dms-qml
+
+          # Download architecture-specific binaries during build
+          # This ensures the correct architecture is used for each build target
+          case "%{_arch}" in
+            x86_64)
+              ARCH_SUFFIX="amd64"
+              ;;
+            aarch64)
+              ARCH_SUFFIX="arm64"
+              ;;
+            *)
+              echo "Unsupported architecture: %{_arch}"
+              exit 1
+              ;;
+          esac
+
+          # Download dms-cli for target architecture
+          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dms-cli for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+          chmod +x %{_builddir}/dms-cli
+
+          # Download dgop for target architecture
+          wget -O %{_builddir}/dgop.gz "https://github.com/AvengeMedia/dgop/releases/latest/download/dgop-linux-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dgop for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dgop.gz > %{_builddir}/dgop
+          chmod +x %{_builddir}/dgop
+
+          %build
+
+          %install
+          install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+          install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop
+
+          # Shell completions
+          install -d %{buildroot}%{_datadir}/bash-completion/completions
+          install -d %{buildroot}%{_datadir}/zsh/site-functions
+          install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+          %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+          %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+          %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
+
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+          install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+          rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+          %posttrans
+          # Clean up old installation path from previous versions (only if empty)
+          if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+              # Remove directories only if empty (preserves any user-added files)
+              rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+          fi
+
+          # Restart DMS for active users after upgrade
+          if [ "$1" -ge 2 ]; then
+            pkill -USR1 -x dms >/dev/null 2>&1 || true
+          fi
+
+          %files
+          %license LICENSE
+          %doc README.md CONTRIBUTING.md
+          %{_datadir}/quickshell/dms/
+          %{_userunitdir}/dms.service
+
+          %files -n dms-cli
+          %{_bindir}/dms
+          %{_datadir}/bash-completion/completions/dms
+          %{_datadir}/zsh/site-functions/_dms
+          %{_datadir}/fish/vendor_completions.d/dms.fish
+
+          %files -n dgop
+          %{_bindir}/dgop
+
+          %changelog
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-RELEASE_PLACEHOLDER
+          - Stable release VERSION_PLACEHOLDER
+          - Built from GitHub release
+          - Includes latest dms-cli and dgop binaries
+          SPECEOF
+
+          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+          echo "✅ Spec file generated for v${VERSION}-${RELEASE}"
+          echo ""
+          echo "=== Spec file preview ==="
+          head -40 ~/rpmbuild/SPECS/dms.spec
+      
+      - name: Build SRPM
+        id: build
+        run: |
+          cd ~/rpmbuild/SPECS
+          
+          echo "🔨 Building SRPM..."
+          rpmbuild -bs dms.spec
+          
+          SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
+          SRPM_NAME=$(basename "$SRPM")
+          
+          echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
+          echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
+          
+          echo "✅ SRPM built: $SRPM_NAME"
+          echo ""
+          echo "=== SRPM Info ==="
+          rpm -qpi "$SRPM"
+      
+      - name: Upload SRPM artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dms-stable-srpm-${{ steps.version.outputs.version }}
+          path: ${{ steps.build.outputs.srpm_path }}
+          retention-days: 90
+      
+      - name: Install Copr CLI
+        run: |
+          sudo apt-get install -y python3-pip
+          pip3 install copr-cli
+          
+          mkdir -p ~/.config
+          cat > ~/.config/copr << EOF
+          [copr-cli]
+          login = ${{ secrets.COPR_LOGIN }}
+          username = avengemedia
+          token = ${{ secrets.COPR_TOKEN }}
+          copr_url = https://copr.fedorainfracloud.org
+          EOF
+          chmod 600 ~/.config/copr
+          
+          echo "✅ Copr CLI configured"
+      
+      - name: Upload to Copr
+        run: |
+          SRPM="${{ steps.build.outputs.srpm_path }}"
+          VERSION="${{ steps.version.outputs.version }}"
+          
+          echo "🚀 Uploading SRPM to avengemedia/dms..."
+          echo "   SRPM: $(basename $SRPM)"
+          echo "   Version: $VERSION"
+          
+          BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
+          echo "$BUILD_OUTPUT"
+          
+          BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
+          
+          if [ "$BUILD_ID" != "unknown" ]; then
+            echo "✅ Build submitted successfully!"
+            echo "🔗 https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
+          else
+            echo "⚠️  Could not extract build ID, but upload may have succeeded"
+          fi
+      
+      - name: Build summary
+        if: always()
+        run: |
+          echo "### 🎉 DMS Stable Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version:** ${{ steps.version.outputs.version }}-${{ steps.version.outputs.release }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **SRPM:** ${{ steps.build.outputs.srpm_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Project:** https://copr.fedorainfracloud.org/coprs/avengemedia/dms/" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Stable release has been built and uploaded to Copr!" >> $GITHUB_STEP_SUMMARY

.github/workflows/go-ci.yml

@@ -0,0 +1,42 @@
+name: Go CI
+
+on:
+  push:
+    branches:
+      - '**'
+    paths:
+      - 'core/**'
+      - '.github/workflows/go-ci.yml'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: core
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: ./core/go.mod
+
+      - name: Format check
+        run: |
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+            echo "The following files are not formatted:"
+            gofmt -s -l .
+            exit 1
+          fi
+
+      - name: Test
+        run: go test -v ./...
+
+      - name: Build dms
+        run: go build -v ./cmd/dms
+
+      - name: Build dankinstall
+        run: go build -v ./cmd/dankinstall

.github/workflows/release.yml

@@ -1,50 +1,192 @@
-# Release from a dispatch event from the danklinux repo
-name: Create Release from DMS
+name: Release
 
 on:
-  repository_dispatch:
-    types: [dms_release]
+  push:
+    tags:
+      - 'v*'
 
 permissions:
   contents: write
+  actions: write
 
 concurrency:
-  group: release-${{ github.event.client_payload.tag }}
+  group: release-${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
-  create_release_from_dms:
-    runs-on: ubuntu-24.04
-    env:
-      TAG: ${{ github.event.client_payload.tag }}
-      DMS_REPO: ${{ github.event.client_payload.dms_repo }}
+  build-core:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+
+    defaults:
+      run:
+        working-directory: core
+
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Ensure VERSION and tag
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: ./core/go.mod
+
+      - name: Format check
         run: |
-          set -euxo pipefail
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+            echo "The following files are not formatted:"
+            gofmt -s -l .
+            exit 1
+          fi
+
+      - name: Run tests
+        run: go test -v ./...
+
+      - name: Build dankinstall (${{ matrix.arch }})
+        env:
+          GOOS: linux
+          CGO_ENABLED: 0
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          set -eux
+          cd cmd/dankinstall
+          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+            -o ../../dankinstall-${{ matrix.arch }}
+          cd ../..
+          gzip -9 -k dankinstall-${{ matrix.arch }}
+          sha256sum dankinstall-${{ matrix.arch }}.gz > dankinstall-${{ matrix.arch }}.gz.sha256
+
+      - name: Build dms (${{ matrix.arch }})
+        env:
+          GOOS: linux
+          CGO_ENABLED: 0
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          set -eux
+          cd cmd/dms
+          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+            -o ../../dms-${{ matrix.arch }}
+          cd ../..
+          gzip -9 -k dms-${{ matrix.arch }}
+          sha256sum dms-${{ matrix.arch }}.gz > dms-${{ matrix.arch }}.gz.sha256
+
+      - name: Generate shell completions
+        if: matrix.arch == 'amd64'
+        run: |
+          set -eux
+          chmod +x dms-amd64
+          ./dms-amd64 completion bash > completion.bash
+          ./dms-amd64 completion fish > completion.fish
+          ./dms-amd64 completion zsh > completion.zsh
+
+      - name: Build dms-distropkg (${{ matrix.arch }})
+        env:
+          GOOS: linux
+          CGO_ENABLED: 0
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          set -eux
+          cd cmd/dms
+          go build -trimpath -tags distro_binary -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+            -o ../../dms-distropkg-${{ matrix.arch }}
+          cd ../..
+          gzip -9 -k dms-distropkg-${{ matrix.arch }}
+          sha256sum dms-distropkg-${{ matrix.arch }}.gz > dms-distropkg-${{ matrix.arch }}.gz.sha256
+
+      - name: Upload artifacts (${{ matrix.arch }})
+        if: matrix.arch == 'arm64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-assets-${{ matrix.arch }}
+          path: |
+            core/dankinstall-${{ matrix.arch }}.gz
+            core/dankinstall-${{ matrix.arch }}.gz.sha256
+            core/dms-${{ matrix.arch }}.gz
+            core/dms-${{ matrix.arch }}.gz.sha256
+            core/dms-distropkg-${{ matrix.arch }}.gz
+            core/dms-distropkg-${{ matrix.arch }}.gz.sha256
+          if-no-files-found: error
+
+      - name: Upload artifacts with completions
+        if: matrix.arch == 'amd64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-assets-${{ matrix.arch }}
+          path: |
+            core/dankinstall-${{ matrix.arch }}.gz
+            core/dankinstall-${{ matrix.arch }}.gz.sha256
+            core/dms-${{ matrix.arch }}.gz
+            core/dms-${{ matrix.arch }}.gz.sha256
+            core/dms-distropkg-${{ matrix.arch }}.gz
+            core/dms-distropkg-${{ matrix.arch }}.gz.sha256
+            core/completion.bash
+            core/completion.fish
+            core/completion.zsh
+          if-no-files-found: error
+
+  update-versions:
+    runs-on: ubuntu-latest
+    needs: build-core
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: Update VERSION
+        run: |
+          set -euo pipefail
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-          # create/update VERSION file to match incoming tag
-          echo "${TAG}" > VERSION
-          if ! git diff --quiet -- VERSION; then
-            git add VERSION
-            git commit -m "Add VERSION file for ${TAG} (from DMS)"
-          fi
+          version="${GITHUB_REF#refs/tags/}"
+          version_no_v="${version#v}"
+          echo "Updating to version: $version"
 
-          # If tag doesn't exist (or differs), (re)create it
-          if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
-            echo "Tag ${TAG} already exists"
+          # Update VERSION file in quickshell/
+          echo "${version}" > quickshell/VERSION
+
+          git add quickshell/VERSION
+
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: bump version to $version"
+            git push origin HEAD:master || git push origin HEAD:main
+            echo "Pushed version updates to master"
           else
-            git tag "${TAG}"
+            echo "No version changes needed"
           fi
 
-          # Push commit (if any) and tag
-          git push --follow-tags origin HEAD
+          # Force-push the tag to point to the commit with updated VERSION
+          git tag -f "${version}"
+          git push -f origin "${version}"
+
+  release:
+    runs-on: ubuntu-24.04
+    needs: [build-core, update-versions]
+    env:
+      TAG: ${{ github.ref_name }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Fetch updated tag after version bump
+        run: |
+          git fetch origin --force tag ${{ github.ref_name }}
+          git checkout ${{ github.ref_name }}
+
+      - name: Download core artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: core-assets-*
+          merge-multiple: true
+          path: ./_core_assets
 
       - name: Generate Changelog
         id: changelog
@@ -52,12 +194,43 @@ jobs:
           set -e
           PREVIOUS_TAG=$(git describe --tags --abbrev=0 "${TAG}^" 2>/dev/null || echo "")
           if [ -z "$PREVIOUS_TAG" ]; then
-            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" | head -50)
+            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /' | head -50)
           else
-            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" "${PREVIOUS_TAG}..${TAG}")
+            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" "${PREVIOUS_TAG}..${TAG}" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /')
           fi
 
-          cat > CHANGELOG.md << EOF
+          cat > RELEASE_BODY.md << 'EOF'
+          ## Installation
+
+          ```bash
+          curl -fsSL https://install.danklinux.com | sh
+          ```
+
+          ## Assets
+
+          ### Complete Packages
+          - **`dms-full-amd64.tar.gz`** - Complete package for x86_64 systems (CLI binaries + QML source + shell completions + installation guide)
+          - **`dms-full-arm64.tar.gz`** - Complete package for ARM64 systems (CLI binaries + QML source + shell completions + installation guide)
+
+          ### Individual Components
+          - **`dms-cli-amd64.gz`** - DMS CLI binary for x86_64 systems
+          - **`dms-cli-arm64.gz`** - DMS CLI binary for ARM64 systems
+          - **`dms-distropkg-amd64.gz`** - DMS CLI binary built with distro_package tag for AMD64 systems
+          - **`dms-distropkg-arm64.gz`** - DMS CLI binary built with distro_package tag for ARM64 systems
+          - **`dankinstall-amd64.gz`** - Installer binary for x86_64 systems
+          - **`dankinstall-arm64.gz`** - Installer binary for ARM64 systems
+          - **`dms-qml.tar.gz`** - QML source code only
+
+          ### Checksums
+          - **`*.sha256`** - SHA256 checksums for verifying download integrity
+
+          **Installation:** Extract the `dms-full-*.tar.gz` package for your architecture and follow the `INSTALL.md` instructions inside.
+
+          ---
+
+          EOF
+
+          cat >> RELEASE_BODY.md << EOF
           ## What's Changed
 
           $CHANGELOG
@@ -66,32 +239,392 @@ jobs:
           EOF
 
           echo "changelog<<EOF" >> $GITHUB_OUTPUT
-          cat CHANGELOG.md >> $GITHUB_OUTPUT
+          cat RELEASE_BODY.md >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Create/Update DankMaterialShell Release
+      - name: Prepare release assets
+        run: |
+          set -euxo pipefail
+
+          mkdir -p _release_assets
+
+          # Copy core binaries and rename dms-*.gz to dms-cli-*.gz
+          for file in _core_assets/dms-*.gz*; do
+            if [ -f "$file" ]; then
+              basename=$(basename "$file")
+              if [[ "$basename" == dms-distropkg-* ]]; then
+                cp "$file" "_release_assets/$basename"
+              else
+                newname=$(echo "$basename" | sed 's/^dms-/dms-cli-/')
+                cp "$file" "_release_assets/$newname"
+              fi
+            fi
+          done
+
+          # Copy dankinstall binaries
+          cp _core_assets/dankinstall-*.gz* _release_assets/
+
+          # Copy completions
+          cp _core_assets/completion.* _release_assets/ 2>/dev/null || true
+
+          # Create QML source package (exclude build artifacts and git files)
+          # Copy root LICENSE and CONTRIBUTING.md to quickshell/ for packaging
+          cp LICENSE CONTRIBUTING.md quickshell/
+
+          # Tar the CONTENTS of quickshell/, not the directory itself
+          (cd quickshell && tar --exclude='.git' \
+              --exclude='.github' \
+              --exclude='*.tar.gz' \
+              -czf ../_release_assets/dms-qml.tar.gz .)
+
+          # Generate checksum for QML package
+          (cd _release_assets && sha256sum dms-qml.tar.gz > dms-qml.tar.gz.sha256)
+
+          # Create full packages for each architecture
+          for arch in amd64 arm64; do
+            mkdir -p _temp_full/dms
+            mkdir -p _temp_full/bin
+            mkdir -p _temp_full/completions
+
+            # Extract QML source
+            tar -xzf _release_assets/dms-qml.tar.gz -C _temp_full/dms
+
+            # Add CLI binaries
+            if [ -f "_core_assets/dms-${arch}.gz" ]; then
+              gunzip -c "_core_assets/dms-${arch}.gz" > _temp_full/bin/dms
+              chmod +x _temp_full/bin/dms
+            fi
+
+            if [ -f "_core_assets/dms-distropkg-${arch}.gz" ]; then
+              gunzip -c "_core_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg
+              chmod +x _temp_full/bin/dms-distropkg
+            fi
+
+            # Add shell completions
+            for completion in _core_assets/completion.*; do
+              if [ -f "$completion" ]; then
+                cp "$completion" _temp_full/completions/
+              fi
+            done
+
+            # Copy docs directory
+            if [ -d "docs" ]; then
+              cp -r docs _temp_full/
+            fi
+
+            # Create installation guide
+            cat > _temp_full/INSTALL.md << 'EOFINSTALL'
+          # DankMaterialShell Installation
+
+          ## Requirements
+
+          - Wayland compositor (niri or Hyprland recommended)
+          - Quickshell framework
+          - Qt6
+
+          ## Installation Steps
+
+          1. **Install quickshell assets:**
+             ```bash
+             mkdir -p ~/.config/quickshell
+             cp -r dms ~/.config/quickshell/
+             ```
+
+          2. **Install the DMS CLI binaries:**
+             ```bash
+             sudo install -m 755 bin/dms /usr/local/bin/dms
+             ```
+
+          3. **Install shell completions (optional):**
+             ```bash
+             # Bash
+             sudo install -m 644 completions/completion.bash /usr/share/bash-completion/completions/dms
+
+             # Fish
+             sudo install -m 644 completions/completion.fish /usr/share/fish/vendor_completions.d/dms.fish
+
+             # Zsh
+             sudo install -m 644 completions/completion.zsh /usr/share/zsh/site-functions/_dms
+             ```
+
+          4. **Start the shell:**
+             ```bash
+             dms run
+             ```
+
+          ## Configuration
+
+          - Settings are stored in `~/.config/DankMaterialShell/settings.json`
+          - Plugins go in `~/.config/DankMaterialShell/plugins/`
+          - See the documentation in the `dms/` directory for more details
+
+          ## Troubleshooting
+
+          - Run with verbose output: `DMS_LOG_LEVEL=debug dms run`
+          - Ensure all dependencies are installed
+          EOFINSTALL
+
+            # Create the full package
+            (cd _temp_full && tar -czf "../_release_assets/dms-full-${arch}.tar.gz" .)
+
+            # Generate checksum
+            (cd _release_assets && sha256sum "dms-full-${arch}.tar.gz" > "dms-full-${arch}.tar.gz.sha256")
+
+            # Cleanup
+            rm -rf _temp_full
+          done
+
+      - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.TAG }}
           name: Release ${{ env.TAG }}
           body: ${{ steps.changelog.outputs.changelog }}
+          files: _release_assets/**
           draft: false
           prerelease: ${{ contains(env.TAG, '-') }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download DMS release assets
+  copr-build:
+    runs-on: ubuntu-latest
+    needs: release
     env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euxo pipefail
-          # gh is preinstalled on ubuntu-24.04; auth via GH_TOKEN env
-          gh release download "${TAG}" -R "${DMS_REPO}" --dir ./_dms_assets
+      TAG: ${{ github.ref_name }}
 
-      - name: Attach DMS assets to DankMaterialShell release
-        uses: softprops/action-gh-release@v2
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="${TAG#v}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Building DMS stable version: $VERSION"
+
+      - name: Setup build environment
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y rpm wget curl jq gzip
+          mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+
+      - name: Download release assets
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          cd ~/rpmbuild/SOURCES
+
+          wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
+            echo "Failed to download dms-qml.tar.gz for v${VERSION}"
+            exit 1
+          }
+
+      - name: Generate stable spec file
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          CHANGELOG_DATE="$(date '+%a %b %d %Y')"
+
+          cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+          # Spec for DMS stable releases - Generated by GitHub Actions
+
+          %global debug_package %{nil}
+          %global version VERSION_PLACEHOLDER
+          %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+
+          Name:           dms
+          Version:        %{version}
+          Release:        1%{?dist}
+          Summary:        %{pkg_summary}
+
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          Source0:        dms-qml.tar.gz
+
+          BuildRequires:  gzip
+          BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros
+
+          Requires:       (quickshell or quickshell-git)
+          Requires:       accountsservice
+          Requires:       dms-cli
+          Requires:       dgop
+
+          Recommends:     cava
+          Recommends:     cliphist
+          Recommends:     danksearch
+          Recommends:     hyprpicker
+          Recommends:     matugen
+          Recommends:     wl-clipboard
+          Recommends:     NetworkManager
+          Recommends:     qt6-qtmultimedia
+          Suggests:       qt6ct
+
+          %description
+          DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+          and optimized for the niri and hyprland compositors. Features notifications,
+          app launcher, wallpaper customization, and fully customizable with plugins.
+
+          Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+          process monitoring, notification center, clipboard history, dock, control center,
+          lock screen, and comprehensive plugin system.
+
+          %package -n dms-cli
+          Summary:        DankMaterialShell CLI tool
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          %description -n dms-cli
+          Command-line interface for DankMaterialShell configuration and management.
+          Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+          %package -n dgop
+          Summary:        Stateless CPU/GPU monitor for DankMaterialShell
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/dgop
+          Provides:       dgop
+
+          %description -n dgop
+          DGOP is a stateless system monitoring tool that provides CPU, GPU, memory, and
+          network statistics. Designed for integration with DankMaterialShell but can be
+          used standalone. This package always includes the latest stable dgop release.
+
+          %prep
+          %setup -q -c -n dms-qml
+
+          # Download architecture-specific binaries during build
+          case "%{_arch}" in
+            x86_64)
+              ARCH_SUFFIX="amd64"
+              ;;
+            aarch64)
+              ARCH_SUFFIX="arm64"
+              ;;
+            *)
+              echo "Unsupported architecture: %{_arch}"
+              exit 1
+              ;;
+          esac
+
+          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dms-cli for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+          chmod +x %{_builddir}/dms-cli
+
+          wget -O %{_builddir}/dgop.gz "https://github.com/AvengeMedia/dgop/releases/latest/download/dgop-linux-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dgop for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dgop.gz > %{_builddir}/dgop
+          chmod +x %{_builddir}/dgop
+
+          %build
+
+          %install
+          install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+          install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop
+
+          install -d %{buildroot}%{_datadir}/bash-completion/completions
+          install -d %{buildroot}%{_datadir}/zsh/site-functions
+          install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+          %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+          %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+          %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
+
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+          install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+          rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+          %posttrans
+          if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+              rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+          fi
+
+          if [ "$1" -ge 2 ]; then
+            pkill -USR1 -x dms >/dev/null 2>&1 || true
+          fi
+
+          %files
+          %license LICENSE
+          %doc README.md CONTRIBUTING.md
+          %{_datadir}/quickshell/dms/
+          %{_userunitdir}/dms.service
+
+          %files -n dms-cli
+          %{_bindir}/dms
+          %{_datadir}/bash-completion/completions/dms
+          %{_datadir}/zsh/site-functions/_dms
+          %{_datadir}/fish/vendor_completions.d/dms.fish
+
+          %files -n dgop
+          %{_bindir}/dgop
+
+          %changelog
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
+          - Stable release VERSION_PLACEHOLDER
+          - Built from GitHub release
+          - Includes latest dms-cli and dgop binaries
+          SPECEOF
+
+          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+      - name: Build SRPM
+        id: build
+        run: |
+          cd ~/rpmbuild/SPECS
+          rpmbuild -bs dms.spec
+
+          SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
+          SRPM_NAME=$(basename "$SRPM")
+
+          echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
+          echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
+          echo "SRPM built: $SRPM_NAME"
+
+      - name: Upload SRPM artifact
+        uses: actions/upload-artifact@v4
         with:
-          tag_name: ${{ env.TAG }}
-          files: _dms_assets/**
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          name: dms-stable-srpm-${{ steps.version.outputs.version }}
+          path: ${{ steps.build.outputs.srpm_path }}
+          retention-days: 90
+
+      - name: Install Copr CLI
+        run: |
+          sudo apt-get install -y python3-pip
+          pip3 install copr-cli
+
+          mkdir -p ~/.config
+          cat > ~/.config/copr << EOF
+          [copr-cli]
+          login = ${{ secrets.COPR_LOGIN }}
+          username = avengemedia
+          token = ${{ secrets.COPR_TOKEN }}
+          copr_url = https://copr.fedorainfracloud.org
+          EOF
+          chmod 600 ~/.config/copr
+
+      - name: Upload to Copr
+        run: |
+          SRPM="${{ steps.build.outputs.srpm_path }}"
+          VERSION="${{ steps.version.outputs.version }}"
+
+          echo "Uploading SRPM to avengemedia/dms..."
+          BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
+          echo "$BUILD_OUTPUT"
+
+          BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
+
+          if [ "$BUILD_ID" != "unknown" ]; then
+            echo "Build submitted: https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
+          fi

.github/workflows/update-vendor-hash.yml

@@ -0,0 +1,90 @@
+name: Update Vendor Hash
+
+on:
+  push:
+    paths:
+      - "core/go.mod"
+      - "core/go.sum"
+    branches:
+      - master
+
+jobs:
+  update-vendor-hash:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+
+      - name: Update vendorHash in flake.nix
+        run: |
+          set -euo pipefail
+
+          # Try to build and capture the expected hash from error message
+          echo "Attempting nix build to get new vendorHash..."
+
+          if output=$(nix build .#dmsCli 2>&1); then
+            echo "Build succeeded, no hash update needed"
+            exit 0
+          fi
+
+          # Extract the expected hash from the error message
+          new_hash=$(echo "$output" | grep -oP "got:\s+\K\S+" | head -n1)
+
+          if [ -z "$new_hash" ]; then
+            echo "Could not extract new vendorHash from build output"
+            echo "Build output:"
+            echo "$output"
+            exit 1
+          fi
+
+          echo "New vendorHash: $new_hash"
+
+          # Get current hash from flake.nix
+          current_hash=$(grep -oP 'vendorHash = "\K[^"]+' flake.nix)
+          echo "Current vendorHash: $current_hash"
+
+          if [ "$current_hash" = "$new_hash" ]; then
+            echo "vendorHash is already up to date"
+            exit 0
+          fi
+
+          # Update the hash in flake.nix
+          sed -i "s|vendorHash = \"$current_hash\"|vendorHash = \"$new_hash\"|" flake.nix
+
+          # Verify the build works with the new hash
+          echo "Verifying build with new vendorHash..."
+          nix build .#dmsCli
+
+          echo "vendorHash updated successfully!"
+
+      - name: Commit and push vendorHash update
+        run: |
+          set -euo pipefail
+
+          if ! git diff --quiet flake.nix; then
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+
+            git add flake.nix
+            git commit -m "nix: update vendorHash for go.mod changes"
+
+            for attempt in 1 2 3; do
+              if git push; then
+                echo "Successfully pushed vendorHash update"
+                exit 0
+              fi
+              echo "Push attempt $attempt failed, pulling and retrying..."
+              git pull --rebase
+              sleep $((attempt*2))
+            done
+
+            echo "Failed to push after retries" >&2
+            exit 1
+          else
+            echo "No changes to flake.nix"
+          fi

.gitignore

@@ -27,7 +27,6 @@ qrc_*.cpp
 ui_*.h
 *.qmlc
 *.jsc
-Makefile*
 *build-*
 *.qm
 *.prl
@@ -102,3 +101,38 @@ go.work.sum
 # Editor/IDE
 # .idea/
 # .vscode/
+
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Code coverage profiles and other test artifacts
+*.out
+coverage.*
+*.coverprofile
+profile.cov
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
+go.work
+go.work.sum
+
+# env file
+.env
+
+# Editor/IDE
+# .idea/
+# .vscode/
+
+bin/

Common/I18n.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-Singleton {
-    id: root
-
-    property string currentLocale: Qt.locale().name.substring(0, 2)
-    property var translations: ({})
-    property bool translationsLoaded: false
-
-    FileView {
-        id: translationLoader
-        path: root.currentLocale === "en" ? "" : Qt.resolvedUrl(`../translations/${root.currentLocale}.json`)
-
-        onLoaded: {
-            try {
-                root.translations = JSON.parse(text())
-                root.translationsLoaded = true
-                console.log(`I18n: Loaded translations for locale '${root.currentLocale}' (${Object.keys(root.translations).length} contexts)`)
-            } catch (e) {
-                console.warn(`I18n: Error parsing translations for locale '${root.currentLocale}':`, e, "- falling back to English")
-                root.translationsLoaded = false
-            }
-        }
-
-        onLoadFailed: (error) => {
-            console.warn(`I18n: Failed to load translations for locale '${root.currentLocale}' (${error}), falling back to English`)
-            root.translationsLoaded = false
-        }
-    }
-
-    function tr(term, context) {
-        if (!translationsLoaded || !translations) {
-            return term
-        }
-
-        const actualContext = context || term
-
-        if (translations[actualContext] && translations[actualContext][term]) {
-            return translations[actualContext][term]
-        }
-
-        for (const ctx in translations) {
-            if (translations[ctx][term]) {
-                return translations[ctx][term]
-            }
-        }
-
-        return term
-    }
-
-    function trContext(context, term) {
-        if (!translationsLoaded || !translations) {
-            return term
-        }
-
-        if (translations[context] && translations[context][term]) {
-            return translations[context][term]
-        }
-
-        return term
-    }
-}

DMSGreeter.qml

@@ -1,29 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Services.Greetd
-import qs.Common
-import qs.Modules.Greetd
-
-Item {
-    id: root
-
-    WlSessionLock {
-        id: sessionLock
-        locked: false
-
-        Component.onCompleted: {
-            Qt.callLater(() => { locked = true })
-        }
-
-        onLockedChanged: {
-            if (!locked) {
-                console.log("Greetd session unlocked, exiting")
-            }
-        }
-
-        GreeterSurface {
-            lock: sessionLock
-        }
-    }
-}

DMSShell.qml

@@ -1,524 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Modals
-import qs.Modals.Clipboard
-import qs.Modals.Common
-import qs.Modals.Settings
-import qs.Modals.Spotlight
-import qs.Modules
-import qs.Modules.AppDrawer
-import qs.Modules.DankDash
-import qs.Modules.ControlCenter
-import qs.Modules.Dock
-import qs.Modules.Lock
-import qs.Modules.Notepad
-import qs.Modules.Notifications.Center
-import qs.Widgets
-import qs.Modules.Notifications.Popup
-import qs.Modules.OSD
-import qs.Modules.ProcessList
-import qs.Modules.Settings
-import qs.Modules.DankBar
-import qs.Modules.DankBar.Popouts
-import qs.Modules.Plugins
-import qs.Services
-
-
-Item {
-  id: root
-
-  Instantiator {
-      id: daemonPluginInstantiator
-      asynchronous: true
-      model: Object.keys(PluginService.pluginDaemonComponents)
-
-      delegate: Loader {
-          id: daemonLoader
-          property string pluginId: modelData
-          sourceComponent: PluginService.pluginDaemonComponents[pluginId]
-
-          onLoaded: {
-              if (item) {
-                  item.pluginService = PluginService
-                  if (item.popoutService !== undefined) {
-                      item.popoutService = PopoutService
-                  }
-                  item.pluginId = pluginId
-                  console.log("Daemon plugin loaded:", pluginId)
-              }
-          }
-      }
-  }
-
-  WallpaperBackground {}
-
-  LazyLoader {
-      id: lockLoader
-      active: false
-
-      Lock {
-          id: lock
-          anchors.fill: parent
-
-          Component.onCompleted: {
-              IdleService.lockComponent = lock
-          }
-      }
-  }
-
-  Timer {
-      id: lockInitTimer
-      interval: 100
-      running: true
-      repeat: false
-      onTriggered: lockLoader.active = true
-  }
-
-  Loader {
-      id: dankBarLoader
-      asynchronous: false
-
-      property var currentPosition: SettingsData.dankBarPosition
-      property bool initialized: false
-
-      sourceComponent: DankBar {
-          onColorPickerRequested: colorPickerModal.show()
-      }
-
-      Component.onCompleted: {
-          initialized = true
-      }
-
-      onCurrentPositionChanged: {
-          if (!initialized) return
-
-          const component = sourceComponent
-          sourceComponent = null
-          sourceComponent = component
-      }
-  }
-
-  Loader {
-      id: dockLoader
-      active: true
-      asynchronous: false
-
-      property var currentPosition: SettingsData.dockPosition
-      property bool initialized: false
-
-      sourceComponent: Dock {
-          contextMenu: dockContextMenuLoader.item ? dockContextMenuLoader.item : null
-      }
-
-      onLoaded: {
-          if (item) {
-              dockContextMenuLoader.active = true
-          }
-      }
-
-      Component.onCompleted: {
-          initialized = true
-      }
-
-      onCurrentPositionChanged: {
-          if (!initialized) return
-
-          console.log("DEBUG: Dock position changed to:", currentPosition, "- recreating dock")
-          const comp = sourceComponent
-          sourceComponent = null
-          sourceComponent = comp
-      }
-  }
-
-  Loader {
-      id: dankDashPopoutLoader
-
-      active: false
-      asynchronous: true
-
-      sourceComponent: Component {
-          DankDashPopout {
-              id: dankDashPopout
-
-              Component.onCompleted: {
-                  PopoutService.dankDashPopout = dankDashPopout
-              }
-          }
-      }
-  }
-
-  LazyLoader {
-      id: dockContextMenuLoader
-
-      active: false
-
-      DockContextMenu {
-          id: dockContextMenu
-      }
-  }
-
-  LazyLoader {
-      id: notificationCenterLoader
-
-      active: false
-
-      NotificationCenterPopout {
-          id: notificationCenter
-
-          Component.onCompleted: {
-              PopoutService.notificationCenterPopout = notificationCenter
-          }
-      }
-  }
-
-  Variants {
-      model: SettingsData.getFilteredScreens("notifications")
-
-      delegate: NotificationPopupManager {
-          modelData: item
-      }
-  }
-
-  LazyLoader {
-      id: controlCenterLoader
-
-      active: false
-
-      property var modalRef: colorPickerModal
-      property LazyLoader powerModalLoaderRef: powerMenuModalLoader
-
-      ControlCenterPopout {
-          id: controlCenterPopout
-          colorPickerModal: controlCenterLoader.modalRef
-          powerMenuModalLoader: controlCenterLoader.powerModalLoaderRef
-
-          onLockRequested: {
-              lockLoader.item.activate()
-          }
-
-          Component.onCompleted: {
-              PopoutService.controlCenterPopout = controlCenterPopout
-          }
-      }
-  }
-
-  LazyLoader {
-      id: wifiPasswordModalLoader
-
-      active: false
-
-      WifiPasswordModal {
-          id: wifiPasswordModal
-
-          Component.onCompleted: {
-              PopoutService.wifiPasswordModal = wifiPasswordModal
-          }
-      }
-  }
-
-  LazyLoader {
-      id: networkInfoModalLoader
-
-      active: false
-
-      NetworkInfoModal {
-          id: networkInfoModal
-
-          Component.onCompleted: {
-              PopoutService.networkInfoModal = networkInfoModal
-          }
-      }
-  }
-
-  LazyLoader {
-      id: batteryPopoutLoader
-
-      active: false
-
-      BatteryPopout {
-          id: batteryPopout
-
-          Component.onCompleted: {
-              PopoutService.batteryPopout = batteryPopout
-          }
-      }
-  }
-
-  LazyLoader {
-      id: vpnPopoutLoader
-
-      active: false
-
-      VpnPopout {
-          id: vpnPopout
-
-          Component.onCompleted: {
-              PopoutService.vpnPopout = vpnPopout
-          }
-      }
-  }
-
-  LazyLoader {
-      id: powerMenuLoader
-
-      active: false
-
-      PowerMenu {
-          id: powerMenu
-
-          onPowerActionRequested: (action, title, message) => {
-                                      powerConfirmModalLoader.active = true
-                                      if (powerConfirmModalLoader.item) {
-                                          powerConfirmModalLoader.item.confirmButtonColor = action === "poweroff" ? Theme.error : action === "reboot" ? Theme.warning : Theme.primary
-                                          powerConfirmModalLoader.item.show(title, message, function () {
-                                              switch (action) {
-                                              case "logout":
-                                                  SessionService.logout()
-                                                  break
-                                              case "suspend":
-                                                  SessionService.suspend()
-                                                  break
-                                              case "hibernate":
-                                                  SessionService.hibernate()
-                                                  break
-                                              case "reboot":
-                                                  SessionService.reboot()
-                                                  break
-                                              case "poweroff":
-                                                  SessionService.poweroff()
-                                                  break
-                                              }
-                                          }, function () {})
-                                      }
-                                  }
-      }
-  }
-
-  LazyLoader {
-      id: powerConfirmModalLoader
-
-      active: false
-
-      ConfirmModal {
-          id: powerConfirmModal
-      }
-  }
-
-  LazyLoader {
-      id: processListPopoutLoader
-
-      active: false
-
-      ProcessListPopout {
-          id: processListPopout
-
-          Component.onCompleted: {
-              PopoutService.processListPopout = processListPopout
-          }
-      }
-  }
-
-  SettingsModal {
-      id: settingsModal
-
-      Component.onCompleted: {
-          PopoutService.settingsModal = settingsModal
-      }
-  }
-
-  LazyLoader {
-      id: appDrawerLoader
-
-      active: false
-
-      AppDrawerPopout {
-          id: appDrawerPopout
-
-          Component.onCompleted: {
-              PopoutService.appDrawerPopout = appDrawerPopout
-          }
-      }
-  }
-
-  SpotlightModal {
-      id: spotlightModal
-
-      Component.onCompleted: {
-          PopoutService.spotlightModal = spotlightModal
-      }
-  }
-
-  ClipboardHistoryModal {
-      id: clipboardHistoryModalPopup
-
-      Component.onCompleted: {
-          PopoutService.clipboardHistoryModal = clipboardHistoryModalPopup
-      }
-  }
-
-  NotificationModal {
-      id: notificationModal
-
-      Component.onCompleted: {
-          PopoutService.notificationModal = notificationModal
-      }
-  }
-
-  DankColorPickerModal {
-      id: colorPickerModal
-
-      Component.onCompleted: {
-          PopoutService.colorPickerModal = colorPickerModal
-      }
-  }
-
-  LazyLoader {
-      id: processListModalLoader
-
-      active: false
-
-      ProcessListModal {
-          id: processListModal
-
-          Component.onCompleted: {
-              PopoutService.processListModal = processListModal
-          }
-      }
-  }
-
-  LazyLoader {
-      id: systemUpdateLoader
-
-      active: false
-
-      SystemUpdatePopout {
-          id: systemUpdatePopout
-
-          Component.onCompleted: {
-              PopoutService.systemUpdatePopout = systemUpdatePopout
-          }
-      }
-  }
-
-  Variants {
-      id: notepadSlideoutVariants
-      model: SettingsData.getFilteredScreens("notepad")
-
-      delegate: DankSlideout {
-          id: notepadSlideout
-          modelData: item
-          title: I18n.tr("Notepad")
-          slideoutWidth: 480
-          expandable: true
-          expandedWidthValue: 960
-          customTransparency: SettingsData.notepadTransparencyOverride
-
-          content: Component {
-              Notepad {
-                  onHideRequested: {
-                      notepadSlideout.hide()
-                  }
-              }
-          }
-
-          function toggle() {
-              if (isVisible) {
-                  hide()
-              } else {
-                  show()
-              }
-          }
-      }
-  }
-
-  LazyLoader {
-      id: powerMenuModalLoader
-
-      active: false
-
-      PowerMenuModal {
-          id: powerMenuModal
-
-          onPowerActionRequested: (action, title, message) => {
-                                      powerConfirmModalLoader.active = true
-                                      if (powerConfirmModalLoader.item) {
-                                          powerConfirmModalLoader.item.confirmButtonColor = action === "poweroff" ? Theme.error : action === "reboot" ? Theme.warning : Theme.primary
-                                          powerConfirmModalLoader.item.show(title, message, function () {
-                                              switch (action) {
-                                              case "logout":
-                                                  SessionService.logout()
-                                                  break
-                                              case "suspend":
-                                                  SessionService.suspend()
-                                                  break
-                                              case "hibernate":
-                                                  SessionService.hibernate()
-                                                  break
-                                              case "reboot":
-                                                  SessionService.reboot()
-                                                  break
-                                              case "poweroff":
-                                                  SessionService.poweroff()
-                                                  break
-                                              }
-                                          }, function () {})
-                                      }
-                                  }
-
-          Component.onCompleted: {
-              PopoutService.powerMenuModal = powerMenuModal
-          }
-      }
-  }
-
-  DMSShellIPC {
-      powerMenuModalLoader: powerMenuModalLoader
-      processListModalLoader: processListModalLoader
-      controlCenterLoader: controlCenterLoader
-      dankDashPopoutLoader: dankDashPopoutLoader
-      notepadSlideoutVariants: notepadSlideoutVariants
-  }
-
-  Variants {
-      model: SettingsData.getFilteredScreens("toast")
-
-      delegate: Toast {
-          modelData: item
-          visible: ToastService.toastVisible
-      }
-  }
-
-  Variants {
-      model: SettingsData.getFilteredScreens("osd")
-
-      delegate: VolumeOSD {
-          modelData: item
-      }
-  }
-
-  Variants {
-      model: SettingsData.getFilteredScreens("osd")
-
-      delegate: MicMuteOSD {
-          modelData: item
-      }
-  }
-
-  Variants {
-      model: SettingsData.getFilteredScreens("osd")
-
-      delegate: BrightnessOSD {
-          modelData: item
-      }
-  }
-
-  Variants {
-      model: SettingsData.getFilteredScreens("osd")
-
-      delegate: IdleInhibitorOSD {
-          modelData: item
-      }
-  }
-}

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2025 Avenge Media LLC
+
+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.

Modals/Common/DankModal.qml

@@ -1,245 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-
-PanelWindow {
-    id: root
-
-    WlrLayershell.namespace: "quickshell:modal"
-
-    property alias content: contentLoader.sourceComponent
-    property alias contentLoader: contentLoader
-    property real width: 400
-    property real height: 300
-    readonly property real screenWidth: screen ? screen.width : 1920
-    readonly property real screenHeight: screen ? screen.height : 1080
-    readonly property real dpr: (screen && screen.devicePixelRatio) || 1
-
-    function snap(v) {
-        return Math.round(v * dpr) / dpr
-    }
-
-    function px(v) {
-        return Math.round(v)
-    }
-    property bool showBackground: true
-    property real backgroundOpacity: 0.5
-    property string positioning: "center"
-    property point customPosition: Qt.point(0, 0)
-    property bool closeOnEscapeKey: true
-    property bool closeOnBackgroundClick: true
-    property string animationType: "scale"
-    property int animationDuration: Theme.shortDuration
-    property var animationEasing: Theme.emphasizedEasing
-    property color backgroundColor: Theme.surfaceContainer
-    property color borderColor: Theme.outlineMedium
-    property real borderWidth: 1
-    property real cornerRadius: Theme.cornerRadius
-    property bool enableShadow: false
-    property alias modalFocusScope: focusScope
-    property bool shouldBeVisible: false
-    property bool shouldHaveFocus: shouldBeVisible
-    property bool allowFocusOverride: false
-    property bool allowStacking: false
-    property bool keepContentLoaded: false
-
-    signal opened
-    signal dialogClosed
-    signal backgroundClicked
-
-    function open() {
-        ModalManager.openModal(root)
-        closeTimer.stop()
-        shouldBeVisible = true
-        visible = true
-        focusScope.forceActiveFocus()
-    }
-
-    function close() {
-        shouldBeVisible = false
-        closeTimer.restart()
-    }
-
-    function toggle() {
-        if (shouldBeVisible) {
-            close()
-        } else {
-            open()
-        }
-    }
-
-    visible: shouldBeVisible
-    color: "transparent"
-    WlrLayershell.layer: WlrLayershell.Top // if set to overlay -> virtual keyboards can be stuck under modal
-    WlrLayershell.exclusiveZone: -1
-    WlrLayershell.keyboardFocus: shouldHaveFocus ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
-    onVisibleChanged: {
-        if (root.visible) {
-            opened()
-        } else {
-            if (Qt.inputMethod) {
-                Qt.inputMethod.hide()
-                Qt.inputMethod.reset()
-            }
-            dialogClosed()
-        }
-    }
-
-    Connections {
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== root && !allowStacking && shouldBeVisible) {
-                close()
-            }
-        }
-
-        target: ModalManager
-    }
-
-    Timer {
-        id: closeTimer
-
-        interval: animationDuration + 100
-        onTriggered: {
-            visible = false
-        }
-    }
-
-    anchors {
-        top: true
-        left: true
-        right: true
-        bottom: true
-    }
-
-    Rectangle {
-        id: background
-
-        anchors.fill: parent
-        color: "black"
-        opacity: root.showBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-        visible: root.showBackground
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: root.closeOnBackgroundClick
-            onClicked: mouse => {
-                           const localPos = mapToItem(contentContainer, mouse.x, mouse.y)
-                           if (localPos.x < 0 || localPos.x > contentContainer.width || localPos.y < 0 || localPos.y > contentContainer.height) {
-                               root.backgroundClicked()
-                           }
-                       }
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: root.animationDuration
-                easing.type: root.animationEasing
-            }
-        }
-    }
-
-    Rectangle {
-        id: contentContainer
-
-        width: px(root.width)
-        height: px(root.height)
-        anchors.centerIn: undefined
-        x: {
-            if (positioning === "center") {
-                return snap((root.screenWidth - width) / 2)
-            } else if (positioning === "top-right") {
-                return px(Math.max(Theme.spacingL, root.screenWidth - width - Theme.spacingL))
-            } else if (positioning === "custom") {
-                return snap(root.customPosition.x)
-            }
-            return 0
-        }
-        y: {
-            if (positioning === "center") {
-                return snap((root.screenHeight - height) / 2)
-            } else if (positioning === "top-right") {
-                return px(Theme.barHeight + Theme.spacingXS)
-            } else if (positioning === "custom") {
-                return snap(root.customPosition.y)
-            }
-            return 0
-        }
-        color: root.backgroundColor
-        radius: root.cornerRadius
-        border.color: root.borderColor
-        border.width: root.borderWidth
-        clip: false
-        opacity: root.shouldBeVisible ? 1 : 0
-        transform: root.animationType === "slide" ? slideTransform : null
-
-        Translate {
-            id: slideTransform
-
-            readonly property real rawX: root.shouldBeVisible ? 0 : 15
-            readonly property real rawY: root.shouldBeVisible ? 0 : -30
-
-            x: snap(rawX)
-            y: snap(rawY)
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: animationDuration
-                easing.type: animationEasing
-            }
-        }
-
-        FocusScope {
-            anchors.fill: parent
-            focus: root.shouldBeVisible
-            clip: false
-
-            Loader {
-                id: contentLoader
-
-                anchors.fill: parent
-                active: root.keepContentLoaded || root.shouldBeVisible || root.visible
-                asynchronous: false
-                focus: true
-                clip: false
-
-                onLoaded: {
-                    if (item) {
-                        Qt.callLater(() => item.forceActiveFocus())
-                    }
-                }
-            }
-        }
-    }
-
-    FocusScope {
-        id: focusScope
-
-        objectName: "modalFocusScope"
-        anchors.fill: parent
-        visible: root.shouldBeVisible || root.visible
-        focus: root.shouldBeVisible
-        Keys.onEscapePressed: event => {
-                                  if (root.closeOnEscapeKey && shouldHaveFocus) {
-                                      root.close()
-                                      event.accepted = true
-                                  }
-                              }
-        onVisibleChanged: {
-            if (visible && shouldHaveFocus) {
-                Qt.callLater(() => focusScope.forceActiveFocus())
-            }
-        }
-
-        Connections {
-            function onShouldHaveFocusChanged() {
-                if (shouldHaveFocus && shouldBeVisible) {
-                    Qt.callLater(() => focusScope.forceActiveFocus())
-                }
-            }
-
-            target: root
-        }
-    }
-}

Modals/PowerMenuModal.qml

@@ -1,454 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    property int selectedIndex: 0
-    property int optionCount: SessionService.hibernateSupported ? 5 : 4
-    property rect parentBounds: Qt.rect(0, 0, 0, 0)
-    property var parentScreen: null
-
-    signal powerActionRequested(string action, string title, string message)
-
-    function openCentered() {
-        parentBounds = Qt.rect(0, 0, 0, 0)
-        parentScreen = null
-        backgroundOpacity = 0.5
-        open()
-    }
-
-    function openFromControlCenter(bounds, targetScreen) {
-        parentBounds = bounds
-        parentScreen = targetScreen
-        backgroundOpacity = 0
-        open()
-    }
-
-    function selectOption(action) {
-        close();
-        const actions = {
-            "logout": {
-                "title": I18n.tr("Log Out"),
-                "message": I18n.tr("Are you sure you want to log out?")
-            },
-            "suspend": {
-                "title": I18n.tr("Suspend"),
-                "message": I18n.tr("Are you sure you want to suspend the system?")
-            },
-            "hibernate": {
-                "title": I18n.tr("Hibernate"),
-                "message": I18n.tr("Are you sure you want to hibernate the system?")
-            },
-            "reboot": {
-                "title": I18n.tr("Reboot"),
-                "message": I18n.tr("Are you sure you want to reboot the system?")
-            },
-            "poweroff": {
-                "title": I18n.tr("Power Off"),
-                "message": I18n.tr("Are you sure you want to power off the system?")
-            }
-        }
-        const selected = actions[action]
-        if (selected) {
-            root.powerActionRequested(action, selected.title, selected.message);
-        }
-
-    }
-
-    shouldBeVisible: false
-    width: 320
-    height: contentLoader.item ? contentLoader.item.implicitHeight : 300
-    enableShadow: true
-    screen: parentScreen
-    positioning: parentBounds.width > 0 ? "custom" : "center"
-    customPosition: {
-        if (parentBounds.width > 0) {
-            const centerX = parentBounds.x + (parentBounds.width - width) / 2
-            const centerY = parentBounds.y + (parentBounds.height - height) / 2
-            return Qt.point(centerX, centerY)
-        }
-        return Qt.point(0, 0)
-    }
-    onBackgroundClicked: () => {
-        return close();
-    }
-    onOpened: () => {
-        selectedIndex = 0;
-        modalFocusScope.forceActiveFocus();
-    }
-    modalFocusScope.Keys.onPressed: (event) => {
-        switch (event.key) {
-        case Qt.Key_Up:
-        case Qt.Key_Backtab:
-            selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
-            event.accepted = true;
-            break;
-        case Qt.Key_Down:
-        case Qt.Key_Tab:
-            selectedIndex = (selectedIndex + 1) % optionCount;
-            event.accepted = true;
-            break;
-        case Qt.Key_Return:
-        case Qt.Key_Enter:
-            const actions = ["logout", "suspend"];
-            if (SessionService.hibernateSupported) actions.push("hibernate");
-            actions.push("reboot", "poweroff");
-            if (selectedIndex < actions.length) {
-                selectOption(actions[selectedIndex]);
-            }
-            event.accepted = true;
-            break;
-        case Qt.Key_N:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex + 1) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        case Qt.Key_P:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        case Qt.Key_J:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex + 1) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        case Qt.Key_K:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        }
-    }
-
-    content: Component {
-        Item {
-            anchors.fill: parent
-            implicitHeight: mainColumn.implicitHeight + Theme.spacingL * 2
-
-            Column {
-                id: mainColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingM
-
-                Row {
-                    width: parent.width
-
-                    StyledText {
-                        text: I18n.tr("Power Options")
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    Item {
-                        width: parent.width - 150
-                        height: 1
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                            return close();
-                        }
-                    }
-
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (selectedIndex === 0) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (logoutArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === 0 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 0 ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "logout"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Log Out")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: logoutArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = 0;
-                                selectOption("logout");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (selectedIndex === 1) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (suspendArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === 1 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 1 ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "bedtime"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Suspend")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: suspendArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = 1;
-                                selectOption("suspend");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (selectedIndex === 2) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (hibernateArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === 2 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 2 ? 1 : 0
-                        visible: SessionService.hibernateSupported
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "ac_unit"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Hibernate")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: hibernateArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = 2;
-                                selectOption("hibernate");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            const rebootIndex = SessionService.hibernateSupported ? 3 : 2;
-                            if (selectedIndex === rebootIndex) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (rebootArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === (SessionService.hibernateSupported ? 3 : 2) ? Theme.primary : "transparent"
-                        border.width: selectedIndex === (SessionService.hibernateSupported ? 3 : 2) ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "restart_alt"
-                                size: Theme.iconSize
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Reboot")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: rebootArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = SessionService.hibernateSupported ? 3 : 2;
-                                selectOption("reboot");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            const powerOffIndex = SessionService.hibernateSupported ? 4 : 3;
-                            if (selectedIndex === powerOffIndex) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (powerOffArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === (SessionService.hibernateSupported ? 4 : 3) ? Theme.primary : "transparent"
-                        border.width: selectedIndex === (SessionService.hibernateSupported ? 4 : 3) ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "power_settings_new"
-                                size: Theme.iconSize
-                                color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Power Off")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: powerOffArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = SessionService.hibernateSupported ? 4 : 3;
-                                selectOption("poweroff");
-                            }
-                        }
-
-                    }
-
-                }
-
-                Item {
-                    height: Theme.spacingS
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modals/Settings/PowerSettings.qml

@@ -1,242 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: powerTab
-
-    DankFlickable {
-        anchors.fill: parent
-        anchors.topMargin: Theme.spacingL
-        clip: true
-        contentHeight: mainColumn.height
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-            width: parent.width
-            spacing: Theme.spacingXL
-
-            StyledText {
-                text: I18n.tr("Battery not detected - only AC power settings available")
-                font.pixelSize: Theme.fontSizeMedium
-                color: Theme.surfaceVariantText
-                visible: !BatteryService.batteryAvailable
-            }
-
-            StyledRect {
-                width: parent.width
-                height: timeoutSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: timeoutSection
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "schedule"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Idle Settings")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Item {
-                            width: Math.max(0, parent.width - parent.children[0].width - parent.children[1].width - powerCategory.width - Theme.spacingM * 3)
-                            height: parent.height
-                        }
-
-                        DankButtonGroup {
-                            id: powerCategory
-                            anchors.verticalCenter: parent.verticalCenter
-                            visible: BatteryService.batteryAvailable
-                            model: ["AC Power", "Battery"]
-                            currentIndex: 0
-                            selectionMode: "single"
-                            checkEnabled: false
-                        }
-                    }
-
-                    DankDropdown {
-                        id: lockDropdown
-                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
-                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]
-
-                        text: I18n.tr("Automatically lock after")
-                        options: timeoutOptions
-
-                        Connections {
-                            target: powerCategory
-                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acLockTimeout : SessionData.batteryLockTimeout
-                                const index = lockDropdown.timeoutValues.indexOf(currentTimeout)
-                                lockDropdown.currentValue = index >= 0 ? lockDropdown.timeoutOptions[index] : "Never"
-                            }
-                        }
-
-                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acLockTimeout : SessionData.batteryLockTimeout
-                            const index = timeoutValues.indexOf(currentTimeout)
-                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
-                        }
-
-                        onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
-                                    SessionData.setAcLockTimeout(timeout)
-                                } else {
-                                    SessionData.setBatteryLockTimeout(timeout)
-                                }
-                            }
-                        }
-                    }
-
-                    DankDropdown {
-                        id: monitorDropdown
-                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
-                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]
-
-                        text: I18n.tr("Turn off monitors after")
-                        options: timeoutOptions
-
-                        Connections {
-                            target: powerCategory
-                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acMonitorTimeout : SessionData.batteryMonitorTimeout
-                                const index = monitorDropdown.timeoutValues.indexOf(currentTimeout)
-                                monitorDropdown.currentValue = index >= 0 ? monitorDropdown.timeoutOptions[index] : "Never"
-                            }
-                        }
-
-                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acMonitorTimeout : SessionData.batteryMonitorTimeout
-                            const index = timeoutValues.indexOf(currentTimeout)
-                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
-                        }
-
-                        onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
-                                    SessionData.setAcMonitorTimeout(timeout)
-                                } else {
-                                    SessionData.setBatteryMonitorTimeout(timeout)
-                                }
-                            }
-                        }
-                    }
-
-                    DankDropdown {
-                        id: suspendDropdown
-                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
-                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]
-
-                        text: I18n.tr("Suspend system after")
-                        options: timeoutOptions
-
-                        Connections {
-                            target: powerCategory
-                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acSuspendTimeout : SessionData.batterySuspendTimeout
-                                const index = suspendDropdown.timeoutValues.indexOf(currentTimeout)
-                                suspendDropdown.currentValue = index >= 0 ? suspendDropdown.timeoutOptions[index] : "Never"
-                            }
-                        }
-
-                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acSuspendTimeout : SessionData.batterySuspendTimeout
-                            const index = timeoutValues.indexOf(currentTimeout)
-                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
-                        }
-
-                        onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
-                                    SessionData.setAcSuspendTimeout(timeout)
-                                } else {
-                                    SessionData.setBatterySuspendTimeout(timeout)
-                                }
-                            }
-                        }
-                    }
-
-                    DankDropdown {
-                        id: hibernateDropdown
-                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
-                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]
-
-                        text: I18n.tr("Hibernate system after")
-                        options: timeoutOptions
-                        visible: SessionService.hibernateSupported
-
-                        Connections {
-                            target: powerCategory
-                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acHibernateTimeout : SessionData.batteryHibernateTimeout
-                                const index = hibernateDropdown.timeoutValues.indexOf(currentTimeout)
-                                hibernateDropdown.currentValue = index >= 0 ? hibernateDropdown.timeoutOptions[index] : "Never"
-                            }
-                        }
-
-                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acHibernateTimeout : SessionData.batteryHibernateTimeout
-                            const index = timeoutValues.indexOf(currentTimeout)
-                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
-                        }
-
-                        onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
-                                    SessionData.setAcHibernateTimeout(timeout)
-                                } else {
-                                    SessionData.setBatteryHibernateTimeout(timeout)
-                                }
-                            }
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Lock before suspend")
-                        description: "Automatically lock the screen when the system prepares to suspend"
-                        checked: SessionData.lockBeforeSuspend
-                        onToggled: checked => SessionData.setLockBeforeSuspend(checked)
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Idle monitoring not supported - requires newer Quickshell version")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.error
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        visible: !IdleService.idleMonitorAvailable
-                    }
-                }
-            }
-
-        }
-    }
-}

Modals/Settings/SettingsSidebar.qml

@@ -1,139 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Settings
-import qs.Widgets
-
-Rectangle {
-    id: sidebarContainer
-
-    property int currentIndex: 0
-    property var parentModal: null
-    readonly property var sidebarItems: [{
-        "text": I18n.tr("Personalization"),
-        "icon": "person"
-    }, {
-        "text": I18n.tr("Time & Date"),
-        "icon": "schedule"
-    }, {
-        "text": I18n.tr("Weather"),
-        "icon": "cloud"
-    }, {
-        "text": I18n.tr("Dank Bar"),
-        "icon": "toolbar"
-    }, {
-        "text": I18n.tr("Widgets"),
-        "icon": "widgets"
-    }, {
-        "text": I18n.tr("Dock"),
-        "icon": "dock_to_bottom"
-    }, {
-        "text": I18n.tr("Displays"),
-        "icon": "monitor"
-    }, {
-        "text": I18n.tr("Launcher"),
-        "icon": "apps"
-    }, {
-        "text": I18n.tr("Theme & Colors"),
-        "icon": "palette"
-    }, {
-        "text": I18n.tr("Power"),
-        "icon": "power_settings_new"
-    }, {
-        "text": I18n.tr("Plugins"),
-        "icon": "extension"
-    }, {
-        "text": I18n.tr("About"),
-        "icon": "info"
-    }]
-
-    width: 270
-    height: parent.height
-    color: Theme.surfaceContainer
-    radius: Theme.cornerRadius
-
-    Column {
-        anchors.fill: parent
-        anchors.leftMargin: Theme.spacingS
-        anchors.rightMargin: Theme.spacingS
-        anchors.bottomMargin: Theme.spacingS
-        anchors.topMargin: Theme.spacingM + 2
-        spacing: Theme.spacingXS
-
-        ProfileSection {
-            parentModal: sidebarContainer.parentModal
-        }
-
-        Rectangle {
-            width: parent.width - Theme.spacingS * 2
-            height: 1
-            color: Theme.outline
-            opacity: 0.2
-        }
-
-        Item {
-            width: parent.width
-            height: Theme.spacingL
-        }
-
-        Repeater {
-            id: sidebarRepeater
-
-            model: sidebarContainer.sidebarItems
-
-            Rectangle {
-                property bool isActive: sidebarContainer.currentIndex === index
-
-                width: parent.width - Theme.spacingS * 2
-                height: 44
-                radius: Theme.cornerRadius
-                color: isActive ? Theme.primary : tabMouseArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                Row {
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.spacingM
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingM
-
-                    DankIcon {
-                        name: modelData.icon || ""
-                        size: Theme.iconSize - 2
-                        color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: modelData.text || ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
-                        font.weight: parent.parent.isActive ? Font.Medium : Font.Normal
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                }
-
-                MouseArea {
-                    id: tabMouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: () => {
-                        sidebarContainer.currentIndex = index;
-                    }
-                }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modals/Spotlight/SpotlightContent.qml

@@ -1,243 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Modals.Spotlight
-import qs.Modules.AppDrawer
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: spotlightKeyHandler
-
-    property alias appLauncher: appLauncher
-    property alias searchField: searchField
-    property var parentModal: null
-
-    function resetScroll() {
-        resultsView.resetScroll()
-    }
-
-    anchors.fill: parent
-    focus: true
-    clip: false
-    Keys.onPressed: event => {
-                        if (event.key === Qt.Key_Escape) {
-                            if (parentModal)
-                            parentModal.hide()
-
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Down) {
-                            appLauncher.selectNext()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Up) {
-                            appLauncher.selectPrevious()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Right && appLauncher.viewMode === "grid") {
-                            appLauncher.selectNextInRow()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Left && appLauncher.viewMode === "grid") {
-                            appLauncher.selectPreviousInRow()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_J && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectNext()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectPrevious()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_L && event.modifiers & Qt.ControlModifier && appLauncher.viewMode === "grid") {
-                            appLauncher.selectNextInRow()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_H && event.modifiers & Qt.ControlModifier && appLauncher.viewMode === "grid") {
-                            appLauncher.selectPreviousInRow()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Tab) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectNextInRow()
-                            } else {
-                                appLauncher.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Backtab) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectPreviousInRow()
-                            } else {
-                                appLauncher.selectPrevious()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectNextInRow()
-                            } else {
-                                appLauncher.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectPreviousInRow()
-                            } else {
-                                appLauncher.selectPrevious()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                            appLauncher.launchSelected()
-                            event.accepted = true
-                        }
-                    }
-
-    AppLauncher {
-        id: appLauncher
-
-        viewMode: SettingsData.spotlightModalViewMode
-        gridColumns: 4
-        onAppLaunched: () => {
-                           if (parentModal)
-                           parentModal.hide()
-                       }
-        onViewModeSelected: mode => {
-                                SettingsData.setSpotlightModalViewMode(mode)
-                            }
-    }
-
-    Column {
-        anchors.fill: parent
-        anchors.margins: Theme.spacingM
-        spacing: Theme.spacingM
-        clip: false
-
-        Row {
-            width: parent.width
-            spacing: Theme.spacingM
-            leftPadding: Theme.spacingS
-
-            DankTextField {
-                id: searchField
-
-                width: parent.width - 80 - Theme.spacingL
-                height: 56
-                cornerRadius: Theme.cornerRadius
-                backgroundColor: Theme.surfaceContainerHigh
-                normalBorderColor: Theme.outlineMedium
-                focusedBorderColor: Theme.primary
-                leftIconName: "search"
-                leftIconSize: Theme.iconSize
-                leftIconColor: Theme.surfaceVariantText
-                leftIconFocusedColor: Theme.primary
-                showClearButton: true
-                textColor: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeLarge
-                enabled: parentModal ? parentModal.spotlightOpen : true
-                placeholderText: ""
-                ignoreLeftRightKeys: appLauncher.viewMode !== "list"
-                keyForwardTargets: [spotlightKeyHandler]
-                text: appLauncher.searchQuery
-                onTextEdited: () => {
-                                  appLauncher.searchQuery = text
-                              }
-                Keys.onPressed: event => {
-                                    if (event.key === Qt.Key_Escape) {
-                                        if (parentModal)
-                                        parentModal.hide()
-
-                                        event.accepted = true
-                                    } else if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length > 0) {
-                                        if (appLauncher.keyboardNavigationActive && appLauncher.model.count > 0)
-                                        appLauncher.launchSelected()
-                                        else if (appLauncher.model.count > 0)
-                                        appLauncher.launchApp(appLauncher.model.get(0))
-                                        event.accepted = true
-                                    } else if (event.key === Qt.Key_Down || event.key === Qt.Key_Up || event.key === Qt.Key_Left || event.key === Qt.Key_Right || event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab || ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length === 0)) {
-                                        event.accepted = false
-                                    }
-                                }
-            }
-
-            Row {
-                spacing: Theme.spacingXS
-                visible: appLauncher.model.count > 0
-                anchors.verticalCenter: parent.verticalCenter
-
-                Rectangle {
-                    width: 36
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: appLauncher.viewMode === "list" ? Theme.primaryHover : listViewArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: "view_list"
-                        size: 18
-                        color: appLauncher.viewMode === "list" ? Theme.primary : Theme.surfaceText
-                    }
-
-                    MouseArea {
-                        id: listViewArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: () => {
-                                       appLauncher.setViewMode("list")
-                                   }
-                    }
-                }
-
-                Rectangle {
-                    width: 36
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: appLauncher.viewMode === "grid" ? Theme.primaryHover : gridViewArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: "grid_view"
-                        size: 18
-                        color: appLauncher.viewMode === "grid" ? Theme.primary : Theme.surfaceText
-                    }
-
-                    MouseArea {
-                        id: gridViewArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: () => {
-                                       appLauncher.setViewMode("grid")
-                                   }
-                    }
-                }
-            }
-        }
-
-        SpotlightResults {
-            id: resultsView
-            appLauncher: spotlightKeyHandler.appLauncher
-            contextMenu: contextMenu
-        }
-    }
-
-    SpotlightContextMenu {
-        id: contextMenu
-
-        appLauncher: spotlightKeyHandler.appLauncher
-        parentHandler: spotlightKeyHandler
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        visible: contextMenu.visible
-        z: 999
-        onClicked: () => {
-                       contextMenu.hide()
-                   }
-
-        MouseArea {
-
-            // Prevent closing when clicking on the menu itself
-            x: contextMenu.x
-            y: contextMenu.y
-            width: contextMenu.width
-            height: contextMenu.height
-            onClicked: () => {}
-        }
-    }
-}

Modals/Spotlight/SpotlightModal.qml

@@ -1,118 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import Quickshell.Widgets
-import qs.Common
-import qs.Modals.Common
-import qs.Modules.AppDrawer
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: spotlightModal
-
-    property bool spotlightOpen: false
-    property Component spotlightContent
-
-    function show() {
-        spotlightOpen = true
-        open()
-
-        Qt.callLater(() => {
-            if (contentLoader.item && contentLoader.item.searchField) {
-                contentLoader.item.searchField.forceActiveFocus()
-            }
-        })
-    }
-
-    function hide() {
-        spotlightOpen = false
-        close()
-    }
-
-    onDialogClosed: {
-        if (contentLoader.item) {
-            if (contentLoader.item.appLauncher) {
-                contentLoader.item.appLauncher.searchQuery = ""
-                contentLoader.item.appLauncher.selectedIndex = 0
-                contentLoader.item.appLauncher.setCategory(I18n.tr("All"))
-            }
-            if (contentLoader.item.resetScroll) {
-                contentLoader.item.resetScroll()
-            }
-            if (contentLoader.item.searchField) {
-                contentLoader.item.searchField.text = ""
-            }
-        }
-    }
-
-    function toggle() {
-        if (spotlightOpen) {
-            hide()
-        } else {
-            show()
-        }
-    }
-
-    shouldBeVisible: spotlightOpen
-    width: 550
-    height: 700
-    backgroundColor: Theme.popupBackground()
-    cornerRadius: Theme.cornerRadius
-    borderColor: Theme.outlineMedium
-    borderWidth: 1
-    enableShadow: true
-    keepContentLoaded: true
-    onVisibleChanged: () => {
-                          if (visible && !spotlightOpen) {
-                              show()
-                          }
-                          if (visible && contentLoader.item) {
-                              Qt.callLater(() => {
-                                               if (contentLoader.item.searchField) {
-                                                   contentLoader.item.searchField.forceActiveFocus()
-                                               }
-                                           })
-                          }
-                      }
-    onBackgroundClicked: () => {
-                             return hide()
-                         }
-    content: spotlightContent
-
-    Connections {
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== spotlightModal && !allowStacking && spotlightOpen) {
-                spotlightOpen = false
-            }
-        }
-
-        target: ModalManager
-    }
-
-    IpcHandler {
-        function open(): string  {
-            spotlightModal.show()
-            return "SPOTLIGHT_OPEN_SUCCESS"
-        }
-
-        function close(): string  {
-            spotlightModal.hide()
-            return "SPOTLIGHT_CLOSE_SUCCESS"
-        }
-
-        function toggle(): string  {
-            spotlightModal.toggle()
-            return "SPOTLIGHT_TOGGLE_SUCCESS"
-        }
-
-        target: "spotlight"
-    }
-
-    spotlightContent: Component {
-        SpotlightContent {
-            parentModal: spotlightModal
-        }
-    }
-}

Modals/Spotlight/SpotlightResults.qml

@@ -1,326 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Widgets
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: resultsContainer
-
-    property var appLauncher: null
-    property var contextMenu: null
-
-    function resetScroll() {
-        resultsList.contentY = 0
-        resultsGrid.contentY = 0
-    }
-
-    width: parent.width
-    height: parent.height - y
-    radius: Theme.cornerRadius
-    color: "transparent"
-    clip: true
-
-    DankListView {
-        id: resultsList
-
-        property int itemHeight: 60
-        property int iconSize: 40
-        property bool showDescription: true
-        property int itemSpacing: Theme.spacingS
-        property bool hoverUpdatesSelection: false
-        property bool keyboardNavigationActive: appLauncher ? appLauncher.keyboardNavigationActive : false
-
-        signal keyboardNavigationReset
-        signal itemClicked(int index, var modelData)
-        signal itemRightClicked(int index, var modelData, real mouseX, real mouseY)
-
-        function ensureVisible(index) {
-            if (index < 0 || index >= count)
-                return
-
-            const itemY = index * (itemHeight + itemSpacing)
-            const itemBottom = itemY + itemHeight
-            if (itemY < contentY)
-                contentY = itemY
-            else if (itemBottom > contentY + height)
-                contentY = itemBottom - height
-        }
-
-        anchors.fill: parent
-        anchors.margins: Theme.spacingS
-        visible: appLauncher && appLauncher.viewMode === "list"
-        model: appLauncher ? appLauncher.model : null
-        currentIndex: appLauncher ? appLauncher.selectedIndex : -1
-        clip: true
-        spacing: itemSpacing
-        focus: true
-        interactive: true
-        cacheBuffer: Math.max(0, Math.min(height * 2, 1000))
-        reuseItems: true
-        onCurrentIndexChanged: {
-            if (keyboardNavigationActive)
-                ensureVisible(currentIndex)
-        }
-        onItemClicked: (index, modelData) => {
-                           if (appLauncher)
-                           appLauncher.launchApp(modelData)
-                       }
-        onItemRightClicked: (index, modelData, mouseX, mouseY) => {
-                                if (contextMenu)
-                                contextMenu.show(mouseX, mouseY, modelData)
-                            }
-        onKeyboardNavigationReset: () => {
-                                       if (appLauncher)
-                                       appLauncher.keyboardNavigationActive = false
-                                   }
-
-        delegate: Rectangle {
-            width: ListView.view.width
-            height: resultsList.itemHeight
-            radius: Theme.cornerRadius
-            color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-            Row {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingL
-
-                Item {
-                    width: resultsList.iconSize
-                    height: resultsList.iconSize
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    IconImage {
-                        id: listIconImg
-
-                        anchors.fill: parent
-                        source: Quickshell.iconPath(model.icon, true)
-                        asynchronous: true
-                        visible: status === Image.Ready
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !listIconImg.visible
-                        color: Theme.surfaceLight
-                        radius: Theme.cornerRadius
-                        border.width: 1
-                        border.color: Theme.primarySelected
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                            font.pixelSize: resultsList.iconSize * 0.4
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                        }
-                    }
-                }
-
-                Column {
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: parent.width - resultsList.iconSize - Theme.spacingL
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        width: parent.width
-                        text: model.name || ""
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        elide: Text.ElideRight
-                    }
-
-                    StyledText {
-                        width: parent.width
-                        text: model.comment || "Application"
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceVariantText
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                        visible: resultsList.showDescription && model.comment && model.comment.length > 0
-                    }
-                }
-            }
-
-            MouseArea {
-                id: listMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                z: 10
-                onEntered: () => {
-                               if (resultsList.hoverUpdatesSelection && !resultsList.keyboardNavigationActive)
-                               resultsList.currentIndex = index
-                           }
-                onPositionChanged: () => {
-                                       resultsList.keyboardNavigationReset()
-                                   }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   resultsList.itemClicked(index, model)
-                               } else if (mouse.button === Qt.RightButton) {
-                                   const globalPos = mapToItem(null, mouse.x, mouse.y)
-                                   const modalPos = resultsContainer.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                   resultsList.itemRightClicked(index, model, modalPos.x, modalPos.y)
-                               }
-                           }
-            }
-        }
-    }
-
-    DankGridView {
-        id: resultsGrid
-
-        property int currentIndex: appLauncher ? appLauncher.selectedIndex : -1
-        property int columns: 4
-        property bool adaptiveColumns: false
-        property int minCellWidth: 120
-        property int maxCellWidth: 160
-        property int cellPadding: 8
-        property real iconSizeRatio: 0.55
-        property int maxIconSize: 48
-        property int minIconSize: 32
-        property bool hoverUpdatesSelection: false
-        property bool keyboardNavigationActive: appLauncher ? appLauncher.keyboardNavigationActive : false
-        property int baseCellWidth: adaptiveColumns ? Math.max(minCellWidth, Math.min(maxCellWidth, width / columns)) : (width - Theme.spacingS * 2) / columns
-        property int baseCellHeight: baseCellWidth + 20
-        property int actualColumns: adaptiveColumns ? Math.floor(width / cellWidth) : columns
-        property int remainingSpace: width - (actualColumns * cellWidth)
-
-        signal keyboardNavigationReset
-        signal itemClicked(int index, var modelData)
-        signal itemRightClicked(int index, var modelData, real mouseX, real mouseY)
-
-        function ensureVisible(index) {
-            if (index < 0 || index >= count)
-                return
-
-            const itemY = Math.floor(index / actualColumns) * cellHeight
-            const itemBottom = itemY + cellHeight
-            if (itemY < contentY)
-                contentY = itemY
-            else if (itemBottom > contentY + height)
-                contentY = itemBottom - height
-        }
-
-        anchors.fill: parent
-        anchors.margins: Theme.spacingS
-        visible: appLauncher && appLauncher.viewMode === "grid"
-        model: appLauncher ? appLauncher.model : null
-        clip: true
-        cellWidth: baseCellWidth
-        cellHeight: baseCellHeight
-        leftMargin: Math.max(Theme.spacingS, remainingSpace / 2)
-        rightMargin: leftMargin
-        focus: true
-        interactive: true
-        cacheBuffer: Math.max(0, Math.min(height * 2, 1000))
-        reuseItems: true
-        onCurrentIndexChanged: {
-            if (keyboardNavigationActive)
-                ensureVisible(currentIndex)
-        }
-        onItemClicked: (index, modelData) => {
-                           if (appLauncher)
-                           appLauncher.launchApp(modelData)
-                       }
-        onItemRightClicked: (index, modelData, mouseX, mouseY) => {
-                                if (contextMenu)
-                                contextMenu.show(mouseX, mouseY, modelData)
-                            }
-        onKeyboardNavigationReset: () => {
-                                       if (appLauncher)
-                                       appLauncher.keyboardNavigationActive = false
-                                   }
-
-        delegate: Rectangle {
-            width: resultsGrid.cellWidth - resultsGrid.cellPadding
-            height: resultsGrid.cellHeight - resultsGrid.cellPadding
-            radius: Theme.cornerRadius
-            color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-            Column {
-                anchors.centerIn: parent
-                spacing: Theme.spacingS
-
-                Item {
-                    property int iconSize: Math.min(resultsGrid.maxIconSize, Math.max(resultsGrid.minIconSize, resultsGrid.cellWidth * resultsGrid.iconSizeRatio))
-
-                    width: iconSize
-                    height: iconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    IconImage {
-                        id: gridIconImg
-
-                        anchors.fill: parent
-                        source: Quickshell.iconPath(model.icon, true)
-                        smooth: true
-                        asynchronous: true
-                        visible: status === Image.Ready
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !gridIconImg.visible
-                        color: Theme.surfaceLight
-                        radius: Theme.cornerRadius
-                        border.width: 1
-                        border.color: Theme.primarySelected
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                            font.pixelSize: Math.min(28, parent.width * 0.5)
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                        }
-                    }
-                }
-
-                StyledText {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    width: resultsGrid.cellWidth - 12
-                    text: model.name || ""
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    horizontalAlignment: Text.AlignHCenter
-                    maximumLineCount: 2
-                    wrapMode: Text.WordWrap
-                }
-            }
-
-            MouseArea {
-                id: gridMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                z: 10
-                onEntered: () => {
-                               if (resultsGrid.hoverUpdatesSelection && !resultsGrid.keyboardNavigationActive)
-                               resultsGrid.currentIndex = index
-                           }
-                onPositionChanged: () => {
-                                       resultsGrid.keyboardNavigationReset()
-                                   }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   resultsGrid.itemClicked(index, model)
-                               } else if (mouse.button === Qt.RightButton) {
-                                   const globalPos = mapToItem(null, mouse.x, mouse.y)
-                                   const modalPos = resultsContainer.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                   resultsGrid.itemRightClicked(index, model, modalPos.x, modalPos.y)
-                               }
-                           }
-            }
-        }
-    }
-}

Modules/AppDrawer/AppLauncher.qml

@@ -1,175 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    property string searchQuery: ""
-    property string selectedCategory: I18n.tr("All")
-    property string viewMode: "list" // "list" or "grid"
-    property int selectedIndex: 0
-    property int maxResults: 50
-    property int gridColumns: 4
-    property bool debounceSearch: true
-    property int debounceInterval: 50
-    property bool keyboardNavigationActive: false
-    property bool suppressUpdatesWhileLaunching: false
-    readonly property var categories: {
-        const allCategories = AppSearchService.getAllCategories().filter(cat => cat !== "Education" && cat !== "Science")
-        const result = [I18n.tr("All")]
-        return result.concat(allCategories.filter(cat => cat !== I18n.tr("All")))
-    }
-    readonly property var categoryIcons: categories.map(category => AppSearchService.getCategoryIcon(category))
-    property var appUsageRanking: AppUsageHistoryData.appUsageRanking || {}
-    property alias model: filteredModel
-    property var _watchApplications: AppSearchService.applications
-
-    signal appLaunched(var app)
-    signal categorySelected(string category)
-    signal viewModeSelected(string mode)
-
-    function updateFilteredModel() {
-        if (suppressUpdatesWhileLaunching) {
-            suppressUpdatesWhileLaunching = false
-            return
-        }
-        filteredModel.clear()
-        selectedIndex = 0
-        keyboardNavigationActive = false
-
-        let apps = []
-        const allCategory = I18n.tr("All")
-        if (searchQuery.length === 0) {
-            apps = selectedCategory === allCategory ? AppSearchService.getAppsInCategory(allCategory) : AppSearchService.getAppsInCategory(selectedCategory).slice(0, maxResults)
-        } else {
-            if (selectedCategory === allCategory) {
-                apps = AppSearchService.searchApplications(searchQuery)
-            } else {
-                const categoryApps = AppSearchService.getAppsInCategory(selectedCategory)
-                if (categoryApps.length > 0) {
-                    const allSearchResults = AppSearchService.searchApplications(searchQuery)
-                    const categoryNames = new Set(categoryApps.map(app => app.name))
-                    apps = allSearchResults.filter(searchApp => categoryNames.has(searchApp.name)).slice(0, maxResults)
-                } else {
-                    apps = []
-                }
-            }
-        }
-
-        if (searchQuery.length === 0) {
-            apps = apps.sort((a, b) => {
-                                 const aId = a.id || a.execString || a.exec || ""
-                                 const bId = b.id || b.execString || b.exec || ""
-                                 const aUsage = appUsageRanking[aId] ? appUsageRanking[aId].usageCount : 0
-                                 const bUsage = appUsageRanking[bId] ? appUsageRanking[bId].usageCount : 0
-                                 if (aUsage !== bUsage) {
-                                     return bUsage - aUsage
-                                 }
-                                 return (a.name || "").localeCompare(b.name || "")
-                             })
-        }
-
-        apps.forEach(app => {
-                         if (app) {
-                             filteredModel.append({
-                                                      "name": app.name || "",
-                                                      "exec": app.execString || "",
-                                                      "icon": app.icon || "application-x-executable",
-                                                      "comment": app.comment || "",
-                                                      "categories": app.categories || [],
-                                                      "desktopEntry": app
-                                                  })
-                         }
-                     })
-    }
-
-    function selectNext() {
-        if (filteredModel.count === 0) {
-            return
-        }
-        keyboardNavigationActive = true
-        selectedIndex = viewMode === "grid" ? Math.min(selectedIndex + gridColumns, filteredModel.count - 1) : Math.min(selectedIndex + 1, filteredModel.count - 1)
-    }
-
-    function selectPrevious() {
-        if (filteredModel.count === 0) {
-            return
-        }
-        keyboardNavigationActive = true
-        selectedIndex = viewMode === "grid" ? Math.max(selectedIndex - gridColumns, 0) : Math.max(selectedIndex - 1, 0)
-    }
-
-    function selectNextInRow() {
-        if (filteredModel.count === 0 || viewMode !== "grid") {
-            return
-        }
-        keyboardNavigationActive = true
-        selectedIndex = Math.min(selectedIndex + 1, filteredModel.count - 1)
-    }
-
-    function selectPreviousInRow() {
-        if (filteredModel.count === 0 || viewMode !== "grid") {
-            return
-        }
-        keyboardNavigationActive = true
-        selectedIndex = Math.max(selectedIndex - 1, 0)
-    }
-
-    function launchSelected() {
-        if (filteredModel.count === 0 || selectedIndex < 0 || selectedIndex >= filteredModel.count) {
-            return
-        }
-        const selectedApp = filteredModel.get(selectedIndex)
-        launchApp(selectedApp)
-    }
-
-    function launchApp(appData) {
-        if (!appData) {
-            return
-        }
-        suppressUpdatesWhileLaunching = true
-        SessionService.launchDesktopEntry(appData.desktopEntry)
-        appLaunched(appData)
-        AppUsageHistoryData.addAppUsage(appData.desktopEntry)
-    }
-
-    function setCategory(category) {
-        selectedCategory = category
-        categorySelected(category)
-    }
-
-    function setViewMode(mode) {
-        viewMode = mode
-        viewModeSelected(mode)
-    }
-
-    onSearchQueryChanged: {
-        if (debounceSearch) {
-            searchDebounceTimer.restart()
-        } else {
-            updateFilteredModel()
-        }
-    }
-    onSelectedCategoryChanged: updateFilteredModel()
-    onAppUsageRankingChanged: updateFilteredModel()
-    on_WatchApplicationsChanged: updateFilteredModel()
-    Component.onCompleted: {
-        updateFilteredModel()
-    }
-
-    ListModel {
-        id: filteredModel
-    }
-
-    Timer {
-        id: searchDebounceTimer
-
-        interval: root.debounceInterval
-        repeat: false
-        onTriggered: updateFilteredModel()
-    }
-}

Modules/ControlCenter/Details/NetworkDetail.qml

@@ -1,454 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modals
-
-Rectangle {
-    implicitHeight: {
-        if (NetworkService.wifiToggling) {
-            return headerRow.height + wifiToggleContent.height + Theme.spacingM
-        }
-        if (NetworkService.wifiEnabled) {
-            return headerRow.height + wifiContent.height + Theme.spacingM
-        }
-        return headerRow.height + wifiOffContent.height + Theme.spacingM
-    }
-    radius: Theme.cornerRadius
-    color: Theme.surfaceContainerHigh
-    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-
-    Component.onCompleted: {
-        NetworkService.addRef()
-    }
-
-    Component.onDestruction: {
-        NetworkService.removeRef()
-    }
-    
-    Row {
-        id: headerRow
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.leftMargin: Theme.spacingM
-        anchors.rightMargin: Theme.spacingM
-        anchors.topMargin: Theme.spacingS
-        height: 40
-        
-        StyledText {
-            id: headerText
-            text: I18n.tr("Network Settings")
-            font.pixelSize: Theme.fontSizeLarge
-            color: Theme.surfaceText
-            font.weight: Font.Medium
-            anchors.verticalCenter: parent.verticalCenter
-        }
-        
-        Item {
-            width: Math.max(0, parent.width - headerText.implicitWidth - preferenceControls.width - Theme.spacingM)
-            height: parent.height
-        }
-        
-        DankButtonGroup {
-            id: preferenceControls
-            anchors.verticalCenter: parent.verticalCenter
-            visible: NetworkService.ethernetConnected
-
-            property int currentPreferenceIndex: {
-                const pref = NetworkService.userPreference
-                const status = NetworkService.networkStatus
-                let index = 1
-
-                if (pref === "ethernet") {
-                    index = 0
-                } else if (pref === "wifi") {
-                    index = 1
-                } else {
-                    index = status === "ethernet" ? 0 : 1
-                }
-
-                return index
-            }
-
-            model: ["Ethernet", "WiFi"]
-            currentIndex: currentPreferenceIndex
-            selectionMode: "single"
-            onSelectionChanged: (index, selected) => {
-                if (!selected) return
-                console.log("NetworkDetail: Setting preference to", index === 0 ? "ethernet" : "wifi")
-                NetworkService.setNetworkPreference(index === 0 ? "ethernet" : "wifi")
-            }
-        }
-    }
-    
-    Item {
-        id: wifiToggleContent
-        anchors.top: headerRow.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: Theme.spacingM
-        anchors.topMargin: Theme.spacingM
-        visible: NetworkService.wifiToggling
-        height: visible ? 80 : 0
-
-        Column {
-            anchors.centerIn: parent
-            spacing: Theme.spacingM
-
-            DankIcon {
-                anchors.horizontalCenter: parent.horizontalCenter
-                name: "sync"
-                size: 32
-                color: Theme.primary
-
-                RotationAnimation on rotation {
-                    running: NetworkService.wifiToggling
-                    loops: Animation.Infinite
-                    from: 0
-                    to: 360
-                    duration: 1000
-                }
-            }
-
-            StyledText {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
-                font.pixelSize: Theme.fontSizeMedium
-                color: Theme.surfaceText
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-    }
-    
-    Item {
-        id: wifiOffContent
-        anchors.top: headerRow.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: Theme.spacingM
-        anchors.topMargin: Theme.spacingM
-        visible: !NetworkService.wifiEnabled && !NetworkService.wifiToggling
-        height: visible ? 120 : 0
-        
-        Column {
-            anchors.centerIn: parent
-            spacing: Theme.spacingL
-            width: parent.width
-            
-            DankIcon {
-                anchors.horizontalCenter: parent.horizontalCenter
-                name: "wifi_off"
-                size: 48
-                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
-            }
-            
-            StyledText {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: I18n.tr("WiFi is off")
-                font.pixelSize: Theme.fontSizeLarge
-                color: Theme.surfaceText
-                font.weight: Font.Medium
-                horizontalAlignment: Text.AlignHCenter
-            }
-            
-            Rectangle {
-                anchors.horizontalCenter: parent.horizontalCenter
-                width: 120
-                height: 36
-                radius: 18
-                color: enableWifiButton.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                border.width: 0
-                border.color: Theme.primary
-                
-                StyledText {
-                    anchors.centerIn: parent
-                    text: I18n.tr("Enable WiFi")
-                    color: Theme.primary
-                    font.pixelSize: Theme.fontSizeMedium
-                    font.weight: Font.Medium
-                }
-                
-                MouseArea {
-                    id: enableWifiButton
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: NetworkService.toggleWifiRadio()
-                }
-                
-            }
-        }
-    }
-
-    DankFlickable {
-        id: wifiContent
-        anchors.top: headerRow.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.margins: Theme.spacingM
-        anchors.topMargin: Theme.spacingM
-        visible: NetworkService.wifiInterface && NetworkService.wifiEnabled && !NetworkService.wifiToggling
-        contentHeight: wifiColumn.height
-        clip: true
-        
-        Column {
-            id: wifiColumn
-            width: parent.width
-            spacing: Theme.spacingS
-            
-            Item {
-                width: parent.width
-                height: 200
-                visible: NetworkService.wifiInterface && NetworkService.wifiNetworks?.length < 1 && !NetworkService.wifiToggling && NetworkService.isScanning
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "refresh"
-                    size: 48
-                    color: Qt.rgba(Theme.surfaceText.r || 0.8, Theme.surfaceText.g || 0.8, Theme.surfaceText.b || 0.8, 0.3)
-
-                    RotationAnimation on rotation {
-                        running: NetworkService.isScanning
-                        loops: Animation.Infinite
-                        from: 0
-                        to: 360
-                        duration: 1000
-                    }
-                }
-            }
-            
-            Repeater {
-                model: sortedNetworks
-
-                property var sortedNetworks: {
-                    const ssid = NetworkService.currentWifiSSID
-                    const networks = NetworkService.wifiNetworks
-                    let sorted = [...networks]
-                    sorted.sort((a, b) => {
-                        if (a.ssid === ssid) return -1
-                        if (b.ssid === ssid) return 1
-                        return b.signal - a.signal
-                    })
-                    return sorted
-                }
-                delegate: Rectangle {
-                    required property var modelData
-                    required property int index
-                    
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
-                    border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: 0
-                    
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.leftMargin: Theme.spacingM
-                        spacing: Theme.spacingS
-                        
-                        DankIcon {
-                            name: {
-                                let strength = modelData.signal || 0
-                                if (strength >= 50) return "wifi"
-                                if (strength >= 25) return "wifi_2_bar"
-                                return "wifi_1_bar"
-                            }
-                            size: Theme.iconSize - 4
-                            color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                        
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: 200
-                            
-                            StyledText {
-                                text: modelData.ssid || "Unknown Network"
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: modelData.ssid === NetworkService.currentWifiSSID ? Font.Medium : Font.Normal
-                                elide: Text.ElideRight
-                                width: parent.width
-                            }
-
-                            Row {
-                                spacing: Theme.spacingXS
-
-                                StyledText {
-                                    text: modelData.ssid === NetworkService.currentWifiSSID ? "Connected" : (modelData.secured ? "Secured" : "Open")
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceVariantText
-                                }
-                                
-                                StyledText {
-                                    text: modelData.saved ? "• Saved" : ""
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.primary
-                                    visible: text.length > 0
-                                }
-                                
-                                StyledText {
-                                    text: "• " + modelData.signal + "%"
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceVariantText
-                                }
-                            }
-                        }
-                    }
-                    
-                    DankActionButton {
-                        id: optionsButton
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        iconName: "more_horiz"
-                        buttonSize: 28
-                        onClicked: {
-                            if (networkContextMenu.visible) {
-                                networkContextMenu.close()
-                            } else {
-                                networkContextMenu.currentSSID = modelData.ssid
-                                networkContextMenu.currentSecured = modelData.secured
-                                networkContextMenu.currentConnected = modelData.ssid === NetworkService.currentWifiSSID
-                                networkContextMenu.currentSaved = modelData.saved
-                                networkContextMenu.currentSignal = modelData.signal
-                                networkContextMenu.popup(optionsButton, -networkContextMenu.width + optionsButton.width, optionsButton.height + Theme.spacingXS)
-                            }
-                        }
-                    }
-                    
-                    MouseArea {
-                        id: networkMouseArea
-                        anchors.fill: parent
-                        anchors.rightMargin: optionsButton.width + Theme.spacingS
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: function(event) {
-                            if (modelData.ssid !== NetworkService.currentWifiSSID) {
-                                if (modelData.secured && !modelData.saved) {
-                                    wifiPasswordModal.show(modelData.ssid)
-                                } else {
-                                    NetworkService.connectToWifi(modelData.ssid)
-                                }
-                            }
-                            event.accepted = true
-                        }
-                    }
-                    
-                }
-            }
-        }
-    }
-    
-    Menu {
-        id: networkContextMenu
-        width: 150
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-        
-        property string currentSSID: ""
-        property bool currentSecured: false
-        property bool currentConnected: false
-        property bool currentSaved: false
-        property int currentSignal: 0
-        
-        background: Rectangle {
-            color: Theme.popupBackground()
-            radius: Theme.cornerRadius
-            border.width: 0
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-        }
-        
-        MenuItem {
-            text: networkContextMenu.currentConnected ? "Disconnect" : "Connect"
-            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 (networkContextMenu.currentConnected) {
-                    NetworkService.disconnectWifi()
-                } else {
-                    if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
-                        wifiPasswordModal.show(networkContextMenu.currentSSID)
-                    } else {
-                        NetworkService.connectToWifi(networkContextMenu.currentSSID)
-                    }
-                }
-            }
-        }
-        
-        MenuItem {
-            text: I18n.tr("Network Info")
-            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: {
-                let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID)
-                networkInfoModal.showNetworkInfo(networkContextMenu.currentSSID, networkData)
-            }
-        }
-        
-        MenuItem {
-            text: I18n.tr("Forget Network")
-            height: networkContextMenu.currentSaved || networkContextMenu.currentConnected ? 32 : 0
-            visible: networkContextMenu.currentSaved || networkContextMenu.currentConnected
-            
-            contentItem: StyledText {
-                text: parent.text
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.error
-                leftPadding: Theme.spacingS
-                verticalAlignment: Text.AlignVCenter
-            }
-            
-            background: Rectangle {
-                color: parent.hovered ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08) : "transparent"
-                radius: Theme.cornerRadius / 2
-            }
-            
-            onTriggered: {
-                NetworkService.forgetWifiNetwork(networkContextMenu.currentSSID)
-            }
-        }
-    }
-    
-    WifiPasswordModal {
-        id: wifiPasswordModal
-    }
-
-    NetworkInfoModal {
-        id: networkInfoModal
-    }
-
-
-}

Modules/ControlCenter/PowerMenu.qml

@@ -1,316 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Widgets
-
-PanelWindow {
-    id: root
-
-    readonly property string powerOptionsText: I18n.tr("Power Options")
-    readonly property string logOutText: I18n.tr("Log Out")
-    readonly property string suspendText: I18n.tr("Suspend")
-    readonly property string rebootText: I18n.tr("Reboot")
-    readonly property string powerOffText: I18n.tr("Power Off")
-
-    property bool powerMenuVisible: false
-    signal powerActionRequested(string action, string title, string message)
-
-    visible: powerMenuVisible
-    implicitWidth: 400
-    implicitHeight: 320
-    WlrLayershell.layer: WlrLayershell.Overlay
-    WlrLayershell.exclusiveZone: -1
-    WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-    color: "transparent"
-
-    anchors {
-        top: true
-        left: true
-        right: true
-        bottom: true
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            powerMenuVisible = false
-        }
-    }
-
-    Rectangle {
-        width: Math.min(320, parent.width - Theme.spacingL * 2)
-        height: 320 // Fixed height to prevent cropping
-        x: Math.max(Theme.spacingL, parent.width - width - Theme.spacingL)
-        y: Theme.barHeight + Theme.spacingXS
-        color: Theme.popupBackground()
-        radius: Theme.cornerRadius
-        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                              Theme.outline.b, 0.08)
-        border.width: 0
-        opacity: powerMenuVisible ? 1 : 0
-        scale: powerMenuVisible ? 1 : 0.85
-
-        MouseArea {
-
-            anchors.fill: parent
-            onClicked: {
-
-            }
-        }
-
-        Column {
-            anchors.fill: parent
-            anchors.margins: Theme.spacingL
-            spacing: Theme.spacingM
-
-            Row {
-                width: parent.width
-
-                StyledText {
-                    text: root.powerOptionsText
-                    font.pixelSize: Theme.fontSizeLarge
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                Item {
-                    width: parent.width - 150
-                    height: 1
-                }
-
-                DankActionButton {
-                    iconName: "close"
-                    iconSize: Theme.iconSize - 4
-                    iconColor: Theme.surfaceText
-                    onClicked: {
-                        powerMenuVisible = false
-                    }
-                }
-            }
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingS
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: logoutArea.containsMouse ? Qt.rgba(Theme.primary.r,
-                                                              Theme.primary.g,
-                                                              Theme.primary.b,
-                                                              0.08) : Qt.rgba(
-                                                          Theme.surfaceVariant.r,
-                                                          Theme.surfaceVariant.g,
-                                                          Theme.surfaceVariant.b,
-                                                          0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "logout"
-                            size: Theme.iconSize
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.logOutText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: logoutArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "logout", "Log Out",
-                                        "Are you sure you want to log out?")
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: suspendArea.containsMouse ? Qt.rgba(Theme.primary.r,
-                                                               Theme.primary.g,
-                                                               Theme.primary.b,
-                                                               0.08) : Qt.rgba(
-                                                           Theme.surfaceVariant.r,
-                                                           Theme.surfaceVariant.g,
-                                                           Theme.surfaceVariant.b,
-                                                           0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "bedtime"
-                            size: Theme.iconSize
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.suspendText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: suspendArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "suspend", "Suspend",
-                                        "Are you sure you want to suspend the system?")
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: rebootArea.containsMouse ? Qt.rgba(Theme.warning.r,
-                                                              Theme.warning.g,
-                                                              Theme.warning.b,
-                                                              0.08) : Qt.rgba(
-                                                          Theme.surfaceVariant.r,
-                                                          Theme.surfaceVariant.g,
-                                                          Theme.surfaceVariant.b,
-                                                          0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "restart_alt"
-                            size: Theme.iconSize
-                            color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.rebootText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: rebootArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "reboot", "Reboot",
-                                        "Are you sure you want to reboot the system?")
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: powerOffArea.containsMouse ? Qt.rgba(Theme.error.r,
-                                                                Theme.error.g,
-                                                                Theme.error.b,
-                                                                0.08) : Qt.rgba(
-                                                            Theme.surfaceVariant.r,
-                                                            Theme.surfaceVariant.g,
-                                                            Theme.surfaceVariant.b,
-                                                            0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "power_settings_new"
-                            size: Theme.iconSize
-                            color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.powerOffText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: powerOffArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "poweroff", "Power Off",
-                                        "Are you sure you want to power off the system?")
-                        }
-                    }
-                }
-            }
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Theme.mediumDuration
-                easing.type: Theme.emphasizedEasing
-            }
-        }
-
-        Behavior on scale {
-            NumberAnimation {
-                duration: Theme.mediumDuration
-                easing.type: Theme.emphasizedEasing
-            }
-        }
-    }
-}

Modules/ControlCenter/Widgets/AudioInputPill.qml

@@ -1,63 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.Pipewire
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var defaultSource: AudioService.source
-
-    iconName: {
-        if (!defaultSource) return "mic_off"
-
-        let volume = defaultSource.audio.volume
-        let muted = defaultSource.audio.muted
-
-        if (muted || volume === 0.0) return "mic_off"
-        return "mic"
-    }
-
-    isActive: defaultSource && !defaultSource.audio.muted
-
-    primaryText: {
-        if (!defaultSource) {
-            return "No input device"
-        }
-        return defaultSource.description || "Audio Input"
-    }
-
-    secondaryText: {
-        if (!defaultSource) {
-            return "Select device"
-        }
-        if (defaultSource.audio.muted) {
-            return "Muted"
-        }
-        return Math.round(defaultSource.audio.volume * 100) + "%"
-    }
-
-    onToggled: {
-        if (defaultSource && defaultSource.audio) {
-            defaultSource.audio.muted = !defaultSource.audio.muted
-        }
-    }
-
-    onWheelEvent: function (wheelEvent) {
-        if (!defaultSource || !defaultSource.audio) return
-        let delta = wheelEvent.angleDelta.y
-        let currentVolume = defaultSource.audio.volume * 100
-        let newVolume
-        if (delta > 0)
-            newVolume = Math.min(100, currentVolume + 5)
-        else
-            newVolume = Math.max(0, currentVolume - 5)
-        defaultSource.audio.muted = false
-        defaultSource.audio.volume = newVolume / 100
-        wheelEvent.accepted = true
-    }
-}

Modules/ControlCenter/Widgets/AudioOutputPill.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.Pipewire
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var defaultSink: AudioService.sink
-
-    iconName: {
-        if (!defaultSink) return "volume_off"
-
-        let volume = defaultSink.audio.volume
-        let muted = defaultSink.audio.muted
-
-        if (muted || volume === 0.0) return "volume_off"
-        if (volume <= 0.33) return "volume_down"
-        if (volume <= 0.66) return "volume_up"
-        return "volume_up"
-    }
-
-    isActive: defaultSink && !defaultSink.audio.muted
-
-    primaryText: {
-        if (!defaultSink) {
-            return "No output device"
-        }
-        return defaultSink.description || "Audio Output"
-    }
-
-    secondaryText: {
-        if (!defaultSink) {
-            return "Select device"
-        }
-        if (defaultSink.audio.muted) {
-            return "Muted"
-        }
-        return Math.round(defaultSink.audio.volume * 100) + "%"
-    }
-
-    onToggled: {
-        if (defaultSink && defaultSink.audio) {
-            defaultSink.audio.muted = !defaultSink.audio.muted
-        }
-    }
-
-    onWheelEvent: function (wheelEvent) {
-        if (!defaultSink || !defaultSink.audio) return
-        let delta = wheelEvent.angleDelta.y
-        let currentVolume = defaultSink.audio.volume * 100
-        let newVolume
-        if (delta > 0)
-            newVolume = Math.min(100, currentVolume + 5)
-        else
-            newVolume = Math.max(0, currentVolume - 5)
-        defaultSink.audio.muted = false
-        defaultSink.audio.volume = newVolume / 100
-        AudioService.volumeChanged()
-        wheelEvent.accepted = true
-    }
-}

Modules/ControlCenter/Widgets/BluetoothPill.qml

@@ -1,70 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var primaryDevice: {
-        if (!BluetoothService.adapter || !BluetoothService.adapter.devices) {
-            return null
-        }
-
-        let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
-        for (let device of devices) {
-            if (device && device.connected) {
-                return device
-            }
-        }
-        return null
-    }
-
-    iconName: {
-        if (!BluetoothService.available) {
-            return "bluetooth_disabled"
-        }
-        if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
-            return "bluetooth_disabled"
-        }
-        return "bluetooth"
-    }
-
-    isActive: !!(BluetoothService.available && BluetoothService.adapter && BluetoothService.adapter.enabled)
-    showExpandArea: BluetoothService.available
-
-    primaryText: {
-        if (!BluetoothService.available) {
-            return "Bluetooth"
-        }
-        if (!BluetoothService.adapter) {
-            return "No adapter"
-        }
-        if (!BluetoothService.adapter.enabled) {
-            return "Disabled"
-        }
-        return "Enabled"
-    }
-
-    secondaryText: {
-        if (!BluetoothService.available) {
-            return "No adapters"
-        }
-        if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
-            return "Off"
-        }
-        if (primaryDevice) {
-            return primaryDevice.name || primaryDevice.alias || primaryDevice.deviceName || "Connected Device"
-        }
-        return "No devices"
-    }
-
-    onToggled: {
-        if (BluetoothService.available && BluetoothService.adapter) {
-            BluetoothService.adapter.enabled = !BluetoothService.adapter.enabled
-        }
-    }
-}

Modules/ControlCenter/Widgets/BrightnessSliderRow.qml

@@ -1,162 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Row {
-    id: root
-
-    height: 40
-    spacing: 0
-
-    Rectangle {
-        width: Theme.iconSize + Theme.spacingS * 2
-        height: Theme.iconSize + Theme.spacingS * 2
-        anchors.verticalCenter: parent.verticalCenter
-        radius: (Theme.iconSize + Theme.spacingS * 2) / 2
-        color: iconArea.containsMouse
-               ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-               : Theme.withAlpha(Theme.primary, 0)
-
-        MouseArea {
-            id: iconArea
-            anchors.fill: parent
-            hoverEnabled: true
-            cursorShape: DisplayService.devices.length > 1 ? Qt.PointingHandCursor : Qt.ArrowCursor
-
-            onClicked: function(event) {
-                if (DisplayService.devices.length > 1) {
-                    if (deviceMenu.visible) {
-                        deviceMenu.close()
-                    } else {
-                        deviceMenu.popup(iconArea, 0, iconArea.height + Theme.spacingXS)
-                    }
-                    event.accepted = true
-                }
-            }
-
-            onEntered: {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    const tooltipText = DisplayService.currentDevice ? "bl device: " + DisplayService.currentDevice : "Backlight Control"
-                    const p = iconArea.mapToItem(null, iconArea.width / 2, 0)
-                    tooltipLoader.item.show(tooltipText, p.x, p.y - 40, null)
-                }
-            }
-
-            onExited: {
-                if (tooltipLoader.item) {
-                    tooltipLoader.item.hide()
-                }
-                tooltipLoader.active = false
-            }
-
-            DankIcon {
-                anchors.centerIn: parent
-                name: {
-                    if (!DisplayService.brightnessAvailable) return "brightness_low"
-
-                    let brightness = DisplayService.brightnessLevel
-                    if (brightness <= 33) return "brightness_low"
-                    if (brightness <= 66) return "brightness_medium"
-                    return "brightness_high"
-                }
-                size: Theme.iconSize
-                color: DisplayService.brightnessAvailable && DisplayService.brightnessLevel > 0 ? Theme.primary : Theme.surfaceText
-            }
-        }
-    }
-
-    DankSlider {
-        anchors.verticalCenter: parent.verticalCenter
-        width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
-        enabled: DisplayService.brightnessAvailable
-        minimum: 1
-        maximum: 100
-        value: {
-            let level = DisplayService.brightnessLevel
-            if (level > 100) {
-                let deviceInfo = DisplayService.getCurrentDeviceInfo()
-                if (deviceInfo && deviceInfo.max > 0) {
-                    return Math.round((level / deviceInfo.max) * 100)
-                }
-                return 50
-            }
-            return level
-        }
-        onSliderValueChanged: function(newValue) {
-            if (DisplayService.brightnessAvailable) {
-                DisplayService.setBrightness(newValue)
-            }
-        }
-        thumbOutlineColor: Theme.surfaceContainer
-        trackColor: Theme.surfaceContainerHigh
-    }
-
-    Menu {
-        id: deviceMenu
-        width: 200
-        closePolicy: Popup.CloseOnEscape
-        
-        background: Rectangle {
-            color: Theme.popupBackground()
-            radius: Theme.cornerRadius
-            border.width: 0
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-        }
-        
-        Instantiator {
-            model: DisplayService.devices
-            delegate: MenuItem {
-                required property var modelData
-                required property int index
-                
-                property string deviceName: modelData.name || ""
-                property string deviceClass: modelData.class || ""
-                
-                text: deviceName
-                font.pixelSize: Theme.fontSizeMedium
-                height: 40
-                
-                indicator: Rectangle {
-                    visible: DisplayService.currentDevice === parent.deviceName
-                    anchors.left: parent.left
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.leftMargin: Theme.spacingS
-                    width: 4
-                    height: parent.height - Theme.spacingS * 2
-                    radius: 2
-                    color: Theme.primary
-                }
-                
-                contentItem: StyledText {
-                    text: parent.text
-                    font: parent.font
-                    color: DisplayService.currentDevice === parent.deviceName ? Theme.primary : Theme.surfaceText
-                    leftPadding: Theme.spacingL
-                    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: {
-                    DisplayService.setCurrentDevice(deviceName, true)
-                    deviceMenu.close()
-                }
-            }
-            onObjectAdded: (index, object) => deviceMenu.insertItem(index, object)
-            onObjectRemoved: (index, object) => deviceMenu.removeItem(object)
-        }
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-}

Modules/DankBar/AutoHideManager.qml

@@ -1,179 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    required property var barWindow
-    required property var axis
-    required property var appDrawerLoader
-    required property var dankDashPopoutLoader
-    required property var processListPopoutLoader
-    required property var notificationCenterLoader
-    required property var batteryPopoutLoader
-    required property var vpnPopoutLoader
-    required property var controlCenterLoader
-    required property var clipboardHistoryModalPopup
-    required property var systemUpdateLoader
-    required property var notepadInstance
-
-    property alias reveal: core.reveal
-    property alias autoHide: core.autoHide
-    property alias backgroundTransparency: core.backgroundTransparency
-    property alias hasActivePopout: core.hasActivePopout
-    property alias mouseArea: topBarMouseArea
-
-    Item {
-        id: inputMask
-
-        readonly property int barThickness: barWindow.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing)
-
-        readonly property bool showing: SettingsData.dankBarVisible && (core.reveal
-                                 || (CompositorService.isNiri && NiriService.inOverview && SettingsData.dankBarOpenOnOverview)
-                                 || !core.autoHide)
-
-        readonly property int maskThickness: showing ? barThickness : 1
-
-        x: {
-            if (!axis.isVertical) {
-                return 0
-            } else {
-                switch (SettingsData.dankBarPosition) {
-                case SettingsData.Position.Left:  return 0
-                case SettingsData.Position.Right: return parent.width - maskThickness
-                default: return 0
-                }
-            }
-        }
-        y: {
-            if (axis.isVertical) {
-                return 0
-            } else {
-                switch (SettingsData.dankBarPosition) {
-                case SettingsData.Position.Top:    return 0
-                case SettingsData.Position.Bottom: return parent.height - maskThickness
-                default: return 0
-                }
-            }
-        }
-        width: axis.isVertical ? maskThickness : parent.width
-        height: axis.isVertical ? parent.height : maskThickness
-    }
-
-    Region {
-        id: mask
-        item: inputMask
-    }
-
-    property alias maskRegion: mask
-
-    QtObject {
-        id: core
-
-        property real backgroundTransparency: SettingsData.dankBarTransparency
-        property bool autoHide: SettingsData.dankBarAutoHide
-        property bool revealSticky: false
-
-        property bool notepadInstanceVisible: notepadInstance?.isVisible ?? false
-
-        readonly property bool hasActivePopout: {
-            const loaders = [{
-                                 "loader": appDrawerLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": dankDashPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": processListPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": notificationCenterLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": batteryPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": vpnPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": controlCenterLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": clipboardHistoryModalPopup,
-                                 "prop": "visible"
-                             }, {
-                                 "loader": systemUpdateLoader,
-                                 "prop": "shouldBeVisible"
-                             }]
-            return notepadInstanceVisible || loaders.some(item => {
-                if (item.loader) {
-                    return item.loader?.item?.[item.prop]
-                }
-                return false
-            })
-        }
-
-        property bool reveal: {
-            if (CompositorService.isNiri && NiriService.inOverview) {
-                return SettingsData.dankBarOpenOnOverview
-            }
-            return SettingsData.dankBarVisible && (!autoHide || topBarMouseArea.containsMouse || hasActivePopout || revealSticky)
-        }
-
-        onHasActivePopoutChanged: {
-            if (!hasActivePopout && autoHide && !topBarMouseArea.containsMouse) {
-                revealSticky = true
-                revealHold.restart()
-            }
-        }
-    }
-
-    Timer {
-        id: revealHold
-        interval: 250
-        repeat: false
-        onTriggered: core.revealSticky = false
-    }
-
-    Connections {
-        function onDankBarTransparencyChanged() {
-            core.backgroundTransparency = SettingsData.dankBarTransparency
-        }
-
-        target: SettingsData
-    }
-
-    Connections {
-        target: topBarMouseArea
-        function onContainsMouseChanged() {
-            if (topBarMouseArea.containsMouse) {
-                core.revealSticky = true
-                revealHold.stop()
-            } else {
-                if (core.autoHide && !core.hasActivePopout) {
-                    revealHold.restart()
-                }
-            }
-        }
-    }
-
-    MouseArea {
-        id: topBarMouseArea
-        y: !barWindow.isVertical ? (SettingsData.dankBarPosition === SettingsData.Position.Bottom ? parent.height - height : 0) : 0
-        x: barWindow.isVertical ? (SettingsData.dankBarPosition === SettingsData.Position.Right ? parent.width - width : 0) : 0
-        height: !barWindow.isVertical ? barWindow.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing) : undefined
-        width: barWindow.isVertical ? barWindow.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing) : undefined
-        anchors {
-            left: !barWindow.isVertical ? parent.left : (SettingsData.dankBarPosition === SettingsData.Position.Left ? parent.left : undefined)
-            right: !barWindow.isVertical ? parent.right : (SettingsData.dankBarPosition === SettingsData.Position.Right ? parent.right : undefined)
-            top: barWindow.isVertical ? parent.top : undefined
-            bottom: barWindow.isVertical ? parent.bottom : undefined
-        }
-        hoverEnabled: SettingsData.dankBarAutoHide && !core.reveal
-        acceptedButtons: Qt.NoButton
-        enabled: SettingsData.dankBarAutoHide && !core.reveal
-    }
-}

Modules/DankBar/BarCanvas.qml

@@ -1,327 +0,0 @@
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    required property var barWindow
-    required property var axis
-
-    anchors.fill: parent
-
-    anchors.left: parent.left
-    anchors.top: parent.top
-    anchors.leftMargin: -(SettingsData.dankBarGothCornersEnabled && axis.isVertical && axis.edge === "right" ? barWindow._wingR : 0)
-    anchors.rightMargin: -(SettingsData.dankBarGothCornersEnabled && axis.isVertical && axis.edge === "left" ? barWindow._wingR : 0)
-    anchors.topMargin: -(SettingsData.dankBarGothCornersEnabled && !axis.isVertical && axis.edge === "bottom" ? barWindow._wingR : 0)
-    anchors.bottomMargin: -(SettingsData.dankBarGothCornersEnabled && !axis.isVertical && axis.edge === "top" ? barWindow._wingR : 0)
-
-    Canvas {
-        id: barShape
-        anchors.fill: parent
-        antialiasing: true
-        renderTarget: Canvas.FramebufferObject
-        renderStrategy: Canvas.Cooperative
-
-        readonly property real correctWidth: root.width
-        readonly property real correctHeight: root.height
-        canvasSize: Qt.size(barWindow.px(correctWidth), barWindow.px(correctHeight))
-
-        property real wing: SettingsData.dankBarGothCornersEnabled ? barWindow._wingR : 0
-        property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.cornerRadius
-
-        onWingChanged: requestPaint()
-        onRtChanged: requestPaint()
-        onCorrectWidthChanged: requestPaint()
-        onCorrectHeightChanged: requestPaint()
-        onVisibleChanged: if (visible) requestPaint()
-        Component.onCompleted: requestPaint()
-
-        Connections {
-            target: barWindow
-            function on_BgColorChanged() { barShape.requestPaint() }
-            function on_DprChanged() { barShape.requestPaint() }
-        }
-
-        Connections {
-            target: Theme
-            function onIsLightModeChanged() { barShape.requestPaint() }
-        }
-
-        onPaint: {
-            const ctx = getContext("2d")
-            const scale = barWindow._dpr
-            const W = barWindow.px(barWindow.isVertical ? correctHeight : correctWidth)
-            const H_raw = barWindow.px(barWindow.isVertical ? correctWidth : correctHeight)
-            const R = barWindow.px(wing)
-            const RT = barWindow.px(rt)
-            const H = H_raw - (R > 0 ? R : 0)
-            const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
-            const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
-            const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
-            const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
-
-            ctx.scale(scale, scale)
-
-            function drawTopPath() {
-                ctx.beginPath()
-                ctx.moveTo(RT, 0)
-                ctx.lineTo(W - RT, 0)
-                ctx.arcTo(W, 0, W, RT, RT)
-                ctx.lineTo(W, H)
-
-                if (R > 0) {
-                    ctx.lineTo(W, H + R)
-                    ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                    ctx.lineTo(R, H)
-                    ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                    ctx.lineTo(0, H + R)
-                } else {
-                    ctx.lineTo(W, H - RT)
-                    ctx.arcTo(W, H, W - RT, H, RT)
-                    ctx.lineTo(RT, H)
-                    ctx.arcTo(0, H, 0, H - RT, RT)
-                }
-
-                ctx.lineTo(0, RT)
-                ctx.arcTo(0, 0, RT, 0, RT)
-                ctx.closePath()
-            }
-
-            ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
-
-            ctx.save()
-            if (isBottom) {
-                ctx.translate(W, H_raw)
-                ctx.rotate(Math.PI)
-            } else if (isLeft) {
-                ctx.translate(0, W)
-                ctx.rotate(-Math.PI / 2)
-            } else if (isRight) {
-                ctx.translate(H_raw, 0)
-                ctx.rotate(Math.PI / 2)
-            }
-
-            drawTopPath()
-            ctx.restore()
-
-            ctx.fillStyle = barWindow._bgColor
-            ctx.fill()
-        }
-    }
-
-    Canvas {
-        id: barTint
-        anchors.fill: parent
-        antialiasing: true
-        renderTarget: Canvas.FramebufferObject
-        renderStrategy: Canvas.Cooperative
-
-        readonly property real correctWidth: root.width
-        readonly property real correctHeight: root.height
-        canvasSize: Qt.size(barWindow.px(correctWidth), barWindow.px(correctHeight))
-
-        property real wing: SettingsData.dankBarGothCornersEnabled ? barWindow._wingR : 0
-        property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.cornerRadius
-        property real alphaTint: (barWindow._bgColor?.a ?? 1) < 0.99 ? (Theme.stateLayerOpacity ?? 0) : 0
-
-        onWingChanged: requestPaint()
-        onRtChanged: requestPaint()
-        onAlphaTintChanged: requestPaint()
-        onCorrectWidthChanged: requestPaint()
-        onCorrectHeightChanged: requestPaint()
-        onVisibleChanged: if (visible) requestPaint()
-        Component.onCompleted: requestPaint()
-
-        Connections {
-            target: barWindow
-            function on_BgColorChanged() { barTint.requestPaint() }
-            function on_DprChanged() { barTint.requestPaint() }
-        }
-
-        Connections {
-            target: Theme
-            function onIsLightModeChanged() { barTint.requestPaint() }
-        }
-
-        onPaint: {
-            const ctx = getContext("2d")
-            const scale = barWindow._dpr
-            const W = barWindow.px(barWindow.isVertical ? correctHeight : correctWidth)
-            const H_raw = barWindow.px(barWindow.isVertical ? correctWidth : correctHeight)
-            const R = barWindow.px(wing)
-            const RT = barWindow.px(rt)
-            const H = H_raw - (R > 0 ? R : 0)
-            const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
-            const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
-            const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
-            const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
-
-            ctx.scale(scale, scale)
-
-            function drawTopPath() {
-                ctx.beginPath()
-                ctx.moveTo(RT, 0)
-                ctx.lineTo(W - RT, 0)
-                ctx.arcTo(W, 0, W, RT, RT)
-                ctx.lineTo(W, H)
-
-                if (R > 0) {
-                    ctx.lineTo(W, H + R)
-                    ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                    ctx.lineTo(R, H)
-                    ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                    ctx.lineTo(0, H + R)
-                } else {
-                    ctx.lineTo(W, H - RT)
-                    ctx.arcTo(W, H, W - RT, H, RT)
-                    ctx.lineTo(RT, H)
-                    ctx.arcTo(0, H, 0, H - RT, RT)
-                }
-
-                ctx.lineTo(0, RT)
-                ctx.arcTo(0, 0, RT, 0, RT)
-                ctx.closePath()
-            }
-
-            ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
-
-            ctx.save()
-            if (isBottom) {
-                ctx.translate(W, H_raw)
-                ctx.rotate(Math.PI)
-            } else if (isLeft) {
-                ctx.translate(0, W)
-                ctx.rotate(-Math.PI / 2)
-            } else if (isRight) {
-                ctx.translate(H_raw, 0)
-                ctx.rotate(Math.PI / 2)
-            }
-
-            drawTopPath()
-            ctx.restore()
-
-            ctx.fillStyle = Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, alphaTint)
-            ctx.fill()
-        }
-    }
-
-    Canvas {
-        id: barBorder
-        anchors.fill: parent
-        antialiasing: true
-        visible: SettingsData.dankBarBorderEnabled
-        renderTarget: Canvas.FramebufferObject
-        renderStrategy: Canvas.Cooperative
-
-        readonly property real correctWidth: root.width
-        readonly property real correctHeight: root.height
-        canvasSize: Qt.size(barWindow.px(correctWidth), barWindow.px(correctHeight))
-
-        property real wing: SettingsData.dankBarGothCornersEnabled ? barWindow._wingR : 0
-        property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.cornerRadius
-        property bool borderEnabled: SettingsData.dankBarBorderEnabled
-
-        onWingChanged: requestPaint()
-        onRtChanged: requestPaint()
-        onBorderEnabledChanged: requestPaint()
-        onCorrectWidthChanged: requestPaint()
-        onCorrectHeightChanged: requestPaint()
-        onVisibleChanged: if (visible) requestPaint()
-        Component.onCompleted: requestPaint()
-
-        Connections {
-            target: barWindow
-            function on_DprChanged() { barBorder.requestPaint() }
-        }
-
-        Connections {
-            target: Theme
-            function onSecondaryChanged() { barBorder.requestPaint() }
-        }
-
-        Connections {
-            target: SettingsData
-            function onDankBarSpacingChanged() { barBorder.requestPaint() }
-            function onDankBarSquareCornersChanged() { barBorder.requestPaint() }
-            function onCornerRadiusChanged() { barBorder.requestPaint() }
-        }
-
-        onPaint: {
-            if (!borderEnabled) return
-
-            const ctx = getContext("2d")
-            const scale = barWindow._dpr
-            const W = barWindow.px(barWindow.isVertical ? correctHeight : correctWidth)
-            const H_raw = barWindow.px(barWindow.isVertical ? correctWidth : correctHeight)
-            const R = barWindow.px(wing)
-            const RT = barWindow.px(rt)
-            const H = H_raw - (R > 0 ? R : 0)
-            const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
-            const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
-            const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
-            const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
-
-            const spacing = SettingsData.dankBarSpacing
-            const hasEdgeGap = spacing > 0 || RT > 0
-
-            ctx.scale(scale, scale)
-
-            function drawTopBorder() {
-                ctx.beginPath()
-
-                if (!hasEdgeGap) {
-                    ctx.moveTo(0, H)
-                    ctx.lineTo(W, H)
-                } else {
-                    ctx.moveTo(RT, 0)
-                    ctx.lineTo(W - RT, 0)
-                    ctx.arcTo(W, 0, W, RT, RT)
-                    ctx.lineTo(W, H)
-
-                    if (R > 0) {
-                        ctx.lineTo(W, H + R)
-                        ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                        ctx.lineTo(R, H)
-                        ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                        ctx.lineTo(0, H + R)
-                    } else {
-                        ctx.lineTo(W, H - RT)
-                        ctx.arcTo(W, H, W - RT, H, RT)
-                        ctx.lineTo(RT, H)
-                        ctx.arcTo(0, H, 0, H - RT, RT)
-                    }
-
-                    ctx.lineTo(0, RT)
-                    ctx.arcTo(0, 0, RT, 0, RT)
-                }
-
-                ctx.closePath()
-            }
-
-            ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
-
-            ctx.save()
-            if (isBottom) {
-                ctx.translate(W, H_raw)
-                ctx.rotate(Math.PI)
-            } else if (isLeft) {
-                ctx.translate(0, W)
-                ctx.rotate(-Math.PI / 2)
-            } else if (isRight) {
-                ctx.translate(H_raw, 0)
-                ctx.rotate(Math.PI / 2)
-            }
-
-            drawTopBorder()
-            ctx.restore()
-
-            ctx.lineWidth = 1
-            ctx.strokeStyle = Theme.secondary
-            ctx.stroke()
-        }
-    }
-}

Modules/DankBar/CenterSection.qml

@@ -1,460 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    property var widgetsModel: null
-    property var components: null
-    property bool noBackground: false
-    required property var axis
-    property string section: "center"
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-
-    readonly property bool isVertical: axis?.isVertical ?? false
-    readonly property real spacing: noBackground ? 2 : Theme.spacingXS
-
-    property var centerWidgets: []
-    property int totalWidgets: 0
-    property real totalSize: 0
-
-    function updateLayout() {
-        const containerSize = isVertical ? height : width
-        if (containerSize <= 0 || !visible) {
-            return
-        }
-
-        centerWidgets = []
-        totalWidgets = 0
-        totalSize = 0
-
-        let configuredWidgets = 0
-        for (var i = 0; i < centerRepeater.count; i++) {
-            const item = centerRepeater.itemAt(i)
-            if (item && getWidgetVisible(item.widgetId)) {
-                configuredWidgets++
-                if (item.active && item.item) {
-                    centerWidgets.push(item.item)
-                    totalWidgets++
-                    totalSize += isVertical ? item.item.height : item.item.width
-                }
-            }
-        }
-
-        if (totalWidgets > 1) {
-            totalSize += spacing * (totalWidgets - 1)
-        }
-
-        positionWidgets(configuredWidgets)
-    }
-
-    function positionWidgets(configuredWidgets) {
-        if (totalWidgets === 0 || (isVertical ? height : width) <= 0) {
-            return
-        }
-
-        const parentCenter = (isVertical ? height : width) / 2
-        const isOdd = configuredWidgets % 2 === 1
-
-        centerWidgets.forEach(widget => {
-            if (isVertical) {
-                widget.anchors.verticalCenter = undefined
-            } else {
-                widget.anchors.horizontalCenter = undefined
-            }
-        })
-
-        if (isOdd) {
-            const middleIndex = Math.floor(configuredWidgets / 2)
-            let currentActiveIndex = 0
-            let middleWidget = null
-
-            for (var i = 0; i < centerRepeater.count; i++) {
-                const item = centerRepeater.itemAt(i)
-                if (item && getWidgetVisible(item.widgetId)) {
-                    if (currentActiveIndex === middleIndex && item.active && item.item) {
-                        middleWidget = item.item
-                        break
-                    }
-                    currentActiveIndex++
-                }
-            }
-
-            if (middleWidget) {
-                const middleSize = isVertical ? middleWidget.height : middleWidget.width
-                if (isVertical) {
-                    middleWidget.y = parentCenter - (middleSize / 2)
-                } else {
-                    middleWidget.x = parentCenter - (middleSize / 2)
-                }
-
-                let leftWidgets = []
-                let rightWidgets = []
-                let foundMiddle = false
-
-                for (var i = 0; i < centerWidgets.length; i++) {
-                    if (centerWidgets[i] === middleWidget) {
-                        foundMiddle = true
-                        continue
-                    }
-                    if (!foundMiddle) {
-                        leftWidgets.push(centerWidgets[i])
-                    } else {
-                        rightWidgets.push(centerWidgets[i])
-                    }
-                }
-
-                let currentPos = isVertical ? middleWidget.y : middleWidget.x
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= (spacing + size)
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                }
-
-                currentPos = (isVertical ? middleWidget.y : middleWidget.x) + middleSize
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            }
-        } else {
-            let configuredLeftIndex = (configuredWidgets / 2) - 1
-            let configuredRightIndex = configuredWidgets / 2
-            const halfSpacing = spacing / 2
-
-            let leftWidget = null
-            let rightWidget = null
-            let leftWidgets = []
-            let rightWidgets = []
-
-            let currentConfigIndex = 0
-            for (var i = 0; i < centerRepeater.count; i++) {
-                const item = centerRepeater.itemAt(i)
-                if (item && getWidgetVisible(item.widgetId)) {
-                    if (item.active && item.item) {
-                        if (currentConfigIndex < configuredLeftIndex) {
-                            leftWidgets.push(item.item)
-                        } else if (currentConfigIndex === configuredLeftIndex) {
-                            leftWidget = item.item
-                        } else if (currentConfigIndex === configuredRightIndex) {
-                            rightWidget = item.item
-                        } else {
-                            rightWidgets.push(item.item)
-                        }
-                    }
-                    currentConfigIndex++
-                }
-            }
-
-            if (leftWidget && rightWidget) {
-                const leftSize = isVertical ? leftWidget.height : leftWidget.width
-                if (isVertical) {
-                    leftWidget.y = parentCenter - halfSpacing - leftSize
-                    rightWidget.y = parentCenter + halfSpacing
-                } else {
-                    leftWidget.x = parentCenter - halfSpacing - leftSize
-                    rightWidget.x = parentCenter + halfSpacing
-                }
-
-                let currentPos = isVertical ? leftWidget.y : leftWidget.x
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= (spacing + size)
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                }
-
-                currentPos = (isVertical ? rightWidget.y + rightWidget.height : rightWidget.x + rightWidget.width)
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            } else if (leftWidget && !rightWidget) {
-                const leftSize = isVertical ? leftWidget.height : leftWidget.width
-                if (isVertical) {
-                    leftWidget.y = parentCenter - halfSpacing - leftSize
-                } else {
-                    leftWidget.x = parentCenter - halfSpacing - leftSize
-                }
-
-                let currentPos = isVertical ? leftWidget.y : leftWidget.x
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= (spacing + size)
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                }
-
-                currentPos = (isVertical ? leftWidget.y + leftWidget.height : leftWidget.x + leftWidget.width) + spacing
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            } else if (!leftWidget && rightWidget) {
-                if (isVertical) {
-                    rightWidget.y = parentCenter + halfSpacing
-                } else {
-                    rightWidget.x = parentCenter + halfSpacing
-                }
-
-                let currentPos = (isVertical ? rightWidget.y : rightWidget.x) - spacing
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= size
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                    currentPos -= spacing
-                }
-
-                currentPos = (isVertical ? rightWidget.y + rightWidget.height : rightWidget.x + rightWidget.width)
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            } else if (totalWidgets === 1 && centerWidgets[0]) {
-                const size = isVertical ? centerWidgets[0].height : centerWidgets[0].width
-                if (isVertical) {
-                    centerWidgets[0].y = parentCenter - (size / 2)
-                } else {
-                    centerWidgets[0].x = parentCenter - (size / 2)
-                }
-            }
-        }
-    }
-
-    function getWidgetVisible(widgetId) {
-        const widgetVisibility = {
-            "cpuUsage": DgopService.dgopAvailable,
-            "memUsage": DgopService.dgopAvailable,
-            "cpuTemp": DgopService.dgopAvailable,
-            "gpuTemp": DgopService.dgopAvailable,
-            "network_speed_monitor": DgopService.dgopAvailable
-        }
-        return widgetVisibility[widgetId] ?? true
-    }
-
-    function getWidgetComponent(widgetId) {
-        // Build dynamic component map including plugins
-        let baseMap = {
-            "launcherButton": "launcherButtonComponent",
-            "workspaceSwitcher": "workspaceSwitcherComponent",
-            "focusedWindow": "focusedWindowComponent",
-            "runningApps": "runningAppsComponent",
-            "clock": "clockComponent",
-            "music": "mediaComponent",
-            "weather": "weatherComponent",
-            "systemTray": "systemTrayComponent",
-            "privacyIndicator": "privacyIndicatorComponent",
-            "clipboard": "clipboardComponent",
-            "cpuUsage": "cpuUsageComponent",
-            "memUsage": "memUsageComponent",
-            "diskUsage": "diskUsageComponent",
-            "cpuTemp": "cpuTempComponent",
-            "gpuTemp": "gpuTempComponent",
-            "notificationButton": "notificationButtonComponent",
-            "battery": "batteryComponent",
-            "controlCenterButton": "controlCenterButtonComponent",
-            "idleInhibitor": "idleInhibitorComponent",
-            "spacer": "spacerComponent",
-            "separator": "separatorComponent",
-            "network_speed_monitor": "networkComponent",
-            "keyboard_layout_name": "keyboardLayoutNameComponent",
-            "vpn": "vpnComponent",
-            "notepadButton": "notepadButtonComponent",
-            "colorPicker": "colorPickerComponent",
-            "systemUpdate": "systemUpdateComponent"
-        }
-
-        // For built-in components, get from components property
-        const componentKey = baseMap[widgetId]
-        if (componentKey && root.components[componentKey]) {
-            return root.components[componentKey]
-        }
-
-        // For plugin components, get from PluginService
-        var parts = widgetId.split(":")
-        var pluginId = parts[0]
-        let pluginComponents = PluginService.getWidgetComponents()
-        return pluginComponents[pluginId] || null
-    }
-
-    height: parent.height
-    width: parent.width
-    anchors.centerIn: parent
-
-    Timer {
-        id: layoutTimer
-        interval: 0
-        repeat: false
-        onTriggered: root.updateLayout()
-    }
-
-    Component.onCompleted: {
-        layoutTimer.restart()
-    }
-
-    onWidthChanged: {
-        if (width > 0) {
-            layoutTimer.restart()
-        }
-    }
-
-    onHeightChanged: {
-        if (height > 0) {
-            layoutTimer.restart()
-        }
-    }
-
-    onVisibleChanged: {
-        if (visible && (isVertical ? height : width) > 0) {
-            layoutTimer.restart()
-        }
-    }
-
-    Repeater {
-        id: centerRepeater
-        model: root.widgetsModel
-
-
-        Loader {
-            property string widgetId: model.widgetId
-            property var widgetData: model
-            property int spacerSize: model.size || 20
-
-            anchors.verticalCenter: !root.isVertical ? parent.verticalCenter : undefined
-            anchors.horizontalCenter: root.isVertical ? parent.horizontalCenter : undefined
-            active: root.getWidgetVisible(model.widgetId) && (model.widgetId !== "music" || MprisController.activePlayer !== null)
-            sourceComponent: root.getWidgetComponent(model.widgetId)
-            opacity: (model.enabled !== false) ? 1 : 0
-            asynchronous: false
-
-            onLoaded: {
-                if (!item) {
-                    return
-                }
-                item.widthChanged.connect(() => layoutTimer.restart())
-                item.heightChanged.connect(() => layoutTimer.restart())
-                if (model.widgetId === "spacer") {
-                    item.spacerSize = Qt.binding(() => model.size || 20)
-                }
-                if (root.axis && "axis" in item) {
-                    item.axis = Qt.binding(() => root.axis)
-                }
-                if (root.axis && "isVertical" in item) {
-                    try {
-                        item.isVertical = Qt.binding(() => root.axis.isVertical)
-                    } catch (e) {
-                    }
-                }
-
-                // Inject properties for plugin widgets
-                if ("section" in item) {
-                    item.section = root.section
-                }
-                if ("parentScreen" in item) {
-                    item.parentScreen = Qt.binding(() => root.parentScreen)
-                }
-                if ("widgetThickness" in item) {
-                    item.widgetThickness = Qt.binding(() => root.widgetThickness)
-                }
-                if ("barThickness" in item) {
-                    item.barThickness = Qt.binding(() => root.barThickness)
-                }
-
-                // Inject PluginService for plugin widgets
-                if (item.pluginService !== undefined) {
-                    var parts = model.widgetId.split(":")
-                    var pluginId = parts[0]
-                    var variantId = parts.length > 1 ? parts[1] : null
-
-                    if (item.pluginId !== undefined) {
-                        item.pluginId = pluginId
-                    }
-                    if (item.variantId !== undefined) {
-                        item.variantId = variantId
-                    }
-                    if (item.variantData !== undefined && variantId) {
-                        item.variantData = PluginService.getPluginVariantData(pluginId, variantId)
-                    }
-                    item.pluginService = PluginService
-                }
-
-                if (item.popoutService !== undefined) {
-                    item.popoutService = PopoutService
-                }
-
-                layoutTimer.restart()
-            }
-
-            onActiveChanged: {
-                layoutTimer.restart()
-            }
-        }
-    }
-
-    Connections {
-        target: widgetsModel
-        function onCountChanged() {
-            layoutTimer.restart()
-        }
-    }
-
-    // Listen for plugin changes and refresh components
-    Connections {
-        target: PluginService
-        function onPluginLoaded(pluginId) {
-            // Force refresh of component lookups
-            for (var i = 0; i < centerRepeater.count; i++) {
-                var item = centerRepeater.itemAt(i)
-                if (item && item.widgetId.startsWith(pluginId)) {
-                    item.sourceComponent = root.getWidgetComponent(item.widgetId)
-                }
-            }
-        }
-        function onPluginUnloaded(pluginId) {
-            // Force refresh of component lookups
-            for (var i = 0; i < centerRepeater.count; i++) {
-                var item = centerRepeater.itemAt(i)
-                if (item && item.widgetId.startsWith(pluginId)) {
-                    item.sourceComponent = root.getWidgetComponent(item.widgetId)
-                }
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/Battery.qml

@@ -1,126 +0,0 @@
-import QtQuick
-import Quickshell.Services.UPower
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: battery
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool batteryPopupVisible: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal toggleBatteryPopup()
-
-    width: isVertical ? widgetThickness : (batteryContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (batteryColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = batteryArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    visible: true
-
-    Column {
-        id: batteryColumn
-        visible: battery.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: BatteryService.getBatteryIcon()
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (!BatteryService.batteryAvailable) {
-                    return Theme.surfaceText
-                }
-
-                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
-                    return Theme.error
-                }
-
-                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
-                    return Theme.primary
-                }
-
-                return Theme.surfaceText
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: BatteryService.batteryLevel.toString()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: BatteryService.batteryAvailable
-        }
-    }
-
-    Row {
-        id: batteryContent
-        visible: !battery.isVertical
-        anchors.centerIn: parent
-        spacing: SettingsData.dankBarNoBackground ? 1 : 2
-
-        DankIcon {
-            name: BatteryService.getBatteryIcon()
-            size: Theme.barIconSize(barThickness, -4)
-            color: {
-                if (!BatteryService.batteryAvailable) {
-                    return Theme.surfaceText;
-                }
-
-                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
-                    return Theme.error;
-                }
-
-                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
-                    return Theme.primary;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: `${BatteryService.batteryLevel}%`
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: BatteryService.batteryAvailable
-        }
-
-    }
-
-    MouseArea {
-        id: batteryArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            toggleBatteryPopup();
-        }
-    }
-}

Modules/DankBar/Widgets/ClipboardButton.qml

@@ -1,57 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var clipboardHistoryModal: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: clipboardArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            root.clicked()
-        }
-    }
-
-    Rectangle {
-        id: clipboardContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent"
-            }
-
-            const baseColor = clipboardArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-        }
-
-        DankIcon {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            name: "content_paste"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-        }
-    }
-}

Modules/DankBar/Widgets/Clock.qml

@@ -1,247 +0,0 @@
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool compactMode: false
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-
-    signal clockClicked
-
-    width: isVertical ? widgetThickness : (clockRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (clockColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = clockMouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Column {
-        id: clockColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: -2
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    if (SettingsData.use24HourClock) {
-                        return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(0)
-                    } else {
-                        const hours = systemClock?.date?.getHours()
-                        const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
-                        return String(display).padStart(2, '0').charAt(0)
-                    }
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    if (SettingsData.use24HourClock) {
-                        return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(1)
-                    } else {
-                        const hours = systemClock?.date?.getHours()
-                        const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
-                        return String(display).padStart(2, '0').charAt(1)
-                    }
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(0)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(1)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Item {
-            width: 12
-            height: Theme.spacingM
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            Rectangle {
-                width: 12
-                height: 1
-                color: Theme.outlineButton
-                anchors.centerIn: parent
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    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(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    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(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    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(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    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(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-    }
-
-    Row {
-        id: clockRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-
-        StyledText {
-            text: {
-                const format = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP"
-                return systemClock?.date?.toLocaleTimeString(Qt.locale(), format)
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: "•"
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !SettingsData.clockCompactMode
-        }
-
-        StyledText {
-            text: {
-                if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0) {
-                    return systemClock?.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat)
-                }
-
-                return systemClock?.date?.toLocaleDateString(Qt.locale(), "ddd d")
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !SettingsData.clockCompactMode
-        }
-    }
-
-    SystemClock {
-        id: systemClock
-        precision: SystemClock.Seconds
-    }
-
-    MouseArea {
-        id: clockMouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clockClicked()
-        }
-    }
-
-}

Modules/DankBar/Widgets/ColorPicker.qml

@@ -1,54 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: isVertical ? widgetThickness : (colorPickerIcon.width + horizontalPadding * 2)
-    height: isVertical ? (colorPickerIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = colorPickerArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: colorPickerIcon
-
-        anchors.centerIn: parent
-        name: "palette"
-        size: Theme.barIconSize(barThickness, -4)
-        color: colorPickerArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-    }
-
-    MouseArea {
-        id: colorPickerArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            root.colorPickerRequested();
-        }
-    }
-
-    signal colorPickerRequested()
-
-}

Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -1,268 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property var widgetData: null
-    property bool showNetworkIcon: SettingsData.controlCenterShowNetworkIcon
-    property bool showBluetoothIcon: SettingsData.controlCenterShowBluetoothIcon
-    property bool showAudioIcon: SettingsData.controlCenterShowAudioIcon
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: isVertical ? widgetThickness : (controlIndicators.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (controlColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = controlCenterArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Column {
-        id: controlColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            name: {
-                if (NetworkService.wifiToggling) {
-                    return "sync"
-                }
-
-                if (NetworkService.networkStatus === "ethernet") {
-                    return "lan"
-                }
-
-                return NetworkService.wifiSignalIcon
-            }
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (NetworkService.wifiToggling) {
-                    return Theme.primary
-                }
-
-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showNetworkIcon && NetworkService.networkAvailable
-        }
-
-        DankIcon {
-            name: "bluetooth"
-            size: Theme.barIconSize(barThickness)
-            color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
-        }
-
-        Rectangle {
-            width: audioIconV.implicitWidth + 4
-            height: audioIconV.implicitHeight + 4
-            color: "transparent"
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showAudioIcon
-
-            DankIcon {
-                id: audioIconV
-
-                name: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
-                            return "volume_off"
-                        } else if (AudioService.sink.audio.volume * 100 < 33) {
-                            return "volume_down"
-                        } else {
-                            return "volume_up"
-                        }
-                    }
-                    return "volume_up"
-                }
-                size: Theme.barIconSize(barThickness)
-                color: Theme.surfaceText
-                anchors.centerIn: parent
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.NoButton
-                onWheel: function(wheelEvent) {
-                    let delta = wheelEvent.angleDelta.y
-                    let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0
-                    let newVolume
-                    if (delta > 0) {
-                        newVolume = Math.min(100, currentVolume + 5)
-                    } else {
-                        newVolume = Math.max(0, currentVolume - 5)
-                    }
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = false
-                        AudioService.sink.audio.volume = newVolume / 100
-                        AudioService.volumeChanged()
-                    }
-                    wheelEvent.accepted = true
-                }
-            }
-        }
-
-        DankIcon {
-            name: "settings"
-            size: Theme.barIconSize(barThickness)
-            color: controlCenterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
-        }
-    }
-
-    Row {
-        id: controlIndicators
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            id: networkIcon
-
-            name: {
-                if (NetworkService.wifiToggling) {
-                    return "sync";
-                }
-
-                if (NetworkService.networkStatus === "ethernet") {
-                    return "lan";
-                }
-
-                return NetworkService.wifiSignalIcon;
-            }
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (NetworkService.wifiToggling) {
-                    return Theme.primary;
-                }
-
-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showNetworkIcon && NetworkService.networkAvailable
-
-
-        }
-
-        DankIcon {
-            id: bluetoothIcon
-
-            name: "bluetooth"
-            size: Theme.barIconSize(barThickness)
-            color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
-        }
-
-        Rectangle {
-            width: audioIcon.implicitWidth + 4
-            height: audioIcon.implicitHeight + 4
-            color: "transparent"
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showAudioIcon
-
-            DankIcon {
-                id: audioIcon
-
-                name: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
-                            return "volume_off";
-                        } else if (AudioService.sink.audio.volume * 100 < 33) {
-                            return "volume_down";
-                        } else {
-                            return "volume_up";
-                        }
-                    }
-                    return "volume_up";
-                }
-                size: Theme.barIconSize(barThickness)
-                color: Theme.surfaceText
-                anchors.centerIn: parent
-            }
-
-            MouseArea {
-                id: audioWheelArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.NoButton
-                onWheel: function(wheelEvent) {
-                    let delta = wheelEvent.angleDelta.y;
-                    let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0;
-                    let newVolume;
-                    if (delta > 0) {
-                        newVolume = Math.min(100, currentVolume + 5);
-                    } else {
-                        newVolume = Math.max(0, currentVolume - 5);
-                    }
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = false;
-                        AudioService.sink.audio.volume = newVolume / 100;
-                        AudioService.volumeChanged();
-                    }
-                    wheelEvent.accepted = true;
-                }
-            }
-
-        }
-
-        DankIcon {
-            name: "mic"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
-            visible: false // TODO: Add mic detection
-        }
-
-        // Fallback settings icon when all other icons are hidden
-        DankIcon {
-            name: "settings"
-            size: Theme.barIconSize(barThickness)
-            color: controlCenterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
-        }
-
-    }
-
-    MouseArea {
-        id: controlCenterArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked();
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/CpuMonitor.qml

@@ -1,158 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property var widgetData: null
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (cpuContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (cpuColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = cpuArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["cpu"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["cpu"]);
-    }
-
-    MouseArea {
-        id: cpuArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("cpu");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: cpuColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "memory"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuUsage > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuUsage > 60) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
-                    return "--";
-                }
-
-                return DgopService.cpuUsage.toFixed(0);
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: cpuContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "memory"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuUsage > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuUsage > 60) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
-                    return "--%";
-                }
-
-                return DgopService.cpuUsage.toFixed(0) + "%";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: cpuBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: root.minimumWidth ? Math.max(cpuBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/CpuTemperature.qml

@@ -1,159 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property var widgetData: null
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (cpuTempContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (cpuTempColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = cpuTempArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["cpu"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["cpu"]);
-    }
-
-    MouseArea {
-        id: cpuTempArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("cpu");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: cpuTempColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "device_thermostat"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuTemperature > 85) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuTemperature > 69) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
-                    return "--";
-                }
-
-                return Math.round(DgopService.cpuTemperature).toString();
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: cpuTempContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "device_thermostat"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuTemperature > 85) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuTemperature > 69) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
-                    return "--°";
-                }
-
-                return Math.round(DgopService.cpuTemperature) + "°";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: tempBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100°"
-            }
-
-            width: root.minimumWidth ? Math.max(tempBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-
-}

Modules/DankBar/Widgets/DiskUsage.qml

@@ -1,242 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var widgetData: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    property string mountPath: (widgetData && widgetData.mountPath !== undefined) ? widgetData.mountPath : "/"
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    property var selectedMount: {
-        if (!DgopService.diskMounts || DgopService.diskMounts.length === 0) {
-            return null
-        }
-
-        // Force re-evaluation when mountPath changes
-        const currentMountPath = root.mountPath || "/"
-
-        // First try to find exact match
-        for (let i = 0; i < DgopService.diskMounts.length; i++) {
-            if (DgopService.diskMounts[i].mount === currentMountPath) {
-                return DgopService.diskMounts[i]
-            }
-        }
-
-        // Fallback to root
-        for (let i = 0; i < DgopService.diskMounts.length; i++) {
-            if (DgopService.diskMounts[i].mount === "/") {
-                return DgopService.diskMounts[i]
-            }
-        }
-
-        // Last resort - first mount
-        return DgopService.diskMounts[0] || null
-    }
-
-    property real diskUsagePercent: {
-        if (!selectedMount || !selectedMount.percent) {
-            return 0
-        }
-        const percentStr = selectedMount.percent.replace("%", "")
-        return parseFloat(percentStr) || 0
-    }
-
-    width: isVertical ? widgetThickness : (diskContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (diskColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent"
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["diskmounts"])
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["diskmounts"])
-    }
-
-    Connections {
-        function onWidgetDataChanged() {
-            // Force property re-evaluation by triggering change detection
-            root.mountPath = Qt.binding(() => {
-                return (root.widgetData && root.widgetData.mountPath !== undefined) ? root.widgetData.mountPath : "/"
-            })
-
-            root.selectedMount = Qt.binding(() => {
-                if (!DgopService.diskMounts || DgopService.diskMounts.length === 0) {
-                    return null
-                }
-
-                const currentMountPath = root.mountPath || "/"
-
-                // First try to find exact match
-                for (let i = 0; i < DgopService.diskMounts.length; i++) {
-                    if (DgopService.diskMounts[i].mount === currentMountPath) {
-                        return DgopService.diskMounts[i]
-                    }
-                }
-
-                // Fallback to root
-                for (let i = 0; i < DgopService.diskMounts.length; i++) {
-                    if (DgopService.diskMounts[i].mount === "/") {
-                        return DgopService.diskMounts[i]
-                    }
-                }
-
-                // Last resort - first mount
-                return DgopService.diskMounts[0] || null
-            })
-        }
-
-        target: SettingsData
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-    MouseArea {
-        id: diskArea
-        anchors.fill: parent
-        hoverEnabled: root.isVertical
-        onEntered: {
-            if (root.isVertical && root.selectedMount) {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    const globalPos = mapToGlobal(width / 2, height / 2)
-                    const currentScreen = root.parentScreen || Screen
-                    const screenX = currentScreen ? currentScreen.x : 0
-                    const screenY = currentScreen ? currentScreen.y : 0
-                    const relativeY = globalPos.y - screenY
-                    const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (currentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS)
-                    const isLeft = root.axis?.edge === "left"
-                    tooltipLoader.item.show(root.selectedMount.mount, screenX + tooltipX, relativeY, currentScreen, isLeft, !isLeft)
-                }
-            }
-        }
-        onExited: {
-            if (tooltipLoader.item) {
-                tooltipLoader.item.hide()
-            }
-            tooltipLoader.active = false
-        }
-    }
-
-    Column {
-        id: diskColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "storage"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.diskUsagePercent > 90) {
-                    return Theme.tempDanger
-                }
-                if (root.diskUsagePercent > 75) {
-                    return Theme.tempWarning
-                }
-                return Theme.surfaceText
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
-                    return "--"
-                }
-                return root.diskUsagePercent.toFixed(0)
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: diskContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "storage"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.diskUsagePercent > 90) {
-                    return Theme.tempDanger
-                }
-                if (root.diskUsagePercent > 75) {
-                    return Theme.tempWarning
-                }
-                return Theme.surfaceText
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (!root.selectedMount) {
-                    return "--"
-                }
-                return root.selectedMount.mount
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-        }
-
-        StyledText {
-            text: {
-                if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
-                    return "--%"
-                }
-                return root.diskUsagePercent.toFixed(0) + "%"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: diskBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: Math.max(diskBaseline.width, paintedWidth)
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/FocusedApp.qml

@@ -1,273 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var parentScreen
-    property bool compactMode: SettingsData.focusedWindowCompactMode
-    property int availableWidth: 400
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property int baseWidth: contentRow.implicitWidth + horizontalPadding * 2
-    readonly property int maxNormalWidth: 456
-    readonly property int maxCompactWidth: 288
-    readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
-    property var activeDesktopEntry: null
-
-    Component.onCompleted: {
-        updateDesktopEntry()
-    }
-
-    Connections {
-        target: DesktopEntries
-        function onApplicationsChanged() {
-            root.updateDesktopEntry()
-        }
-    }
-
-    Connections {
-        target: root
-        function onActiveWindowChanged() {
-            root.updateDesktopEntry()
-        }
-    }
-
-    function updateDesktopEntry() {
-        if (activeWindow && activeWindow.appId) {
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            activeDesktopEntry = DesktopEntries.heuristicLookup(moddedId)
-        } else {
-            activeDesktopEntry = null
-        }
-    }
-    readonly property bool hasWindowsOnCurrentWorkspace: {
-        if (CompositorService.isNiri) {
-            let currentWorkspaceId = null
-            for (var i = 0; i < NiriService.allWorkspaces.length; i++) {
-                const ws = NiriService.allWorkspaces[i]
-                if (ws.is_focused) {
-                    currentWorkspaceId = ws.id
-                    break
-                }
-            }
-
-            if (!currentWorkspaceId) {
-                return false
-            }
-
-            const workspaceWindows = NiriService.windows.filter(w => w.workspace_id === currentWorkspaceId)
-            return workspaceWindows.length > 0 && activeWindow && activeWindow.title
-        }
-
-        if (CompositorService.isHyprland) {
-            if (!Hyprland.focusedWorkspace || !activeWindow || !activeWindow.title) {
-                return false
-            }
-
-            const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-            const activeHyprToplevel = hyprlandToplevels.find(t => t.wayland === activeWindow)
-
-            if (!activeHyprToplevel || !activeHyprToplevel.workspace) {
-                return false
-            }
-
-            return activeHyprToplevel.workspace.id === Hyprland.focusedWorkspace.id
-        }
-
-        return activeWindow && activeWindow.title
-    }
-
-    width: !hasWindowsOnCurrentWorkspace ? 0 : (isVertical ? widgetThickness : (compactMode ? Math.min(baseWidth, maxCompactWidth) : Math.min(baseWidth, maxNormalWidth)))
-    height: !hasWindowsOnCurrentWorkspace ? 0 : (isVertical ? widgetThickness : widgetThickness)
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (!activeWindow || !activeWindow.title) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    clip: true
-    visible: hasWindowsOnCurrentWorkspace
-
-    IconImage {
-        id: appIcon
-        anchors.centerIn: parent
-        width: 18
-        height: 18
-        visible: root.isVertical && activeWindow && status === Image.Ready
-        source: {
-            if (!activeWindow || !activeWindow.appId) return ""
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            if (moddedId.toLowerCase().includes("steam_app")) return ""
-            return Quickshell.iconPath(activeDesktopEntry?.icon, true)
-        }
-        smooth: true
-        mipmap: true
-        asynchronous: true
-    }
-
-    DankIcon {
-        anchors.centerIn: parent
-        size: 18
-        name: "sports_esports"
-        color: Theme.surfaceText
-        visible: {
-            if (!root.isVertical || !activeWindow || !activeWindow.appId) return false
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            return moddedId.toLowerCase().includes("steam_app")
-        }
-    }
-
-    Text {
-        anchors.centerIn: parent
-        visible: {
-            if (!root.isVertical || !activeWindow || !activeWindow.appId) return false
-            if (appIcon.status === Image.Ready) return false
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            return !moddedId.toLowerCase().includes("steam_app")
-        }
-        text: {
-            if (!activeWindow || !activeWindow.appId) return "?"
-            if (activeDesktopEntry && activeDesktopEntry.name) {
-                return activeDesktopEntry.name.charAt(0).toUpperCase()
-            }
-            return activeWindow.appId.charAt(0).toUpperCase()
-        }
-        font.pixelSize: 10
-        color: Theme.surfaceText
-        font.weight: Font.Medium
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        StyledText {
-            id: appText
-
-            text: {
-                if (!activeWindow || !activeWindow.appId) {
-                    return "";
-                }
-
-                const desktopEntry = DesktopEntries.heuristicLookup(activeWindow.appId);
-                return desktopEntry && desktopEntry.name ? desktopEntry.name : activeWindow.appId;
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            elide: Text.ElideRight
-            maximumLineCount: 1
-            width: Math.min(implicitWidth, compactMode ? 80 : 180)
-            visible: !compactMode && text.length > 0
-        }
-
-        StyledText {
-            text: "•"
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !compactMode && appText.text && titleText.text
-        }
-
-        StyledText {
-            id: titleText
-
-            text: {
-                const title = activeWindow && activeWindow.title ? activeWindow.title : "";
-                const appName = appText.text;
-                if (!title || !appName) {
-                    return title;
-                }
-
-                if (title.endsWith(" - " + appName)) {
-                    return title.substring(0, title.length - (" - " + appName).length);
-                }
-
-                if (title.endsWith(appName)) {
-                    return title.substring(0, title.length - appName.length).replace(/ - $/, "");
-                }
-
-                return title;
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            elide: Text.ElideRight
-            maximumLineCount: 1
-            width: Math.min(implicitWidth, compactMode ? 280 : 250)
-            visible: text.length > 0
-        }
-
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: root.isVertical
-        onEntered: {
-            if (root.isVertical && activeWindow && activeWindow.appId && root.parentScreen) {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    const globalPos = mapToGlobal(width / 2, height / 2)
-                    const currentScreen = root.parentScreen
-                    const screenX = currentScreen ? currentScreen.x : 0
-                    const screenY = currentScreen ? currentScreen.y : 0
-                    const relativeY = globalPos.y - screenY
-                    const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (currentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS)
-
-                    const appName = activeDesktopEntry && activeDesktopEntry.name ? activeDesktopEntry.name : activeWindow.appId
-                    const title = activeWindow.title || ""
-                    const tooltipText = appName + (title ? " • " + title : "")
-
-                    const isLeft = root.axis?.edge === "left"
-                    tooltipLoader.item.show(tooltipText, screenX + tooltipX, relativeY, currentScreen, isLeft, !isLeft)
-                }
-            }
-        }
-        onExited: {
-            if (tooltipLoader.item) {
-                tooltipLoader.item.hide()
-            }
-            tooltipLoader.active = false
-        }
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/GpuTemperature.qml

@@ -1,243 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property var widgetData: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property int selectedGpuIndex: (widgetData && widgetData.selectedGpuIndex !== undefined) ? widgetData.selectedGpuIndex : 0
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-    property real displayTemp: {
-        if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
-            return 0;
-        }
-
-        if (selectedGpuIndex >= 0 && selectedGpuIndex < DgopService.availableGpus.length) {
-            return DgopService.availableGpus[selectedGpuIndex].temperature || 0;
-        }
-
-        return 0;
-    }
-
-    function updateWidgetPciId(pciId) {
-        // Find and update this widget's pciId in the settings
-        const sections = ["left", "center", "right"];
-        for (let s = 0; s < sections.length; s++) {
-            const sectionId = sections[s];
-            let widgets = [];
-            if (sectionId === "left") {
-                widgets = SettingsData.dankBarLeftWidgets.slice();
-            } else if (sectionId === "center") {
-                widgets = SettingsData.dankBarCenterWidgets.slice();
-            } else if (sectionId === "right") {
-                widgets = SettingsData.dankBarRightWidgets.slice();
-            }
-            for (let i = 0; i < widgets.length; i++) {
-                const widget = widgets[i];
-                if (typeof widget === "object" && widget.id === "gpuTemp" && (!widget.pciId || widget.pciId === "")) {
-                    widgets[i] = {
-                        "id": widget.id,
-                        "enabled": widget.enabled !== undefined ? widget.enabled : true,
-                        "selectedGpuIndex": 0,
-                        "pciId": pciId
-                    };
-                    if (sectionId === "left") {
-                        SettingsData.setDankBarLeftWidgets(widgets);
-                    } else if (sectionId === "center") {
-                        SettingsData.setDankBarCenterWidgets(widgets);
-                    } else if (sectionId === "right") {
-                        SettingsData.setDankBarRightWidgets(widgets);
-                    }
-                    return ;
-                }
-            }
-        }
-    }
-
-    width: isVertical ? widgetThickness : (gpuTempContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (gpuTempColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = gpuArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["gpu"]);
-        if (widgetData && widgetData.pciId) {
-            DgopService.addGpuPciId(widgetData.pciId);
-        } else {
-            autoSaveTimer.running = true;
-        }
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["gpu"]);
-        if (widgetData && widgetData.pciId) {
-            DgopService.removeGpuPciId(widgetData.pciId);
-        }
-
-    }
-
-    Connections {
-        function onWidgetDataChanged() {
-            // Force property re-evaluation by triggering change detection
-            root.selectedGpuIndex = Qt.binding(() => {
-                return (root.widgetData && root.widgetData.selectedGpuIndex !== undefined) ? root.widgetData.selectedGpuIndex : 0;
-            });
-        }
-
-        target: SettingsData
-    }
-
-    MouseArea {
-        id: gpuArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("cpu");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: gpuTempColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "auto_awesome_mosaic"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.displayTemp > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (root.displayTemp > 65) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
-                    return "--";
-                }
-
-                return Math.round(root.displayTemp).toString();
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: gpuTempContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "auto_awesome_mosaic"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.displayTemp > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (root.displayTemp > 65) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
-                    return "--°";
-                }
-
-                return Math.round(root.displayTemp) + "°";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: gpuTempBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100°"
-            }
-
-            width: root.minimumWidth ? Math.max(gpuTempBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-    Timer {
-        id: autoSaveTimer
-
-        interval: 100
-        running: false
-        onTriggered: {
-            if (DgopService.availableGpus && DgopService.availableGpus.length > 0) {
-                const firstGpu = DgopService.availableGpus[0];
-                if (firstGpu && firstGpu.pciId) {
-                    // Save the first GPU's PCI ID to this widget's settings
-                    updateWidgetPciId(firstGpu.pciId);
-                    DgopService.addGpuPciId(firstGpu.pciId);
-                }
-            }
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/IdleInhibitor.qml

@@ -1,52 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (idleIcon.width + horizontalPadding * 2)
-    height: isVertical ? (idleIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: idleIcon
-
-        anchors.centerIn: parent
-        name: SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle"
-        size: Theme.barIconSize(barThickness, -4)
-        color: Theme.surfaceText
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            SessionService.toggleIdleInhibit();
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/KeyboardLayoutName.qml

@@ -1,145 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Modules.ProcessList
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-    property string currentLayout: ""
-    property string hyprlandKeyboard: ""
-
-    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            if (CompositorService.isNiri) {
-                NiriService.cycleKeyboardLayout()
-            } else if (CompositorService.isHyprland) {
-                Quickshell.execDetached([
-                    "hyprctl",
-                    "switchxkblayout",
-                    root.hyprlandKeyboard,
-                    "next"
-                ])
-                updateLayout()
-            }
-        }
-    }
-
-    Column {
-        id: contentColumn
-
-        anchors.centerIn: parent
-        spacing: 1
-        visible: root.isVertical
-
-        DankIcon {
-            name: "keyboard"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (!currentLayout) return ""
-                const parts = currentLayout.split(" ")
-                if (parts.length > 0) {
-                    return parts[0].substring(0, 2).toUpperCase()
-                }
-                return currentLayout.substring(0, 2).toUpperCase()
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        StyledText {
-            text: currentLayout
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-    }
-
-
-    Process {
-        id: hyprlandLayoutProcess
-        running: false
-        command: ["hyprctl", "-j", "devices"]
-        stdout: StdioCollector {
-            onStreamFinished: {
-                try {
-                    const data = JSON.parse(text)
-                    // Find the main keyboard and get its active keymap
-                    const mainKeyboard = data.keyboards.find(kb => kb.main === true)
-                    root.hyprlandKeyboard = mainKeyboard.name
-                    if (mainKeyboard && mainKeyboard.active_keymap) {
-                        root.currentLayout = mainKeyboard.active_keymap
-                    } else {
-                        root.currentLayout = "Unknown"
-                    }
-                } catch (e) {
-                    root.currentLayout = "Unknown"
-                }
-            }
-        }
-    }
-
-    Timer {
-        id: updateTimer
-        interval: 1000
-        running: true
-        repeat: true
-        onTriggered: {
-            updateLayout()
-        }
-    }
-
-    Component.onCompleted: {
-        updateLayout()
-    }
-
-    function updateLayout() {
-        if (CompositorService.isNiri) {
-            root.currentLayout = NiriService.getCurrentKeyboardLayoutName()
-        } else if (CompositorService.isHyprland) {
-            hyprlandLayoutProcess.running = true
-        }
-    }
-}

Modules/DankBar/Widgets/LauncherButton.qml

@@ -1,120 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Widgets
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "left"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: launcherArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            root.clicked();
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0);
-                const currentScreen = parentScreen || Screen;
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width);
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen);
-            }
-        }
-    }
-
-    Rectangle {
-        id: launcherContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent";
-            }
-
-            const baseColor = launcherArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-        }
-
-        DankIcon {
-            visible: SettingsData.launcherLogoMode === "apps"
-            anchors.centerIn: parent
-            name: "apps"
-            size: Theme.barIconSize(barThickness, -4)
-            color: Theme.surfaceText
-        }
-
-        SystemLogo {
-            visible: SettingsData.launcherLogoMode === "os"
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            colorOverride: Theme.effectiveLogoColor
-            brightnessOverride: SettingsData.launcherLogoBrightness
-            contrastOverride: SettingsData.launcherLogoContrast
-        }
-
-        IconImage {
-            visible: SettingsData.launcherLogoMode === "compositor"
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            smooth: true
-            asynchronous: true
-            source: {
-                if (CompositorService.isNiri) {
-                    return "file://" + Theme.shellDir + "/assets/niri.svg"
-                } else if (CompositorService.isHyprland) {
-                    return "file://" + Theme.shellDir + "/assets/hyprland.svg"
-                }
-                return ""
-            }
-            layer.enabled: Theme.effectiveLogoColor !== ""
-            layer.effect: MultiEffect {
-                saturation: 0
-                colorization: 1
-                colorizationColor: Theme.effectiveLogoColor
-                brightness: SettingsData.launcherLogoBrightness
-                contrast: SettingsData.launcherLogoContrast
-            }
-        }
-
-        IconImage {
-            visible: SettingsData.launcherLogoMode === "custom" && SettingsData.launcherLogoCustomPath !== ""
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            smooth: true
-            asynchronous: true
-            source: SettingsData.launcherLogoCustomPath ? "file://" + SettingsData.launcherLogoCustomPath.replace("file://", "") : ""
-            layer.enabled: Theme.effectiveLogoColor !== ""
-            layer.effect: MultiEffect {
-                saturation: 0
-                colorization: 1
-                colorizationColor: Theme.effectiveLogoColor
-                brightness: SettingsData.launcherLogoBrightness
-                contrast: SettingsData.launcherLogoContrast
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/Media.qml

@@ -1,452 +0,0 @@
-import QtQuick
-import Quickshell.Services.Mpris
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    readonly property MprisPlayer activePlayer: MprisController.activePlayer
-    readonly property bool playerAvailable: activePlayer !== null
-    property bool compactMode: false
-    readonly property int textWidth: {
-        switch (SettingsData.mediaSize) {
-        case 0:
-            return 0; // No text in small mode
-        case 2:
-            return 180; // Large text area
-        default:
-            return 120; // Medium text area
-        }
-    }
-    readonly property int currentContentWidth: {
-        if (isVertical) {
-            return widgetThickness;
-        }
-        const controlsWidth = 20 + Theme.spacingXS + 24 + Theme.spacingXS + 20;
-        const audioVizWidth = 20;
-        const contentWidth = audioVizWidth + Theme.spacingXS + controlsWidth;
-        return contentWidth + (textWidth > 0 ? textWidth + Theme.spacingXS : 0) + horizontalPadding * 2;
-    }
-    readonly property int currentContentHeight: {
-        if (!isVertical) {
-            return widgetThickness;
-        }
-        const audioVizHeight = 20;
-        const playButtonHeight = 24;
-        return audioVizHeight + Theme.spacingXS + playButtonHeight + horizontalPadding * 2;
-    }
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: currentContentWidth
-    height: currentContentHeight
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    states: [
-        State {
-            name: "shown"
-            when: playerAvailable
-
-            PropertyChanges {
-                target: root
-                opacity: 1
-                width: currentContentWidth
-                height: currentContentHeight
-            }
-
-        },
-        State {
-            name: "hidden"
-            when: !playerAvailable
-
-            PropertyChanges {
-                target: root
-                opacity: 0
-                width: isVertical ? widgetThickness : 0
-                height: isVertical ? 0 : widgetThickness
-            }
-
-        }
-    ]
-    transitions: [
-        Transition {
-            from: "shown"
-            to: "hidden"
-
-            SequentialAnimation {
-                PauseAnimation {
-                    duration: 500
-                }
-
-                NumberAnimation {
-                    properties: isVertical ? "opacity,height" : "opacity,width"
-                    duration: Theme.shortDuration
-                    easing.type: Theme.standardEasing
-                }
-
-            }
-
-        },
-        Transition {
-            from: "hidden"
-            to: "shown"
-
-            NumberAnimation {
-                properties: isVertical ? "opacity,height" : "opacity,width"
-                duration: Theme.shortDuration
-                easing.type: Theme.standardEasing
-            }
-
-        }
-    ]
-
-    Column {
-        id: verticalLayout
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        AudioVisualization {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    if (root.popupTarget && root.popupTarget.setTriggerPosition) {
-                        const globalPos = parent.mapToGlobal(0, 0)
-                        const currentScreen = root.parentScreen || Screen
-                        const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, parent.width)
-                        root.popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
-                    }
-                    root.clicked()
-                }
-                onEntered: {
-                    tooltipLoader.active = true
-                    if (tooltipLoader.item && activePlayer) {
-                        const globalPos = parent.mapToGlobal(parent.width / 2, parent.height / 2)
-                        const screenX = root.parentScreen ? root.parentScreen.x : 0
-                        const screenY = root.parentScreen ? root.parentScreen.y : 0
-                        const relativeY = globalPos.y - screenY
-                        const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (root.parentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS)
-
-                        let identity = activePlayer.identity || ""
-                        let isWebMedia = identity.toLowerCase().includes("firefox") || identity.toLowerCase().includes("chrome") || identity.toLowerCase().includes("chromium")
-                        let title = activePlayer.trackTitle || "Unknown Track"
-                        let subtitle = ""
-                        if (isWebMedia && activePlayer.trackTitle) {
-                            subtitle = activePlayer.trackArtist || identity
-                        } else {
-                            subtitle = activePlayer.trackArtist || ""
-                        }
-                        let tooltipText = subtitle.length > 0 ? title + " • " + subtitle : title
-
-                        const isLeft = root.axis?.edge === "left"
-                        tooltipLoader.item.show(tooltipText, screenX + tooltipX, relativeY, root.parentScreen, isLeft, !isLeft)
-                    }
-                }
-                onExited: {
-                    if (tooltipLoader.item) {
-                        tooltipLoader.item.hide()
-                    }
-                    tooltipLoader.active = false
-                }
-            }
-        }
-
-        Rectangle {
-            width: 24
-            height: 24
-            radius: 12
-            anchors.horizontalCenter: parent.horizontalCenter
-            color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
-            visible: root.playerAvailable
-            opacity: activePlayer ? 1 : 0.3
-
-            DankIcon {
-                anchors.centerIn: parent
-                name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
-                size: 14
-                color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                enabled: root.playerAvailable
-                hoverEnabled: enabled
-                cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-                onClicked: (mouse) => {
-                    if (!activePlayer) return
-                    if (mouse.button === Qt.LeftButton) {
-                        activePlayer.togglePlaying()
-                    } else if (mouse.button === Qt.MiddleButton) {
-                        activePlayer.previous()
-                    } else if (mouse.button === Qt.RightButton) {
-                        activePlayer.next()
-                    }
-                }
-            }
-        }
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-    Row {
-        id: mediaRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        Row {
-            id: mediaInfo
-
-            spacing: Theme.spacingXS
-
-            AudioVisualization {
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            Rectangle {
-                id: textContainer
-
-                property string displayText: {
-                    if (!activePlayer || !activePlayer.trackTitle) {
-                        return "";
-                    }
-
-                    let identity = activePlayer.identity || "";
-                    let isWebMedia = identity.toLowerCase().includes("firefox") || identity.toLowerCase().includes("chrome") || identity.toLowerCase().includes("chromium") || identity.toLowerCase().includes("edge") || identity.toLowerCase().includes("safari");
-                    let title = "";
-                    let subtitle = "";
-                    if (isWebMedia && activePlayer.trackTitle) {
-                        title = activePlayer.trackTitle;
-                        subtitle = activePlayer.trackArtist || identity;
-                    } else {
-                        title = activePlayer.trackTitle || "Unknown Track";
-                        subtitle = activePlayer.trackArtist || "";
-                    }
-                    return subtitle.length > 0 ? title + " • " + subtitle : title;
-                }
-
-                anchors.verticalCenter: parent.verticalCenter
-                width: textWidth
-                height: 20
-                visible: SettingsData.mediaSize > 0
-                clip: true
-                color: "transparent"
-
-                StyledText {
-                    id: mediaText
-
-                    property bool needsScrolling: implicitWidth > textContainer.width
-                    property real scrollOffset: 0
-
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: textContainer.displayText
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    wrapMode: Text.NoWrap
-                    x: needsScrolling ? -scrollOffset : 0
-                    onTextChanged: {
-                        scrollOffset = 0;
-                        scrollAnimation.restart();
-                    }
-
-                    SequentialAnimation {
-                        id: scrollAnimation
-
-                        running: mediaText.needsScrolling && textContainer.visible
-                        loops: Animation.Infinite
-
-                        PauseAnimation {
-                            duration: 2000
-                        }
-
-                        NumberAnimation {
-                            target: mediaText
-                            property: "scrollOffset"
-                            from: 0
-                            to: mediaText.implicitWidth - textContainer.width + 5
-                            duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                            easing.type: Easing.Linear
-                        }
-
-                        PauseAnimation {
-                            duration: 2000
-                        }
-
-                        NumberAnimation {
-                            target: mediaText
-                            property: "scrollOffset"
-                            to: 0
-                            duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                            easing.type: Easing.Linear
-                        }
-
-                    }
-
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: root.playerAvailable && root.opacity > 0 && root.width > 0 && textContainer.visible
-                    hoverEnabled: enabled
-                    cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                    onPressed: {
-                        if (root.popupTarget && root.popupTarget.setTriggerPosition) {
-                            const globalPos = mapToGlobal(0, 0)
-                            const currentScreen = root.parentScreen || Screen
-                            const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.width)
-                            root.popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
-                        }
-                        root.clicked()
-                    }
-                }
-
-            }
-
-        }
-
-        Row {
-            spacing: Theme.spacingXS
-            anchors.verticalCenter: parent.verticalCenter
-
-            Rectangle {
-                width: 20
-                height: 20
-                radius: 10
-                anchors.verticalCenter: parent.verticalCenter
-                color: prevArea.containsMouse ? Theme.primaryHover : "transparent"
-                visible: root.playerAvailable
-                opacity: (activePlayer && activePlayer.canGoPrevious) ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "skip_previous"
-                    size: 12
-                    color: Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: prevArea
-
-                    anchors.fill: parent
-                    enabled: root.playerAvailable && root.width > 0
-                    hoverEnabled: enabled
-                    cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.previous();
-                        }
-                    }
-                }
-
-            }
-
-            Rectangle {
-                width: 24
-                height: 24
-                radius: 12
-                anchors.verticalCenter: parent.verticalCenter
-                color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
-                visible: root.playerAvailable
-                opacity: activePlayer ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
-                    size: 14
-                    color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: root.playerAvailable && root.width > 0
-                    hoverEnabled: enabled
-                    cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.togglePlaying();
-                        }
-                    }
-                }
-
-            }
-
-            Rectangle {
-                width: 20
-                height: 20
-                radius: 10
-                anchors.verticalCenter: parent.verticalCenter
-                color: nextArea.containsMouse ? Theme.primaryHover : "transparent"
-                visible: playerAvailable
-                opacity: (activePlayer && activePlayer.canGoNext) ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "skip_next"
-                    size: 12
-                    color: Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: nextArea
-
-                    anchors.fill: parent
-                    enabled: root.playerAvailable && root.width > 0
-                    hoverEnabled: enabled
-                    cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.next();
-                        }
-                    }
-                }
-
-            }
-
-        }
-
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-    Behavior on height {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-}

Modules/DankBar/Widgets/NetworkMonitor.qml

@@ -1,194 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Modules.ProcessList
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property int availableWidth: 400
-    readonly property int baseWidth: contentRow.implicitWidth + Theme.spacingS * 2
-    readonly property int maxNormalWidth: 456
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    function formatNetworkSpeed(bytesPerSec) {
-        if (bytesPerSec < 1024) {
-            return bytesPerSec.toFixed(0) + " B/s";
-        } else if (bytesPerSec < 1024 * 1024) {
-            return (bytesPerSec / 1024).toFixed(1) + " KB/s";
-        } else if (bytesPerSec < 1024 * 1024 * 1024) {
-            return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
-        } else {
-            return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s";
-        }
-    }
-
-    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = networkArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["network"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["network"]);
-    }
-
-    MouseArea {
-        id: networkArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-    }
-
-    Column {
-        id: contentColumn
-
-        anchors.centerIn: parent
-        spacing: 2
-        visible: root.isVertical
-
-        DankIcon {
-            name: "network_check"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const rate = DgopService.networkRxRate
-                if (rate < 1024) return rate.toFixed(0)
-                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
-                return (rate / (1024 * 1024)).toFixed(0) + "M"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.info
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const rate = DgopService.networkTxRate
-                if (rate < 1024) return rate.toFixed(0)
-                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
-                return (rate / (1024 * 1024)).toFixed(0) + "M"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.error
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        DankIcon {
-            name: "network_check"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Row {
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 4
-
-            StyledText {
-                text: "↓"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.info
-            }
-
-            StyledText {
-                text: DgopService.networkRxRate > 0 ? formatNetworkSpeed(DgopService.networkRxRate) : "0 B/s"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignLeft
-                elide: Text.ElideNone
-                wrapMode: Text.NoWrap
-
-                StyledTextMetrics {
-                    id: rxBaseline
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    font.weight: Font.Medium
-                    text: "88.8 MB/s"
-                }
-
-                width: Math.max(rxBaseline.width, paintedWidth)
-
-                Behavior on width {
-                    NumberAnimation {
-                        duration: 120
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
-        }
-
-        Row {
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 4
-
-            StyledText {
-                text: "↑"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.error
-            }
-
-            StyledText {
-                text: DgopService.networkTxRate > 0 ? formatNetworkSpeed(DgopService.networkTxRate) : "0 B/s"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignLeft
-                elide: Text.ElideNone
-                wrapMode: Text.NoWrap
-
-                StyledTextMetrics {
-                    id: txBaseline
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    font.weight: Font.Medium
-                    text: "88.8 MB/s"
-                }
-
-                width: Math.max(txBaseline.width, paintedWidth)
-
-                Behavior on width {
-                    NumberAnimation {
-                        duration: 120
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
-        }
-
-    }
-
-
-}

Modules/DankBar/Widgets/NotepadButton.qml

@@ -1,96 +0,0 @@
-import QtQuick
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    readonly property string focusedScreenName: (
-        CompositorService.isHyprland && typeof Hyprland !== "undefined" && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor ? (Hyprland.focusedWorkspace.monitor.name || "") :
-        CompositorService.isNiri && typeof NiriService !== "undefined" && NiriService.currentOutput ? NiriService.currentOutput : ""
-    )
-
-    function resolveNotepadInstance() {
-        if (typeof notepadSlideoutVariants === "undefined" || !notepadSlideoutVariants || !notepadSlideoutVariants.instances) {
-            return null
-        }
-
-        const targetScreen = focusedScreenName
-        if (targetScreen) {
-            for (var i = 0; i < notepadSlideoutVariants.instances.length; i++) {
-                var slideout = notepadSlideoutVariants.instances[i]
-                if (slideout.modelData && slideout.modelData.name === targetScreen) {
-                    return slideout
-                }
-            }
-        }
-
-        return notepadSlideoutVariants.instances.length > 0 ? notepadSlideoutVariants.instances[0] : null
-    }
-
-    readonly property var notepadInstance: resolveNotepadInstance()
-    readonly property bool isActive: notepadInstance?.isVisible ?? false
-
-    width: isVertical ? widgetThickness : (notepadIcon.width + horizontalPadding * 2)
-    height: isVertical ? (notepadIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = notepadArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: notepadIcon
-
-        anchors.centerIn: parent
-        name: "assignment"
-        size: Theme.barIconSize(barThickness, -4)
-        color: notepadArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-    }
-
-    Rectangle {
-        width: 6
-        height: 6
-        radius: 3
-        color: Theme.primary
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 4
-        anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 4
-        visible: NotepadStorageService.tabs && NotepadStorageService.tabs.length > 0
-        opacity: 0.8
-    }
-
-    MouseArea {
-        id: notepadArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            const inst = root.notepadInstance
-            if (inst) {
-                inst.toggle()
-            }
-            root.clicked()
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/NotificationCenterButton.qml

@@ -1,76 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool hasUnread: false
-    property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: notificationArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked()
-        }
-    }
-
-    Rectangle {
-        id: notificationContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent"
-            }
-
-            const baseColor = notificationArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-        }
-
-        DankIcon {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            name: SessionData.doNotDisturb ? "notifications_off" : "notifications"
-            size: Theme.barIconSize(barThickness, -4)
-            color: SessionData.doNotDisturb ? Theme.error : (notificationArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText)
-        }
-
-        Rectangle {
-            width: 8
-            height: 8
-            radius: 4
-            color: Theme.error
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
-            anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
-            visible: root.hasUnread
-        }
-    }
-}

Modules/DankBar/Widgets/PrivacyIndicator.qml

@@ -1,250 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property bool hasActivePrivacy: PrivacyService.anyPrivacyActive
-    readonly property int activeCount: PrivacyService.microphoneActive + PrivacyService.cameraActive + PrivacyService.screensharingActive
-    readonly property real contentWidth: hasActivePrivacy ? (activeCount * 18 + (activeCount - 1) * Theme.spacingXS) : 0
-    readonly property real contentHeight: hasActivePrivacy ? (activeCount * 18 + (activeCount - 1) * Theme.spacingXS) : 0
-
-    width: isVertical ? widgetThickness : (hasActivePrivacy ? (contentWidth + horizontalPadding * 2) : 0)
-    height: isVertical ? (hasActivePrivacy ? (contentHeight + horizontalPadding * 2) : 0) : (hasActivePrivacy ? widgetThickness : 0)
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    visible: hasActivePrivacy
-    opacity: hasActivePrivacy ? 1 : 0
-    enabled: hasActivePrivacy
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        return Qt.rgba(privacyArea.containsMouse ? Theme.errorPressed.r : Theme.errorHover.r, privacyArea.containsMouse ? Theme.errorPressed.g : Theme.errorHover.g, privacyArea.containsMouse ? Theme.errorPressed.b : Theme.errorHover.b, (privacyArea.containsMouse ? Theme.errorPressed.a : Theme.errorHover.a) * Theme.widgetTransparency);
-    }
-
-    MouseArea {
-        // Privacy indicator click handler
-
-        id: privacyArea
-
-        anchors.fill: parent
-        hoverEnabled: hasActivePrivacy
-        enabled: hasActivePrivacy
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-        }
-    }
-
-    Column {
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: root.isVertical && hasActivePrivacy
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.microphoneActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "mic"
-                size: Theme.iconSizeSmall
-                color: Theme.error
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.cameraActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "camera_video"
-                size: Theme.iconSizeSmall
-                color: Theme.surfaceText
-                filled: true
-                anchors.centerIn: parent
-            }
-
-            Rectangle {
-                width: 6
-                height: 6
-                radius: 3
-                color: Theme.error
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.rightMargin: -2
-                anchors.topMargin: -1
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.screensharingActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "screen_share"
-                size: Theme.iconSizeSmall
-                color: Theme.warning
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-    }
-
-    Row {
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: !root.isVertical && hasActivePrivacy
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.microphoneActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "mic"
-                size: Theme.iconSizeSmall
-                color: Theme.error
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.cameraActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "camera_video"
-                size: Theme.iconSizeSmall
-                color: Theme.surfaceText
-                filled: true
-                anchors.centerIn: parent
-            }
-
-            Rectangle {
-                width: 6
-                height: 6
-                radius: 3
-                color: Theme.error
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.rightMargin: -2
-                anchors.topMargin: -1
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.screensharingActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "screen_share"
-                size: Theme.iconSizeSmall
-                color: Theme.warning
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-    }
-
-    Rectangle {
-        id: tooltip
-
-        width: tooltipText.contentWidth + Theme.spacingM * 2
-        height: tooltipText.contentHeight + Theme.spacingS * 2
-        radius: Theme.cornerRadius
-        color: Theme.popupBackground()
-        border.color: Theme.outlineMedium
-        border.width: 1
-        visible: false
-        opacity: privacyArea.containsMouse && hasActivePrivacy ? 1 : 0
-        z: 100
-        x: (parent.width - width) / 2
-        y: -height - Theme.spacingXS
-
-        StyledText {
-            id: tooltipText
-
-            anchors.centerIn: parent
-            text: PrivacyService.getPrivacySummary()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-        }
-
-        Rectangle {
-            width: 8
-            height: 8
-            color: parent.color
-            border.color: parent.border.color
-            border.width: parent.border.width
-            rotation: 45
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.bottom
-            anchors.topMargin: -4
-        }
-
-        Behavior on opacity {
-            enabled: hasActivePrivacy && root.visible
-
-            NumberAnimation {
-                duration: Theme.shortDuration
-                easing.type: Theme.standardEasing
-            }
-
-        }
-
-    }
-
-    Behavior on width {
-        enabled: hasActivePrivacy && visible && !isVertical
-
-        NumberAnimation {
-            duration: Theme.mediumDuration
-            easing.type: Theme.emphasizedEasing
-        }
-
-    }
-
-    Behavior on height {
-        enabled: hasActivePrivacy && visible && isVertical
-
-        NumberAnimation {
-            duration: Theme.mediumDuration
-            easing.type: Theme.emphasizedEasing
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/RamMonitor.qml

@@ -1,159 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property var widgetData: null
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (ramContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (ramColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = ramArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Component.onCompleted: {
-        DgopService.addRef(["memory"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["memory"]);
-    }
-
-    MouseArea {
-        id: ramArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("memory");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: ramColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "developer_board"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.memoryUsage > 90) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.memoryUsage > 75) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                    return "--";
-                }
-
-                return DgopService.memoryUsage.toFixed(0);
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: ramContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "developer_board"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.memoryUsage > 90) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.memoryUsage > 75) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                    return "--%";
-                }
-
-                return DgopService.memoryUsage.toFixed(0) + "%";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: ramBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: root.minimumWidth ? Math.max(ramBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/RunningApps.qml

@@ -1,635 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "left"
-    property var parentScreen
-    property var hoveredItem: null
-    property var topBar: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    property Item windowRoot: (Window.window ? Window.window.contentItem : null)
-    readonly property var sortedToplevels: {
-        if (SettingsData.runningAppsCurrentWorkspace) {
-            return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, parentScreen.name);
-        }
-        return CompositorService.sortedToplevels;
-    }
-    readonly property int windowCount: sortedToplevels.length
-    readonly property int calculatedSize: {
-        if (windowCount === 0) {
-            return 0;
-        }
-        if (SettingsData.runningAppsCompactMode) {
-            return windowCount * 24 + (windowCount - 1) * Theme.spacingXS + horizontalPadding * 2;
-        } else {
-            return windowCount * (24 + Theme.spacingXS + 120)
-                    + (windowCount - 1) * Theme.spacingXS + horizontalPadding * 2;
-        }
-    }
-
-    width: isVertical ? widgetThickness : calculatedSize
-    height: isVertical ? calculatedSize : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    visible: windowCount > 0
-    clip: false
-    color: {
-        if (windowCount === 0) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        acceptedButtons: Qt.NoButton
-        
-        property real scrollAccumulator: 0
-        property real touchpadThreshold: 500
-        
-        onWheel: (wheel) => {
-            const deltaY = wheel.angleDelta.y;
-            const isMouseWheel = Math.abs(deltaY) >= 120
-                && (Math.abs(deltaY) % 120) === 0;
-            
-            const windows = root.sortedToplevels;
-            if (windows.length < 2) {
-                return;
-            }
-            
-            if (isMouseWheel) {
-                // Direct mouse wheel action
-                let currentIndex = -1;
-                for (let i = 0; i < windows.length; i++) {
-                    if (windows[i].activated) {
-                        currentIndex = i;
-                        break;
-                    }
-                }
-
-                let nextIndex;
-                if (deltaY < 0) {
-                    if (currentIndex === -1) {
-                        nextIndex = 0;
-                    } else {
-                        nextIndex = (currentIndex + 1) % windows.length;
-                    }
-                } else {
-                    if (currentIndex === -1) {
-                        nextIndex = windows.length - 1;
-                    } else {
-                        nextIndex = (currentIndex - 1 + windows.length) % windows.length;
-                    }
-                }
-
-                const nextWindow = windows[nextIndex];
-                if (nextWindow) {
-                    nextWindow.activate();
-                }
-            } else {
-                // Touchpad - accumulate small deltas
-                scrollAccumulator += deltaY;
-                
-                if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
-                    let currentIndex = -1;
-                    for (let i = 0; i < windows.length; i++) {
-                        if (windows[i].activated) {
-                            currentIndex = i;
-                            break;
-                        }
-                    }
-
-                    let nextIndex;
-                    if (scrollAccumulator < 0) {
-                        if (currentIndex === -1) {
-                            nextIndex = 0;
-                        } else {
-                            nextIndex = (currentIndex + 1) % windows.length;
-                        }
-                    } else {
-                        if (currentIndex === -1) {
-                            nextIndex = windows.length - 1;
-                        } else {
-                            nextIndex = (currentIndex - 1 + windows.length) % windows.length;
-                        }
-                    }
-
-                    const nextWindow = windows[nextIndex];
-                    if (nextWindow) {
-                        nextWindow.activate();
-                    }
-                    
-                    scrollAccumulator = 0;
-                }
-            }
-            
-            wheel.accepted = true;
-        }
-    }
-
-    Loader {
-        id: layoutLoader
-        anchors.centerIn: parent
-        sourceComponent: root.isVertical ? columnLayout : rowLayout
-    }
-
-    Component {
-        id: rowLayout
-        Row {
-            spacing: Theme.spacingXS
-
-            Repeater {
-                id: windowRepeater
-                model: sortedToplevels
-
-                delegate: Item {
-                id: delegateItem
-
-                property bool isFocused: modelData.activated
-                property string appId: modelData.appId || ""
-                property string windowTitle: modelData.title || "(Unnamed)"
-                property var toplevelObject: modelData
-                property string tooltipText: {
-                    let appName = "Unknown";
-                    if (appId) {
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        appName = desktopEntry
-                                && desktopEntry.name ? desktopEntry.name : appId;
-                    }
-                    return appName + (windowTitle ? " • " + windowTitle : "")
-                }
-
-                width: SettingsData.runningAppsCompactMode ? 24 : (24 + Theme.spacingXS + 120)
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: {
-                        if (isFocused) {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.3) : Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.2);
-                        } else {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primaryHover.r,
-                                                                 Theme.primaryHover.g,
-                                                                 Theme.primaryHover.b,
-                                                                 0.1) : "transparent";
-                        }
-                    }
-
-                }
-
-                // App icon
-                IconImage {
-                    id: iconImg
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 18
-                    height: 18
-                    source: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        if (moddedId.toLowerCase().includes("steam_app")) {
-                            return ""
-                        }
-                        return Quickshell.iconPath(DesktopEntries.heuristicLookup(moddedId)?.icon, true)
-                    }
-                    smooth: true
-                    mipmap: true
-                    asynchronous: true
-                    visible: status === Image.Ready
-                }
-
-                DankIcon {
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    size: 18
-                    name: "sports_esports"
-                    color: Theme.surfaceText
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        return moddedId.toLowerCase().includes("steam_app")
-                    }
-                }
-
-                // Fallback text if no icon found
-                Text {
-                    anchors.centerIn: parent
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        const isSteamApp = moddedId.toLowerCase().includes("steam_app")
-                        return !iconImg.visible && !isSteamApp
-                    }
-                    text: {
-                        if (!appId) {
-                            return "?";
-                        }
-
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        if (desktopEntry && desktopEntry.name) {
-                            return desktopEntry.name.charAt(0).toUpperCase();
-                        }
-
-                        return appId.charAt(0).toUpperCase();
-                    }
-                    font.pixelSize: 10
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                }
-
-                // Window title text (only visible in expanded mode)
-                StyledText {
-                    anchors.left: iconImg.right
-                    anchors.leftMargin: Theme.spacingXS
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.spacingS
-                    anchors.verticalCenter: parent.verticalCenter
-                    visible: !SettingsData.runningAppsCompactMode
-                    text: windowTitle
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    maximumLineCount: 1
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    onClicked: (mouse) => {
-                        if (mouse.button === Qt.LeftButton) {
-                            if (toplevelObject) {
-                                toplevelObject.activate();
-                            }
-                        } else if (mouse.button === Qt.RightButton) {
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-                            tooltipLoader.active = false;
-
-                            windowContextMenuLoader.active = true;
-                            if (windowContextMenuLoader.item) {
-                                windowContextMenuLoader.item.currentWindow = toplevelObject;
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeX = globalPos.x - screenX;
-                                const yPos = root.isVertical ? delegateItem.height / 2 : (Theme.barHeight + SettingsData.dankBarSpacing - 7);
-                                windowContextMenuLoader.item.showAt(relativeX, yPos);
-                            }
-                        }
-                    }
-                    onEntered: {
-                        root.hoveredItem = delegateItem;
-                        tooltipLoader.active = true;
-                        if (tooltipLoader.item) {
-                            if (root.isVertical) {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height / 2);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeY = globalPos.y - screenY;
-                                const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (root.parentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS);
-                                const isLeft = root.axis?.edge === "left";
-                                tooltipLoader.item.show(delegateItem.tooltipText, screenX + tooltipX, relativeY, root.parentScreen, isLeft, !isLeft);
-                            } else {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height);
-                                const tooltipY = Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS;
-                                tooltipLoader.item.show(delegateItem.tooltipText, globalPos.x, tooltipY, root.parentScreen, false, false);
-                            }
-                        }
-                    }
-                    onExited: {
-                        if (root.hoveredItem === delegateItem) {
-                            root.hoveredItem = null;
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-
-                            tooltipLoader.active = false;
-                        }
-                    }
-                }
-            }
-        }
-        }
-    }
-
-    Component {
-        id: columnLayout
-        Column {
-            spacing: Theme.spacingXS
-
-            Repeater {
-                id: windowRepeater
-                model: sortedToplevels
-
-                delegate: Item {
-                id: delegateItem
-
-                property bool isFocused: modelData.activated
-                property string appId: modelData.appId || ""
-                property string windowTitle: modelData.title || "(Unnamed)"
-                property var toplevelObject: modelData
-                property string tooltipText: {
-                    let appName = "Unknown";
-                    if (appId) {
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        appName = desktopEntry
-                                && desktopEntry.name ? desktopEntry.name : appId;
-                    }
-                    return appName + (windowTitle ? " • " + windowTitle : "")
-                }
-
-                width: SettingsData.runningAppsCompactMode ? 24 : (24 + Theme.spacingXS + 120)
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: {
-                        if (isFocused) {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.3) : Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.2);
-                        } else {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primaryHover.r,
-                                                                 Theme.primaryHover.g,
-                                                                 Theme.primaryHover.b,
-                                                                 0.1) : "transparent";
-                        }
-                    }
-
-                }
-
-                IconImage {
-                    id: iconImg
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 18
-                    height: 18
-                    source: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        if (moddedId.toLowerCase().includes("steam_app")) {
-                            return ""
-                        }
-                        return Quickshell.iconPath(DesktopEntries.heuristicLookup(moddedId)?.icon, true)
-                    }
-                    smooth: true
-                    mipmap: true
-                    asynchronous: true
-                    visible: status === Image.Ready
-                }
-
-                DankIcon {
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    size: 18
-                    name: "sports_esports"
-                    color: Theme.surfaceText
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        return moddedId.toLowerCase().includes("steam_app")
-                    }
-                }
-
-                Text {
-                    anchors.centerIn: parent
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        const isSteamApp = moddedId.toLowerCase().includes("steam_app")
-                        return !iconImg.visible && !isSteamApp
-                    }
-                    text: {
-                        if (!appId) {
-                            return "?";
-                        }
-
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        if (desktopEntry && desktopEntry.name) {
-                            return desktopEntry.name.charAt(0).toUpperCase();
-                        }
-
-                        return appId.charAt(0).toUpperCase();
-                    }
-                    font.pixelSize: 10
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                }
-
-                StyledText {
-                    anchors.left: iconImg.right
-                    anchors.leftMargin: Theme.spacingXS
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.spacingS
-                    anchors.verticalCenter: parent.verticalCenter
-                    visible: !SettingsData.runningAppsCompactMode
-                    text: windowTitle
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    maximumLineCount: 1
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    onClicked: (mouse) => {
-                        if (mouse.button === Qt.LeftButton) {
-                            if (toplevelObject) {
-                                toplevelObject.activate();
-                            }
-                        } else if (mouse.button === Qt.RightButton) {
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-                            tooltipLoader.active = false;
-
-                            windowContextMenuLoader.active = true;
-                            if (windowContextMenuLoader.item) {
-                                windowContextMenuLoader.item.currentWindow = toplevelObject;
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeX = globalPos.x - screenX;
-                                const yPos = root.isVertical ? delegateItem.height / 2 : (Theme.barHeight + SettingsData.dankBarSpacing - 7);
-                                windowContextMenuLoader.item.showAt(relativeX, yPos);
-                            }
-                        }
-                    }
-                    onEntered: {
-                        root.hoveredItem = delegateItem;
-                        tooltipLoader.active = true;
-                        if (tooltipLoader.item) {
-                            if (root.isVertical) {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height / 2);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeY = globalPos.y - screenY;
-                                const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (root.parentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS);
-                                const isLeft = root.axis?.edge === "left";
-                                tooltipLoader.item.show(delegateItem.tooltipText, screenX + tooltipX, relativeY, root.parentScreen, isLeft, !isLeft);
-                            } else {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height);
-                                const tooltipY = Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS;
-                                tooltipLoader.item.show(delegateItem.tooltipText, globalPos.x, tooltipY, root.parentScreen, false, false);
-                            }
-                        }
-                    }
-                    onExited: {
-                        if (root.hoveredItem === delegateItem) {
-                            root.hoveredItem = null;
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-
-                            tooltipLoader.active = false;
-                        }
-                    }
-                }
-            }
-        }
-        }
-    }
-
-    Loader {
-        id: tooltipLoader
-
-        active: false
-
-        sourceComponent: DankTooltip {}
-    }
-    
-    Loader {
-        id: windowContextMenuLoader
-        active: false
-        sourceComponent: PanelWindow {
-            id: contextMenuWindow
-            
-            property var currentWindow: null
-            property bool isVisible: false
-            property point anchorPos: Qt.point(0, 0)
-            
-            function showAt(x, y) {
-                screen = root.parentScreen;
-                anchorPos = Qt.point(x, y);
-                isVisible = true;
-                visible = true;
-            }
-            
-            function close() {
-                isVisible = false;
-                visible = false;
-                windowContextMenuLoader.active = false;
-            }
-            
-            implicitWidth: 100
-            implicitHeight: 40
-            visible: false
-            color: "transparent"
-            
-            WlrLayershell.layer: WlrLayershell.Overlay
-            WlrLayershell.exclusiveZone: -1
-            WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-            
-            anchors {
-                top: true
-                left: true
-                right: true
-                bottom: true
-            }
-            
-            MouseArea {
-                anchors.fill: parent
-                onClicked: contextMenuWindow.close();
-            }
-            
-            Rectangle {
-                x: {
-                    const left = 10;
-                    const right = contextMenuWindow.width - width - 10;
-                    const want = contextMenuWindow.anchorPos.x - width / 2;
-                    return Math.max(left, Math.min(right, want));
-                }
-                y: contextMenuWindow.anchorPos.y
-                width: 100
-                height: 32
-                color: Theme.popupBackground()
-                radius: Theme.cornerRadius
-                border.width: 1
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                
-                Rectangle {
-                    anchors.fill: parent
-                    radius: parent.radius
-                    color: closeMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-                }
-                
-                StyledText {
-                    anchors.centerIn: parent
-                    text: I18n.tr("Close")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Normal
-                }
-                
-                MouseArea {
-                    id: closeMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (contextMenuWindow.currentWindow) {
-                            contextMenuWindow.currentWindow.close();
-                        }
-                        contextMenuWindow.close();
-                    }
-                }
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -1,633 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.SystemTray
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var parentWindow: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property bool isAtBottom: false
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property int calculatedSize: SystemTray.items.values.length > 0 ? SystemTray.items.values.length * 24 + horizontalPadding * 2 : 0
-
-    width: isVertical ? widgetThickness : calculatedSize
-    height: isVertical ? calculatedSize : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SystemTray.items.values.length === 0) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    visible: SystemTray.items.values.length > 0
-
-    Loader {
-        id: layoutLoader
-        anchors.centerIn: parent
-        sourceComponent: root.isVertical ? columnComp : rowComp
-    }
-
-    Component {
-        id: rowComp
-        Row {
-            spacing: 0
-
-            Repeater {
-                model: SystemTray.items.values
-
-                delegate: Item {
-                property var trayItem: modelData
-                property string iconSource: {
-                    let icon = trayItem && trayItem.icon;
-                    if (typeof icon === 'string' || icon instanceof String) {
-                        if (icon === "") {
-                            return "";
-                        }
-                        if (icon.includes("?path=")) {
-                            const split = icon.split("?path=");
-                            if (split.length !== 2) {
-                                return icon;
-                            }
-
-                            const name = split[0];
-                            const path = split[1];
-                            let fileName = name.substring(name.lastIndexOf("/") + 1);
-                            if (fileName.startsWith("dropboxstatus")) {
-                                fileName = `hicolor/16x16/status/${fileName}`;
-                            }
-                            return `file://${path}/${fileName}`;
-                        }
-                        if (icon.startsWith("/") && !icon.startsWith("file://")) {
-                            return `file://${icon}`;
-                        }
-                        return icon;
-                    }
-                    return "";
-                }
-
-                width: 24
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
-
-
-                }
-
-                IconImage {
-                    anchors.centerIn: parent
-                    width: 16
-                    height: 16
-                    source: parent.iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                }
-
-                MouseArea {
-                    id: trayItemArea
-
-                    anchors.fill: parent
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: (mouse) => {
-                        if (!trayItem) {
-                            return;
-                        }
-
-                        if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                            trayItem.activate();
-                            return ;
-                        }
-                        if (trayItem.hasMenu) {
-                            root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
-                        }
-                    }
-                }
-
-            }
-
-        }
-        }
-    }
-
-    Component {
-        id: columnComp
-        Column {
-            spacing: 0
-
-            Repeater {
-                model: SystemTray.items.values
-
-                delegate: Item {
-                property var trayItem: modelData
-                property string iconSource: {
-                    let icon = trayItem && trayItem.icon;
-                    if (typeof icon === 'string' || icon instanceof String) {
-                        if (icon === "") {
-                            return "";
-                        }
-                        if (icon.includes("?path=")) {
-                            const split = icon.split("?path=");
-                            if (split.length !== 2) {
-                                return icon;
-                            }
-
-                            const name = split[0];
-                            const path = split[1];
-                            const fileName = name.substring(name.lastIndexOf("/") + 1);
-                            return `file://${path}/${fileName}`;
-                        }
-                        if (icon.startsWith("/") && !icon.startsWith("file://")) {
-                            return `file://${icon}`;
-                        }
-                        return icon;
-                    }
-                    return "";
-                }
-
-                width: 24
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
-                }
-
-                IconImage {
-                    anchors.centerIn: parent
-                    width: 16
-                    height: 16
-                    source: parent.iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                }
-
-                MouseArea {
-                    id: trayItemArea
-
-                    anchors.fill: parent
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: (mouse) => {
-                        if (!trayItem) {
-                            return;
-                        }
-
-                        if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                            trayItem.activate();
-                            return ;
-                        }
-                        if (trayItem.hasMenu) {
-                            root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
-                        }
-                    }
-                }
-
-            }
-
-        }
-        }
-    }
-
-    Component {
-        id: trayMenuComponent
-
-        Rectangle {
-            id: menuRoot
-
-            property var trayItem: null
-            property var anchorItem: null
-            property var parentScreen: null
-            property bool isAtBottom: false
-            property bool isVertical: false
-            property var axis: null
-            property bool showMenu: false
-            property var menuHandle: null
-
-            ListModel { id: entryStack }
-            function topEntry() {
-                return entryStack.count ? entryStack.get(entryStack.count - 1).handle : null
-            }
-
-            function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
-                trayItem = item
-                anchorItem = anchor
-                parentScreen = screen
-                isAtBottom = atBottom
-                isVertical = vertical
-                axis = axisObj
-                menuHandle = item?.menu
-
-                if (parentScreen) {
-                    for (var i = 0; i < Quickshell.screens.length; i++) {
-                        const s = Quickshell.screens[i]
-                        if (s === parentScreen) {
-                            menuWindow.screen = s
-                            break
-                        }
-                    }
-                }
-
-                showMenu = true
-            }
-
-            function close() {
-                showMenu = false
-            }
-
-            function showSubMenu(entry) {
-                if (!entry || !entry.hasChildren) return;
-
-                entryStack.append({ handle: entry });
-
-                const h = entry.menu || entry;
-                if (h && typeof h.updateLayout === "function") h.updateLayout();
-
-                submenuHydrator.menu = h;
-                submenuHydrator.open();
-                Qt.callLater(() => submenuHydrator.close());
-            }
-
-            function goBack() {
-                if (!entryStack.count) return;
-                entryStack.remove(entryStack.count - 1);
-            }
-
-            width: 0
-            height: 0
-            color: "transparent"
-
-            PanelWindow {
-                id: menuWindow
-                visible: menuRoot.showMenu && (menuRoot.trayItem?.hasMenu ?? false)
-                WlrLayershell.layer: WlrLayershell.Overlay
-                WlrLayershell.exclusiveZone: -1
-                WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-                color: "transparent"
-
-                anchors {
-                    top: true
-                    left: true
-                    right: true
-                    bottom: true
-                }
-
-                property point anchorPos: Qt.point(screen.width / 2, screen.height / 2)
-
-                onVisibleChanged: {
-                    if (visible) {
-                        updatePosition()
-                    }
-                }
-
-                function updatePosition() {
-                    if (!menuRoot.anchorItem || !menuRoot.trayItem) {
-                        anchorPos = Qt.point(screen.width / 2, screen.height / 2)
-                        return
-                    }
-
-                    const globalPos = menuRoot.anchorItem.mapToGlobal(0, 0)
-                    const screenX = screen.x || 0
-                    const screenY = screen.y || 0
-                    const relativeX = globalPos.x - screenX
-                    const relativeY = globalPos.y - screenY
-
-                    const widgetThickness = Math.max(20, 26 + SettingsData.dankBarInnerPadding * 0.6)
-                    const effectiveBarThickness = Math.max(widgetThickness + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding))
-
-                    if (menuRoot.isVertical) {
-                        const edge = menuRoot.axis?.edge
-                        let targetX
-                        if (edge === "left") {
-                            targetX = effectiveBarThickness + SettingsData.dankBarSpacing + Theme.popupDistance
-                        } else {
-                            const popupX = effectiveBarThickness + SettingsData.dankBarSpacing + Theme.popupDistance
-                            targetX = screen.width - popupX
-                        }
-                        anchorPos = Qt.point(targetX, relativeY + menuRoot.anchorItem.height / 2)
-                    } else {
-                        let targetY
-                        if (menuRoot.isAtBottom) {
-                            const popupY = effectiveBarThickness + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap + Theme.popupDistance
-                            targetY = screen.height - popupY
-                        } else {
-                            targetY = effectiveBarThickness + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap + Theme.popupDistance
-                        }
-                        anchorPos = Qt.point(relativeX + menuRoot.anchorItem.width / 2, targetY)
-                    }
-                }
-
-                Rectangle {
-                    id: menuContainer
-
-                    width: Math.min(500, Math.max(250, menuColumn.implicitWidth + Theme.spacingS * 2))
-                    height: Math.max(40, menuColumn.implicitHeight + Theme.spacingS * 2)
-
-                    x: {
-                        if (menuRoot.isVertical) {
-                            const edge = menuRoot.axis?.edge
-                            if (edge === "left") {
-                                const targetX = menuWindow.anchorPos.x
-                                return Math.min(menuWindow.screen.width - width - 10, targetX)
-                            } else {
-                                const targetX = menuWindow.anchorPos.x - width
-                                return Math.max(10, targetX)
-                            }
-                        } else {
-                            const left = 10
-                            const right = menuWindow.width - width - 10
-                            const want = menuWindow.anchorPos.x - width / 2
-                            return Math.max(left, Math.min(right, want))
-                        }
-                    }
-
-                    y: {
-                        if (menuRoot.isVertical) {
-                            const top = 10
-                            const bottom = menuWindow.height - height - 10
-                            const want = menuWindow.anchorPos.y - height / 2
-                            return Math.max(top, Math.min(bottom, want))
-                        } else {
-                            if (menuRoot.isAtBottom) {
-                                const targetY = menuWindow.anchorPos.y - height
-                                return Math.max(10, targetY)
-                            } else {
-                                const targetY = menuWindow.anchorPos.y
-                                return Math.min(menuWindow.screen.height - height - 10, targetY)
-                            }
-                        }
-                    }
-
-                    color: Theme.popupBackground()
-                    radius: Theme.cornerRadius
-                    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-                    border.width: 1
-
-                    opacity: menuRoot.showMenu ? 1 : 0
-                    scale: menuRoot.showMenu ? 1 : 0.85
-
-                    Rectangle {
-                        anchors.fill: parent
-                        anchors.topMargin: 4
-                        anchors.leftMargin: 2
-                        anchors.rightMargin: -2
-                        anchors.bottomMargin: -4
-                        radius: parent.radius
-                        color: Qt.rgba(0, 0, 0, 0.15)
-                        z: parent.z - 1
-                    }
-
-                    QsMenuAnchor {
-                        id: submenuHydrator
-                        anchor.window: menuWindow
-                    }
-
-                    QsMenuOpener {
-                        id: rootOpener
-                        menu: menuRoot.menuHandle
-                    }
-
-                    QsMenuOpener {
-                        id: subOpener
-                        menu: {
-                            const e = menuRoot.topEntry();
-                            return e ? (e.menu || e) : null;
-                        }
-                    }
-
-
-                    Column {
-                        id: menuColumn
-
-                        width: parent.width - Theme.spacingS * 2
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.top: parent.top
-                        anchors.topMargin: Theme.spacingS
-                        spacing: 1
-
-                        Rectangle {
-                            visible: entryStack.count > 0
-                            width: parent.width
-                            height: 28
-                            radius: Theme.cornerRadius
-                            color: backArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                            Row {
-                                anchors.left: parent.left
-                                anchors.leftMargin: Theme.spacingS
-                                anchors.verticalCenter: parent.verticalCenter
-                                spacing: Theme.spacingXS
-
-                                DankIcon {
-                                    name: "arrow_back"
-                                    size: 16
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-
-                                StyledText {
-                                    text: I18n.tr("Back")
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                            }
-
-                            MouseArea {
-                                id: backArea
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: menuRoot.goBack()
-                            }
-                        }
-
-                        Rectangle {
-                            visible: entryStack.count > 0
-                            width: parent.width
-                            height: 1
-                            color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                        }
-
-                        Repeater {
-                            model: entryStack.count
-                                   ? (subOpener.children ? subOpener.children
-                                                         : (menuRoot.topEntry()?.children || []))
-                                   : rootOpener.children
-
-                            Rectangle {
-                                property var menuEntry: modelData
-
-                                width: menuColumn.width
-                                height: menuEntry?.isSeparator ? 1 : 28
-                                radius: menuEntry?.isSeparator ? 0 : Theme.cornerRadius
-                                color: {
-                                    if (menuEntry?.isSeparator) {
-                                        return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                                    }
-                                    return itemArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-                                }
-
-                                MouseArea {
-                                    id: itemArea
-                                    anchors.fill: parent
-                                    enabled: !menuEntry?.isSeparator && (menuEntry?.enabled !== false)
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-
-                                    onClicked: {
-                                        if (!menuEntry || menuEntry.isSeparator) return;
-
-                                        if (menuEntry.hasChildren) {
-                                            menuRoot.showSubMenu(menuEntry);
-                                        } else {
-                                            if (typeof menuEntry.activate === "function") {
-                                                menuEntry.activate();
-                                            } else if (typeof menuEntry.triggered === "function") {
-                                                menuEntry.triggered();
-                                            }
-                                            Qt.createQmlObject('import QtQuick; Timer { interval: 80; running: true; repeat: false; onTriggered: menuRoot.close() }', menuRoot);
-                                        }
-                                    }
-                                }
-
-                                Row {
-                                    anchors.left: parent.left
-                                    anchors.leftMargin: Theme.spacingS
-                                    anchors.right: parent.right
-                                    anchors.rightMargin: Theme.spacingS
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    spacing: Theme.spacingXS
-                                    visible: !menuEntry?.isSeparator
-
-                                    Rectangle {
-                                        width: 16
-                                        height: 16
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        visible: menuEntry?.buttonType !== undefined && menuEntry.buttonType !== 0
-                                        radius: menuEntry?.buttonType === 2 ? 8 : 2
-                                        border.width: 1
-                                        border.color: Theme.outline
-                                        color: "transparent"
-
-                                        Rectangle {
-                                            anchors.centerIn: parent
-                                            width: parent.width - 6
-                                            height: parent.height - 6
-                                            radius: parent.radius - 3
-                                            color: Theme.primary
-                                            visible: menuEntry?.checkState === 2
-                                        }
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            name: "check"
-                                            size: 10
-                                            color: Theme.primaryText
-                                            visible: menuEntry?.buttonType === 1 && menuEntry?.checkState === 2
-                                        }
-                                    }
-
-                                    Item {
-                                        width: 16
-                                        height: 16
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        visible: menuEntry?.icon && menuEntry.icon !== ""
-
-                                        Image {
-                                            anchors.fill: parent
-                                            source: menuEntry?.icon || ""
-                                            sourceSize.width: 16
-                                            sourceSize.height: 16
-                                            fillMode: Image.PreserveAspectFit
-                                            smooth: true
-                                        }
-                                    }
-
-                                    StyledText {
-                                        text: menuEntry?.text || ""
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: (menuEntry?.enabled !== false) ? Theme.surfaceText : Theme.surfaceTextMedium
-                                        elide: Text.ElideRight
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        width: Math.max(150, parent.width - 64)
-                                        wrapMode: Text.NoWrap
-                                    }
-
-                                    Item {
-                                        width: 16
-                                        height: 16
-                                        anchors.verticalCenter: parent.verticalCenter
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            name: "chevron_right"
-                                            size: 14
-                                            color: Theme.surfaceText
-                                            visible: menuEntry?.hasChildren ?? false
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Behavior on opacity {
-                        NumberAnimation {
-                            duration: Theme.mediumDuration
-                            easing.type: Theme.emphasizedEasing
-                        }
-                    }
-
-                    Behavior on scale {
-                        NumberAnimation {
-                            duration: Theme.mediumDuration
-                            easing.type: Theme.emphasizedEasing
-                        }
-                    }
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    z: -1
-                    onClicked: menuRoot.close()
-                }
-            }
-        }
-    }
-
-    property var currentTrayMenu: null
-
-    function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
-        if (currentTrayMenu) {
-            currentTrayMenu.destroy()
-        }
-        currentTrayMenu = trayMenuComponent.createObject(null)
-        if (currentTrayMenu) {
-            currentTrayMenu.showForTrayItem(item, anchor, screen, atBottom, vertical ?? false, axisObj)
-        }
-    }
-
-}

Modules/DankBar/Widgets/SystemUpdate.qml

@@ -1,154 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-    readonly property bool hasUpdates: SystemUpdateService.updateCount > 0
-    readonly property bool isChecking: SystemUpdateService.isChecking
-
-    signal clicked()
-
-    width: isVertical ? widgetThickness : (updaterIcon.width + horizontalPadding * 2)
-    height: isVertical ? widgetThickness : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = updaterArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: statusIcon
-
-        anchors.centerIn: parent
-        visible: root.isVertical
-        name: {
-            if (isChecking) return "refresh";
-            if (SystemUpdateService.hasError) return "error";
-            if (hasUpdates) return "system_update_alt";
-            return "check_circle";
-        }
-        size: Theme.barIconSize(barThickness, -4)
-        color: {
-            if (SystemUpdateService.hasError) return Theme.error;
-            if (hasUpdates) return Theme.primary;
-            return (updaterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText);
-        }
-
-        RotationAnimation {
-            id: rotationAnimation
-            target: statusIcon
-            property: "rotation"
-            from: 0
-            to: 360
-            duration: 1000
-            running: isChecking
-            loops: Animation.Infinite
-
-            onRunningChanged: {
-                if (!running) {
-                    statusIcon.rotation = 0
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        width: 8
-        height: 8
-        radius: 4
-        color: Theme.error
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
-        anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
-        visible: root.isVertical && root.hasUpdates && !root.isChecking
-    }
-
-    Row {
-        id: updaterIcon
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: !root.isVertical
-
-        DankIcon {
-            id: statusIconHorizontal
-
-            anchors.verticalCenter: parent.verticalCenter
-            name: {
-                if (isChecking) return "refresh";
-                if (SystemUpdateService.hasError) return "error";
-                if (hasUpdates) return "system_update_alt";
-                return "check_circle";
-            }
-            size: Theme.barIconSize(barThickness, -4)
-            color: {
-                if (SystemUpdateService.hasError) return Theme.error;
-                if (hasUpdates) return Theme.primary;
-                return (updaterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText);
-            }
-
-            RotationAnimation {
-                id: rotationAnimationHorizontal
-                target: statusIconHorizontal
-                property: "rotation"
-                from: 0
-                to: 360
-                duration: 1000
-                running: isChecking
-                loops: Animation.Infinite
-
-                onRunningChanged: {
-                    if (!running) {
-                        statusIconHorizontal.rotation = 0
-                    }
-                }
-            }
-        }
-
-        StyledText {
-            id: countText
-
-            anchors.verticalCenter: parent.verticalCenter
-            text: SystemUpdateService.updateCount.toString()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            visible: hasUpdates && !isChecking
-        }
-    }
-
-    MouseArea {
-        id: updaterArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked();
-        }
-    }
-
-}

Modules/DankBar/Widgets/Weather.qml

@@ -1,120 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-
-    signal clicked()
-
-    visible: SettingsData.weatherEnabled
-    width: isVertical ? widgetThickness : (visible ? Math.min(100, weatherRow.implicitWidth + horizontalPadding * 2) : 0)
-    height: isVertical ? (weatherColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = weatherArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Ref {
-        service: WeatherService
-    }
-
-    Column {
-        id: weatherColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
-            size: Theme.barIconSize(barThickness, -6)
-            color: Theme.primary
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
-                if (temp === undefined || temp === null || temp === 0) {
-                    return "--";
-                }
-                return temp;
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: weatherRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
-            size: Theme.barIconSize(barThickness, -6)
-            color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
-                if (temp === undefined || temp === null || temp === 0) {
-                    return "--°" + (SettingsData.useFahrenheit ? "F" : "C");
-                }
-
-                return temp + "°" + (SettingsData.useFahrenheit ? "F" : "C");
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-    }
-
-    MouseArea {
-        id: weatherArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked();
-        }
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -1,664 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string screenName: ""
-    property real widgetHeight: 30
-    property real barThickness: 48
-    property int currentWorkspace: {
-        if (CompositorService.isNiri) {
-            return getNiriActiveWorkspace()
-        } else if (CompositorService.isHyprland) {
-            return getHyprlandActiveWorkspace()
-        }
-        return 1
-    }
-    property var workspaceList: {
-        if (CompositorService.isNiri) {
-            const baseList = getNiriWorkspaces()
-            return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
-        }
-        if (CompositorService.isHyprland) {
-            const baseList = getHyprlandWorkspaces()
-            // Filter out special:scratch_term
-            const filteredList = baseList.filter(ws => ws.name !== "special:scratch_term" && ws.id !== -98)
-            return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
-        }
-        return [1]
-    }
-
-    function getWorkspaceIcons(ws) {
-        if (!SettingsData.showWorkspaceApps || !ws) {
-            return []
-        }
-
-        let targetWorkspaceId
-        if (CompositorService.isNiri) {
-            const wsNumber = typeof ws === "number" ? ws : -1
-            if (wsNumber <= 0) {
-                return []
-            }
-            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNumber && w.output === root.screenName)
-            if (!workspace) {
-                return []
-            }
-            targetWorkspaceId = workspace.id
-        } else if (CompositorService.isHyprland) {
-            targetWorkspaceId = ws.id !== undefined ? ws.id : ws
-        } else {
-            return []
-        }
-
-        const wins = CompositorService.isNiri ? (NiriService.windows || []) : CompositorService.sortedToplevels
-
-
-        const byApp = {}
-        const isActiveWs = CompositorService.isNiri ? NiriService.allWorkspaces.some(ws => ws.id === targetWorkspaceId && ws.is_active) : targetWorkspaceId === root.currentWorkspace
-
-        wins.forEach((w, i) => {
-                         if (!w) {
-                             return
-                         }
-
-                         let winWs = null
-                         if (CompositorService.isNiri) {
-                             winWs = w.workspace_id
-                         } else {
-                             // For Hyprland, we need to find the corresponding Hyprland toplevel to get workspace
-                             const hyprlandToplevels = Array.from(Hyprland.toplevels?.values || [])
-                             const hyprToplevel = hyprlandToplevels.find(ht => ht.wayland === w)
-                             winWs = hyprToplevel?.workspace?.id
-                         }
-
-
-                         if (winWs === undefined || winWs === null || winWs !== targetWorkspaceId) {
-                             return
-                         }
-
-                         const keyBase = (w.app_id || w.appId || w.class || w.windowClass || "unknown").toLowerCase()
-                         const key = isActiveWs ? `${keyBase}_${i}` : keyBase
-
-                         if (!byApp[key]) {
-                             const moddedId = Paths.moddedAppId(keyBase)
-                             const isSteamApp = moddedId.toLowerCase().includes("steam_app")
-                             const icon = isSteamApp ? "" : Quickshell.iconPath(DesktopEntries.heuristicLookup(moddedId)?.icon, true)
-                             byApp[key] = {
-                                 "type": "icon",
-                                 "icon": icon,
-                                 "isSteamApp": isSteamApp,
-                                 "active": !!(w.activated || (CompositorService.isNiri && w.is_focused)),
-                                 "count": 1,
-                                 "windowId": w.address || w.id,
-                                 "fallbackText": w.appId || w.class || w.title || ""
-                             }
-                         } else {
-                             byApp[key].count++
-                             if (w.activated || (CompositorService.isNiri && w.is_focused)) {
-                                 byApp[key].active = true
-                             }
-                         }
-                     })
-
-        return Object.values(byApp)
-    }
-
-    function padWorkspaces(list) {
-        const padded = list.slice()
-        const placeholder = CompositorService.isHyprland ? {
-                                                               "id": -1,
-                                                               "name": ""
-                                                           } : -1
-        while (padded.length < 3) {
-            padded.push(placeholder)
-        }
-        return padded
-    }
-
-    function getNiriWorkspaces() {
-        if (NiriService.allWorkspaces.length === 0) {
-            return [1, 2]
-        }
-
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            return NiriService.getCurrentOutputWorkspaceNumbers()
-        }
-
-        const displayWorkspaces = NiriService.allWorkspaces.filter(ws => ws.output === root.screenName).map(ws => ws.idx + 1)
-        return displayWorkspaces.length > 0 ? displayWorkspaces : [1, 2]
-    }
-
-    function getNiriActiveWorkspace() {
-        if (NiriService.allWorkspaces.length === 0) {
-            return 1
-        }
-
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            return NiriService.getCurrentWorkspaceNumber()
-        }
-
-        const activeWs = NiriService.allWorkspaces.find(ws => ws.output === root.screenName && ws.is_active)
-        return activeWs ? activeWs.idx + 1 : 1
-    }
-
-    function getHyprlandWorkspaces() {
-        const workspaces = Hyprland.workspaces?.values || []
-
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            // Show all workspaces on all monitors if per-monitor filtering is disabled
-            const sorted = workspaces.slice().sort((a, b) => a.id - b.id)
-            return sorted.length > 0 ? sorted : [{
-                        "id": 1,
-                        "name": "1"
-                    }]
-        }
-
-        // Filter workspaces for this specific monitor using lastIpcObject.monitor
-        // This matches the approach from the original kyle-config
-        const monitorWorkspaces = workspaces.filter(ws => {
-            return ws.lastIpcObject && ws.lastIpcObject.monitor === root.screenName
-        })
-
-        if (monitorWorkspaces.length === 0) {
-            // Fallback if no workspaces exist for this monitor
-            return [{
-                        "id": 1,
-                        "name": "1"
-                    }]
-        }
-
-        // Return all workspaces for this monitor, sorted by ID
-        return monitorWorkspaces.sort((a, b) => a.id - b.id)
-    }
-
-    function getHyprlandActiveWorkspace() {
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            return Hyprland.focusedWorkspace ? Hyprland.focusedWorkspace.id : 1
-        }
-
-        // Find the monitor object for this screen
-        const monitors = Hyprland.monitors?.values || []
-        const currentMonitor = monitors.find(monitor => monitor.name === root.screenName)
-
-        if (!currentMonitor) {
-            return 1
-        }
-
-        // Use the monitor's active workspace ID (like original config)
-        return currentMonitor.activeWorkspace?.id ?? 1
-    }
-
-    readonly property real padding: isVertical
-        ? Math.max(Theme.spacingXS, Theme.spacingS * (widgetHeight / 30))
-        : (widgetHeight - workspaceRow.implicitHeight) / 2
-
-    function getRealWorkspaces() {
-        return root.workspaceList.filter(ws => {
-                                             if (CompositorService.isHyprland) {
-                                                 return ws && ws.id !== -1
-                                             }
-                                             return ws !== -1
-                                         })
-    }
-
-    function switchWorkspace(direction) {
-        if (CompositorService.isNiri) {
-            const realWorkspaces = getRealWorkspaces()
-            if (realWorkspaces.length < 2) {
-                return
-            }
-
-            const currentIndex = realWorkspaces.findIndex(ws => ws === root.currentWorkspace)
-            const validIndex = currentIndex === -1 ? 0 : currentIndex
-            const nextIndex = direction > 0 ? (validIndex + 1) % realWorkspaces.length : (validIndex - 1 + realWorkspaces.length) % realWorkspaces.length
-
-            NiriService.switchToWorkspace(realWorkspaces[nextIndex] - 1)
-        } else if (CompositorService.isHyprland) {
-            const command = direction > 0 ? "workspace r+1" : "workspace r-1"
-            Hyprland.dispatch(command)
-        }
-    }
-
-    width: isVertical ? widgetHeight : (workspaceRow.implicitWidth + padding * 2)
-    height: isVertical ? (workspaceRow.implicitHeight + padding * 2) : widgetHeight
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground)
-            return "transparent"
-        const baseColor = Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-    visible: CompositorService.isNiri || CompositorService.isHyprland
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        acceptedButtons: Qt.NoButton
-
-        property real scrollAccumulator: 0
-        property real touchpadThreshold: 500
-
-        onWheel: wheel => {
-                     const deltaY = wheel.angleDelta.y
-                     const isMouseWheel = Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0
-                     const direction = deltaY < 0 ? 1 : -1
-
-                     if (isMouseWheel) {
-                         switchWorkspace(direction)
-                     } else {
-                         scrollAccumulator += deltaY
-
-                         if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
-                             const touchDirection = scrollAccumulator < 0 ? 1 : -1
-                             switchWorkspace(touchDirection)
-                             scrollAccumulator = 0
-                         }
-                     }
-
-                     wheel.accepted = true
-                 }
-    }
-
-    Flow {
-        id: workspaceRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        flow: isVertical ? Flow.TopToBottom : Flow.LeftToRight
-
-        Repeater {
-            model: root.workspaceList
-
-            Rectangle {
-                id: delegateRoot
-
-                property bool isActive: {
-                    if (CompositorService.isHyprland) {
-                        return modelData && modelData.id === root.currentWorkspace
-                    }
-                    return modelData === root.currentWorkspace
-                }
-                property bool isPlaceholder: {
-                    if (CompositorService.isHyprland) {
-                        return modelData && modelData.id === -1
-                    }
-                    return modelData === -1
-                }
-                property bool isHovered: mouseArea.containsMouse
-
-                property var loadedWorkspaceData: null
-                property bool loadedIsUrgent: false
-                property bool isUrgent: {
-                    if (CompositorService.isHyprland) {
-                        return modelData?.urgent ?? false
-                    }
-                    if (CompositorService.isNiri) {
-                        return loadedIsUrgent
-                    }
-                    return false
-                }
-                property var loadedIconData: null
-                property bool loadedHasIcon: false
-                property var loadedIcons: []
-
-                Timer {
-                    id: dataUpdateTimer
-                    interval: 50
-                    onTriggered: {
-                        if (isPlaceholder) {
-                            delegateRoot.loadedWorkspaceData = null
-                            delegateRoot.loadedIconData = null
-                            delegateRoot.loadedHasIcon = false
-                            delegateRoot.loadedIcons = []
-                            delegateRoot.loadedIsUrgent = false
-                            return
-                        }
-
-                        var wsData = null;
-                        if (CompositorService.isNiri) {
-                            wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.screenName) || null;
-                        } else if (CompositorService.isHyprland) {
-                            wsData = modelData;
-                        }
-                        delegateRoot.loadedWorkspaceData = wsData;
-                        delegateRoot.loadedIsUrgent = wsData?.is_urgent ?? false;
-
-                        var icData = null;
-                        if (wsData?.name) {
-                            icData = SettingsData.getWorkspaceNameIcon(wsData.name);
-                        }
-                        delegateRoot.loadedIconData = icData;
-                        delegateRoot.loadedHasIcon = icData !== null;
-
-                        if (SettingsData.showWorkspaceApps) {
-                            delegateRoot.loadedIcons = root.getWorkspaceIcons(CompositorService.isHyprland ? modelData : (modelData === -1 ? null : modelData));
-                        } else {
-                            delegateRoot.loadedIcons = [];
-                        }
-                    }
-                }
-
-                function updateAllData() {
-                    dataUpdateTimer.restart()
-                }
-
-                width: {
-                    if (root.isVertical) {
-                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5;
-                    } else {
-                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
-                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                            const iconsWidth = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0);
-                            const baseWidth = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7;
-                            return baseWidth + iconsWidth;
-                        }
-                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7;
-                    }
-                }
-                height: {
-                    if (root.isVertical) {
-                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
-                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                            const iconsHeight = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0);
-                            const baseHeight = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7;
-                            return baseHeight + iconsHeight;
-                        }
-                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7;
-                    } else {
-                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5;
-                    }
-                }
-                radius: Math.min(width, height) / 2
-                color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.outlineButton : Theme.surfaceTextAlpha
-
-                border.width: isUrgent && !isActive ? 2 : 0
-                border.color: isUrgent && !isActive ? Theme.error : Theme.withAlpha(Theme.error, 0)
-
-                Behavior on width {
-                    enabled: (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on height {
-                    enabled: root.isVertical && (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on border.width {
-                    NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.centerIn: parent
-                    width: root.isVertical ? parent.width + Theme.spacingXL : parent.width
-                    height: root.isVertical ? parent.height : parent.height + Theme.spacingXL
-                    hoverEnabled: !isPlaceholder
-                    cursorShape: isPlaceholder ? Qt.ArrowCursor : Qt.PointingHandCursor
-                    enabled: !isPlaceholder
-                    onClicked: {
-                        if (isPlaceholder) {
-                            return
-                        }
-
-                        if (CompositorService.isNiri) {
-                            NiriService.switchToWorkspace(modelData - 1)
-                        } else if (CompositorService.isHyprland && modelData?.id) {
-                            Hyprland.dispatch(`workspace ${modelData.id}`)
-                        }
-                    }
-                }
-
-                Loader {
-                    id: appIconsLoader
-                    anchors.fill: parent
-                    active: SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        Loader {
-                            id: contentRow
-                            anchors.centerIn: parent
-                            sourceComponent: root.isVertical ? columnLayout : rowLayout
-                        }
-
-                        Component {
-                            id: rowLayout
-                            Row {
-                                spacing: 4
-                                visible: loadedIcons.length > 0
-
-                                Repeater {
-                                    model: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
-                                    delegate: Item {
-                                        width: 18
-                                        height: 18
-
-                                        IconImage {
-                                            id: appIcon
-                                            property var windowId: modelData.windowId
-                                            anchors.fill: parent
-                                            source: modelData.icon
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: !modelData.isSteamApp
-                                        }
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            size: 18
-                                            name: "sports_esports"
-                                            color: Theme.surfaceText
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: modelData.isSteamApp
-                                        }
-
-                                        MouseArea {
-                                            id: appMouseArea
-                                            hoverEnabled: true
-                                            anchors.fill: parent
-                                            enabled: isActive
-                                            cursorShape: Qt.PointingHandCursor
-                                            onClicked: {
-                                                if (CompositorService.isHyprland) {
-                                                    Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`)
-                                                } else if (CompositorService.isNiri) {
-                                                    NiriService.focusWindow(appIcon.windowId)
-                                                }
-                                            }
-                                        }
-
-                                        Rectangle {
-                                            visible: modelData.count > 1 && !isActive
-                                            width: 12
-                                            height: 12
-                                            radius: 6
-                                            color: "black"
-                                            border.color: "white"
-                                            border.width: 1
-                                            anchors.right: parent.right
-                                            anchors.bottom: parent.bottom
-                                            z: 2
-
-                                            Text {
-                                                anchors.centerIn: parent
-                                                text: modelData.count
-                                                font.pixelSize: 8
-                                                color: "white"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Component {
-                            id: columnLayout
-                            Column {
-                                spacing: 4
-                                visible: loadedIcons.length > 0
-
-                                Repeater {
-                                    model: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
-                                    delegate: Item {
-                                        width: 18
-                                        height: 18
-
-                                        IconImage {
-                                            id: appIcon
-                                            property var windowId: modelData.windowId
-                                            anchors.fill: parent
-                                            source: modelData.icon
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: !modelData.isSteamApp
-                                        }
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            size: 18
-                                            name: "sports_esports"
-                                            color: Theme.surfaceText
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: modelData.isSteamApp
-                                        }
-
-                                        MouseArea {
-                                            id: appMouseArea
-                                            hoverEnabled: true
-                                            anchors.fill: parent
-                                            enabled: isActive
-                                            cursorShape: Qt.PointingHandCursor
-                                            onClicked: {
-                                                if (CompositorService.isHyprland) {
-                                                    Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`)
-                                                } else if (CompositorService.isNiri) {
-                                                    NiriService.focusWindow(appIcon.windowId)
-                                                }
-                                            }
-                                        }
-
-                                        Rectangle {
-                                            visible: modelData.count > 1 && !isActive
-                                            width: 12
-                                            height: 12
-                                            radius: 6
-                                            color: "black"
-                                            border.color: "white"
-                                            border.width: 1
-                                            anchors.right: parent.right
-                                            anchors.bottom: parent.bottom
-                                            z: 2
-
-                                            Text {
-                                                anchors.centerIn: parent
-                                                text: modelData.count
-                                                font.pixelSize: 8
-                                                color: "white"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Loader for Custom Name Icon
-                Loader {
-                    id: customIconLoader
-                    anchors.fill: parent
-                    active: !isPlaceholder && loadedHasIcon && loadedIconData.type === "icon" && !SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: loadedIconData ? loadedIconData.value : "" // NULL CHECK
-                            size: Theme.fontSizeSmall
-                            color: isActive ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : Theme.surfaceTextMedium
-                            weight: isActive && !isPlaceholder ? 500 : 400
-                        }
-                    }
-                }
-
-                // Loader for Custom Name Text
-                Loader {
-                    id: customTextLoader
-                    anchors.fill: parent
-                    active: !isPlaceholder && loadedHasIcon && loadedIconData.type === "text" && !SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: loadedIconData ? loadedIconData.value : "" // NULL CHECK
-                            color: isActive ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : Theme.surfaceTextMedium
-                            font.pixelSize: Theme.barTextSize(barThickness)
-                            font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
-                        }
-                    }
-                }
-
-                // Loader for Workspace Index
-                Loader {
-                    id: indexLoader
-                    anchors.fill: parent
-                    active: !isPlaceholder && SettingsData.showWorkspaceIndex && !loadedHasIcon && !SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: {
-                                const isPlaceholder = CompositorService.isHyprland ? (modelData?.id === -1) : (modelData === -1)
-                                if (isPlaceholder) {
-                                    return index + 1
-                                }
-                                return CompositorService.isHyprland ? (modelData?.id || "") : (modelData - 1);
-                            }
-                            color: (isActive || isUrgent) ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
-                            font.pixelSize: Theme.barTextSize(barThickness)
-                            font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
-                        }
-                    }
-                }
-
-                // --- LOGIC / TRIGGERS ---
-                Component.onCompleted: updateAllData()
-
-                Connections {
-                    target: CompositorService
-                    function onSortedToplevelsChanged() { delegateRoot.updateAllData() }
-                }
-                Connections {
-                    target: NiriService
-                    enabled: CompositorService.isNiri
-                    function onAllWorkspacesChanged() { delegateRoot.updateAllData() }
-                    function onWindowUrgentChanged() { delegateRoot.updateAllData() }
-                }
-                Connections {
-                    target: SettingsData
-                    function onShowWorkspaceAppsChanged() { delegateRoot.updateAllData() }
-                    function onWorkspaceNameIconsChanged() { delegateRoot.updateAllData() }
-                }
-            }
-        }
-    }
-}

Modules/DankDash/DankDashPopout.qml

@@ -1,204 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Effects
-import QtQuick.Layouts
-import Quickshell
-import Quickshell.Services.Mpris
-import Quickshell.Wayland
-import qs.Common
-import qs.Widgets
-import qs.Modules.DankDash
-
-DankPopout {
-    id: root
-
-    property bool dashVisible: false
-    property var triggerScreen: null
-    property int currentTabIndex: 0
-
-    function setTriggerPosition(x, y, width, section, screen) {
-        triggerSection = section
-        triggerScreen = screen
-        triggerY = y
-
-        if (section === "center" && (SettingsData.dankBarPosition === SettingsData.Position.Top || SettingsData.dankBarPosition === SettingsData.Position.Bottom)) {
-            const screenWidth = screen ? screen.width : Screen.width
-            triggerX = (screenWidth - popupWidth) / 2
-            triggerWidth = popupWidth
-        } else if (section === "center" && (SettingsData.dankBarPosition === SettingsData.Position.Left || SettingsData.dankBarPosition === SettingsData.Position.Right)) {
-            const screenHeight = screen ? screen.height : Screen.height
-            triggerX = (screenHeight - popupHeight) / 2
-            triggerWidth = popupHeight
-        } else {
-            triggerX = x
-            triggerWidth = width
-        }
-    }
-
-    popupWidth: 700
-    popupHeight: contentLoader.item ? contentLoader.item.implicitHeight : 500
-    triggerX: Screen.width - 620 - Theme.spacingL
-    triggerY: Math.max(26 + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding)) + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap - 2
-    triggerWidth: 80
-    shouldBeVisible: dashVisible
-    visible: shouldBeVisible
-
-
-    onDashVisibleChanged: {
-        if (dashVisible) {
-            open()
-        } else {
-            close()
-        }
-    }
-
-    onBackgroundClicked: {
-        dashVisible = false
-    }
-
-    content: Component {
-        Rectangle {
-            id: mainContainer
-
-            implicitHeight: contentColumn.height + Theme.spacingM * 2
-            color: Theme.surfaceContainer
-            radius: Theme.cornerRadius
-            focus: true
-
-            Component.onCompleted: {
-                if (root.shouldBeVisible) {
-                    forceActiveFocus()
-                }
-            }
-
-            Keys.onPressed: function(event) {
-                if (event.key === Qt.Key_Escape) {
-                    root.dashVisible = false
-                    event.accepted = true
-                }
-            }
-
-            Connections {
-                function onShouldBeVisibleChanged() {
-                    if (root.shouldBeVisible) {
-                        Qt.callLater(function() {
-                            mainContainer.forceActiveFocus()
-                        })
-                    }
-                }
-                target: root
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                color: Qt.rgba(Theme.surfaceTint.r, Theme.surfaceTint.g, Theme.surfaceTint.b, 0.04)
-                radius: parent.radius
-
-                SequentialAnimation on opacity {
-                    running: root.shouldBeVisible
-                    loops: Animation.Infinite
-
-                    NumberAnimation {
-                        to: 0.08
-                        duration: Theme.extraLongDuration
-                        easing.type: Theme.standardEasing
-                    }
-
-                    NumberAnimation {
-                        to: 0.02
-                        duration: Theme.extraLongDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
-            }
-
-            Column {
-                id: contentColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingS
-
-                DankTabBar {
-                    id: tabBar
-
-                    width: parent.width
-                    height: 48
-                    currentIndex: root.currentTabIndex
-                    spacing: Theme.spacingS
-                    equalWidthTabs: true
-
-                    model: {
-                        let tabs = [
-                            { icon: "dashboard", text: I18n.tr("Overview") },
-                            { icon: "music_note", text: I18n.tr("Media") }
-                        ]
-                        
-                        if (SettingsData.weatherEnabled) {
-                            tabs.push({ icon: "wb_sunny", text: I18n.tr("Weather") })
-                        }
-                        
-                        tabs.push({ icon: "settings", text: I18n.tr("Settings"), isAction: true })
-                        return tabs
-                    }
-
-                    onTabClicked: function(index) {
-                        root.currentTabIndex = index
-                    }
-
-                    onActionTriggered: function(index) {
-                        let settingsIndex = SettingsData.weatherEnabled ? 3 : 2
-                        if (index === settingsIndex) {
-                            dashVisible = false
-                            settingsModal.show()
-                        }
-                    }
-
-                }
-
-                Item {
-                    width: parent.width
-                    height: Theme.spacingXS
-                }
-
-                StackLayout {
-                    id: pages
-                    width: parent.width
-                    implicitHeight: {
-                        if (currentIndex === 0) return overviewTab.implicitHeight
-                        if (currentIndex === 1) return mediaTab.implicitHeight
-                        if (SettingsData.weatherEnabled && currentIndex === 2) return weatherTab.implicitHeight
-                        return overviewTab.implicitHeight
-                    }
-                    currentIndex: root.currentTabIndex
-
-                    OverviewTab {
-                        id: overviewTab
-
-                        onSwitchToWeatherTab: {
-                            if (SettingsData.weatherEnabled) {
-                                tabBar.currentIndex = 2
-                                tabBar.tabClicked(2)
-                            }
-                        }
-
-                        onSwitchToMediaTab: {
-                            tabBar.currentIndex = 1
-                            tabBar.tabClicked(1)
-                        }
-                    }
-
-                    MediaPlayerTab {
-                        id: mediaTab
-                    }
-
-                    WeatherTab {
-                        id: weatherTab
-                        visible: SettingsData.weatherEnabled && root.currentTabIndex === 2
-                    }
-                }
-            }
-        }
-    }
-}

Modules/Dock/Dock.qml

@@ -1,356 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-pragma ComponentBehavior: Bound
-
-Variants {
-    id: dockVariants
-    model: SettingsData.getFilteredScreens("dock")
-
-    property var contextMenu
-
-    delegate: PanelWindow {
-        id: dock
-
-        WlrLayershell.namespace: "quickshell:dock"
-
-        readonly property bool isVertical: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right
-
-        anchors {
-            top: !isVertical ? (SettingsData.dockPosition === SettingsData.Position.Top) : true
-            bottom: !isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom) : true
-            left: !isVertical ? true : (SettingsData.dockPosition === SettingsData.Position.Left)
-            right: !isVertical ? true : (SettingsData.dockPosition === SettingsData.Position.Right)
-        }
-
-        property var modelData: item
-    property bool autoHide: SettingsData.dockAutoHide
-    property real backgroundTransparency: SettingsData.dockTransparency
-    property bool groupByApp: SettingsData.dockGroupByApp
-
-    readonly property real widgetHeight: Math.max(20, 26 + SettingsData.dankBarInnerPadding * 0.6)
-    readonly property real effectiveBarHeight: Math.max(widgetHeight + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding))
-    readonly property real barSpacing: {
-        const barIsHorizontal = (SettingsData.dankBarPosition === SettingsData.Position.Top || SettingsData.dankBarPosition === SettingsData.Position.Bottom)
-        const barIsVertical = (SettingsData.dankBarPosition === SettingsData.Position.Left || SettingsData.dankBarPosition === SettingsData.Position.Right)
-        const samePosition = (SettingsData.dockPosition === SettingsData.dankBarPosition)
-        const dockIsHorizontal = !isVertical
-        const dockIsVertical = isVertical
-
-        if (!SettingsData.dankBarVisible) return 0
-        if (dockIsHorizontal && barIsHorizontal && samePosition) {
-            return SettingsData.dankBarSpacing + effectiveBarHeight + SettingsData.dankBarBottomGap
-        }
-        if (dockIsVertical && barIsVertical && samePosition) {
-            return SettingsData.dankBarSpacing + effectiveBarHeight + SettingsData.dankBarBottomGap
-        }
-        return 0
-    }
-
-    readonly property real dockMargin: SettingsData.dockSpacing
-    readonly property real positionSpacing: barSpacing + SettingsData.dockBottomGap
-    readonly property real _dpr: (dock.screen && dock.screen.devicePixelRatio) ? dock.screen.devicePixelRatio : 1
-    function px(v) { return Math.round(v * _dpr) / _dpr }
-
-
-    property bool contextMenuOpen: (dockVariants.contextMenu && dockVariants.contextMenu.visible && dockVariants.contextMenu.screen === modelData)
-    property bool windowIsFullscreen: {
-        if (!ToplevelManager.activeToplevel) {
-            return false
-        }
-        const activeWindow = ToplevelManager.activeToplevel
-        const fullscreenApps = ["vlc", "mpv", "kodi", "steam", "lutris", "wine", "dosbox"]
-        return fullscreenApps.some(app => activeWindow.appId && activeWindow.appId.toLowerCase().includes(app))
-    }
-    property bool revealSticky: false
-
-    Timer {
-        id: revealHold
-        interval: 250
-        repeat: false
-        onTriggered: dock.revealSticky = false
-    }
-
-    property bool reveal: {
-        if (CompositorService.isNiri && NiriService.inOverview && SettingsData.dockOpenOnOverview) {
-            return true
-        }
-        return (!autoHide || dockMouseArea.containsMouse || dockApps.requestDockShow || contextMenuOpen || revealSticky) && !windowIsFullscreen
-    }
-
-    onContextMenuOpenChanged: {
-        if (!contextMenuOpen && autoHide && !dockMouseArea.containsMouse) {
-            revealSticky = true
-            revealHold.restart()
-        }
-    }
-
-    Connections {
-        target: SettingsData
-        function onDockTransparencyChanged() {
-            dock.backgroundTransparency = SettingsData.dockTransparency
-        }
-    }
-
-    screen: modelData
-    visible: SettingsData.showDock || (CompositorService.isNiri && SettingsData.dockOpenOnOverview && NiriService.inOverview)
-    color: "transparent"
-
-
-    exclusiveZone: {
-        if (!SettingsData.showDock || autoHide) return -1
-        if (barSpacing > 0) return -1
-        return px(58 + SettingsData.dockSpacing + SettingsData.dockBottomGap)
-    }
-
-    mask: Region {
-        item: dockMouseArea
-    }
-
-    Rectangle {
-        id: appTooltip
-        z: 1000
-
-        property var hoveredButton: {
-            if (!dockApps.children[0]) {
-                return null
-            }
-            const layoutItem = dockApps.children[0]
-            const flowLayout = layoutItem.children[0]
-            let repeater = null
-            for (var i = 0; i < flowLayout.children.length; i++) {
-                const child = flowLayout.children[i]
-                if (child && typeof child.count !== "undefined" && typeof child.itemAt === "function") {
-                    repeater = child
-                    break
-                }
-            }
-            if (!repeater || !repeater.itemAt) {
-                return null
-            }
-            for (var i = 0; i < repeater.count; i++) {
-                const item = repeater.itemAt(i)
-                if (item && item.dockButton && item.dockButton.showTooltip) {
-                    return item.dockButton
-                }
-            }
-            return null
-        }
-
-        property string tooltipText: hoveredButton ? hoveredButton.tooltipText : ""
-
-        visible: hoveredButton !== null && tooltipText !== ""
-        width: px(tooltipLabel.implicitWidth + 24)
-        height: px(tooltipLabel.implicitHeight + 12)
-
-        color: Theme.surfaceContainer
-        radius: Theme.cornerRadius
-        border.width: 1
-        border.color: Theme.outlineMedium
-
-        x: {
-            if (!hoveredButton) return 0
-            const buttonPos = hoveredButton.mapToItem(dock.contentItem, 0, 0)
-            if (!dock.isVertical) {
-                return buttonPos.x + hoveredButton.width / 2 - width / 2
-            } else {
-                if (SettingsData.dockPosition === SettingsData.Position.Right) {
-                    return buttonPos.x - width - Theme.spacingS
-                } else {
-                    return buttonPos.x + hoveredButton.width + Theme.spacingS
-                }
-            }
-        }
-        y: {
-            if (!hoveredButton) return 0
-            const buttonPos = hoveredButton.mapToItem(dock.contentItem, 0, 0)
-            if (!dock.isVertical) {
-                if (SettingsData.dockPosition === SettingsData.Position.Bottom) {
-                    return buttonPos.y - height - Theme.spacingS
-                } else {
-                    return buttonPos.y + hoveredButton.height + Theme.spacingS
-                }
-            } else {
-                return buttonPos.y + hoveredButton.height / 2 - height / 2
-            }
-        }
-
-        StyledText {
-            id: tooltipLabel
-            anchors.centerIn: parent
-            text: appTooltip.tooltipText
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceText
-        }
-    }
-
-    Item {
-        id: dockCore
-        anchors.fill: parent
-
-        Connections {
-            target: dockMouseArea
-            function onContainsMouseChanged() {
-                if (dockMouseArea.containsMouse) {
-                    dock.revealSticky = true
-                    revealHold.stop()
-                } else {
-                    if (dock.autoHide && !dock.contextMenuOpen) {
-                        revealHold.restart()
-                    }
-                }
-            }
-        }
-
-        MouseArea {
-            id: dockMouseArea
-            property real currentScreen: modelData ? modelData : dock.screen
-            property real screenWidth: currentScreen ? currentScreen.geometry.width : 1920
-            property real screenHeight: currentScreen ? currentScreen.geometry.height : 1080
-            property real maxDockWidth: Math.min(screenWidth * 0.8, 1200)
-            property real maxDockHeight: Math.min(screenHeight * 0.8, 1200)
-
-            height: {
-                if (dock.isVertical) {
-                    return dock.reveal ? Math.min(dockBackground.implicitHeight + 32, maxDockHeight) : Math.min(Math.max(dockBackground.implicitHeight + 64, 200), screenHeight * 0.5)
-                } else {
-                    return dock.reveal ? px(58 + SettingsData.dockSpacing + SettingsData.dockBottomGap) : 1
-                }
-            }
-            width: {
-                if (dock.isVertical) {
-                    return dock.reveal ? px(58 + SettingsData.dockSpacing + SettingsData.dockBottomGap) : 1
-                } else {
-                    return dock.reveal ? Math.min(dockBackground.implicitWidth + 32, maxDockWidth) : Math.min(Math.max(dockBackground.implicitWidth + 64, 200), screenWidth * 0.5)
-                }
-            }
-            anchors {
-                top: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? undefined : parent.top) : undefined
-                bottom: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined) : undefined
-                horizontalCenter: !dock.isVertical ? parent.horizontalCenter : undefined
-                left: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.left) : undefined
-                right: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined) : undefined
-                verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
-            }
-            hoverEnabled: true
-            acceptedButtons: Qt.NoButton
-
-            Behavior on height {
-                NumberAnimation {
-                    duration: 200
-                    easing.type: Easing.OutCubic
-                }
-            }
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 200
-                    easing.type: Easing.OutCubic
-                }
-            }
-
-            Item {
-                id: dockContainer
-                anchors.fill: parent
-
-                transform: Translate {
-                    id: dockSlide
-                    x: {
-                        if (!dock.isVertical) return 0
-                        if (dock.reveal) return 0
-                        const hideDistance = 58 + SettingsData.dockSpacing + SettingsData.dockBottomGap + 10
-                        if (SettingsData.dockPosition === SettingsData.Position.Right) {
-                            return hideDistance
-                        } else {
-                            return -hideDistance
-                        }
-                    }
-                    y: {
-                        if (dock.isVertical) return 0
-                        if (dock.reveal) return 0
-                        const hideDistance = 58 + SettingsData.dockSpacing + SettingsData.dockBottomGap + 10
-                        if (SettingsData.dockPosition === SettingsData.Position.Bottom) {
-                            return hideDistance
-                        } else {
-                            return -hideDistance
-                        }
-                    }
-
-                    Behavior on x {
-                        NumberAnimation {
-                            duration: 200
-                            easing.type: Easing.OutCubic
-                        }
-                    }
-
-                    Behavior on y {
-                        NumberAnimation {
-                            duration: 200
-                            easing.type: Easing.OutCubic
-                        }
-                    }
-                }
-
-                Rectangle {
-                    id: dockBackground
-                    objectName: "dockBackground"
-                    anchors {
-                        top: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? undefined : parent.top) : undefined
-                        bottom: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined) : undefined
-                        horizontalCenter: !dock.isVertical ? parent.horizontalCenter : undefined
-                        left: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.left) : undefined
-                        right: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined) : undefined
-                        verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
-                    }
-                    anchors.topMargin: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? 0 : barSpacing + 4) : 0
-                    anchors.bottomMargin: !dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Bottom ? barSpacing + 1 : 0) : 0
-                    anchors.leftMargin: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? 0 : barSpacing + 4) : 0
-                    anchors.rightMargin: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? barSpacing + 1 : 0) : 0
-
-                    implicitWidth: dock.isVertical ? (dockApps.implicitHeight + SettingsData.dockSpacing * 2) : (dockApps.implicitWidth + SettingsData.dockSpacing * 2)
-                    implicitHeight: dock.isVertical ? (dockApps.implicitWidth + SettingsData.dockSpacing * 2) : (dockApps.implicitHeight + SettingsData.dockSpacing * 2)
-                    width: implicitWidth
-                    height: implicitHeight
-
-                    color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, backgroundTransparency)
-                    radius: Theme.cornerRadius
-                    border.width: 1
-                    border.color: Theme.outlineMedium
-                    layer.enabled: true
-
-                    Rectangle {
-                        anchors.fill: parent
-                        color: Qt.rgba(Theme.surfaceTint.r, Theme.surfaceTint.g, Theme.surfaceTint.b, 0.04)
-                        radius: parent.radius
-                    }
-
-                    DockApps {
-                        id: dockApps
-
-                        anchors.top: !dock.isVertical ? parent.top : undefined
-                        anchors.bottom: !dock.isVertical ? parent.bottom : undefined
-                        anchors.horizontalCenter: !dock.isVertical ? parent.horizontalCenter : undefined
-                        anchors.left: dock.isVertical ? parent.left : undefined
-                        anchors.right: dock.isVertical ? parent.right : undefined
-                        anchors.verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
-                        anchors.topMargin: !dock.isVertical ? SettingsData.dockSpacing : 0
-                        anchors.bottomMargin: !dock.isVertical ? SettingsData.dockSpacing : 0
-                        anchors.leftMargin: dock.isVertical ? SettingsData.dockSpacing : 0
-                        anchors.rightMargin: dock.isVertical ? SettingsData.dockSpacing : 0
-
-                        contextMenu: dockVariants.contextMenu
-                        groupByApp: dock.groupByApp
-                        isVertical: dock.isVertical
-                    }
-                }
-            }
-        }
-        }
-    }
-}

Modules/Dock/DockApps.qml

@@ -1,247 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    property var contextMenu: null
-    property bool requestDockShow: false
-    property int pinnedAppCount: 0
-    property bool groupByApp: false
-    property bool isVertical: false
-
-    implicitWidth: isVertical ? appLayout.height : appLayout.width
-    implicitHeight: isVertical ? appLayout.width : appLayout.height
-
-    function movePinnedApp(fromIndex, toIndex) {
-        if (fromIndex === toIndex) {
-            return
-        }
-
-        const currentPinned = [...(SessionData.pinnedApps || [])]
-        if (fromIndex < 0 || fromIndex >= currentPinned.length || toIndex < 0 || toIndex >= currentPinned.length) {
-            return
-        }
-
-        const movedApp = currentPinned.splice(fromIndex, 1)[0]
-        currentPinned.splice(toIndex, 0, movedApp)
-
-        SessionData.setPinnedApps(currentPinned)
-    }
-
-    Item {
-        id: appLayout
-        anchors.centerIn: parent
-        width: layoutFlow.width
-        height: layoutFlow.height
-
-        Flow {
-            id: layoutFlow
-            flow: root.isVertical ? Flow.TopToBottom : Flow.LeftToRight
-            spacing: 8
-
-        Repeater {
-            id: repeater
-            model: ListModel {
-                id: dockModel
-
-                Component.onCompleted: updateModel()
-
-                function updateModel() {
-                    clear()
-
-                    const items = []
-                    const pinnedApps = [...(SessionData.pinnedApps || [])]
-                    const sortedToplevels = CompositorService.sortedToplevels
-
-                    if (root.groupByApp) {
-                        // Group windows by appId
-                        const appGroups = new Map()
-
-                        // Add pinned apps first (even if they have no windows)
-                        pinnedApps.forEach(appId => {
-                            appGroups.set(appId, {
-                                appId: appId,
-                                isPinned: true,
-                                windows: []
-                            })
-                        })
-
-                        // Group all running windows by appId
-                        sortedToplevels.forEach((toplevel, index) => {
-                            const appId = toplevel.appId || "unknown"
-                            if (!appGroups.has(appId)) {
-                                appGroups.set(appId, {
-                                    appId: appId,
-                                    isPinned: false,
-                                    windows: []
-                                })
-                            }
-                            const title = toplevel.title || "(Unnamed)"
-                            const truncatedTitle = title.length > 50 ? title.substring(0, 47) + "..." : title
-                            const uniqueId = toplevel.title + "|" + (toplevel.appId || "") + "|" + index
-
-                            appGroups.get(appId).windows.push({
-                                windowId: index,
-                                windowTitle: truncatedTitle,
-                                uniqueId: uniqueId
-                            })
-                        })
-
-                        // Sort groups: pinned first, then unpinned
-                        const pinnedGroups = []
-                        const unpinnedGroups = []
-
-                        Array.from(appGroups.entries()).forEach(([appId, group]) => {
-                            // For grouped apps, just show the first window info but track all windows
-                            const firstWindow = group.windows.length > 0 ? group.windows[0] : null
-
-                            const item = {
-                                "type": "grouped",
-                                "appId": appId,
-                                "windowId": firstWindow ? firstWindow.windowId : -1,
-                                "windowTitle": firstWindow ? firstWindow.windowTitle : "",
-                                "workspaceId": -1,
-                                "isPinned": group.isPinned,
-                                "isRunning": group.windows.length > 0,
-                                "windowCount": group.windows.length,
-                                "uniqueId": firstWindow ? firstWindow.uniqueId : "",
-                                "allWindows": group.windows
-                            }
-
-                            if (group.isPinned) {
-                                pinnedGroups.push(item)
-                            } else {
-                                unpinnedGroups.push(item)
-                            }
-                        })
-
-                        // Add items in order
-                        pinnedGroups.forEach(item => items.push(item))
-
-                        // Add separator if needed
-                        if (pinnedGroups.length > 0 && unpinnedGroups.length > 0) {
-                            items.push({
-                                "type": "separator",
-                                "appId": "__SEPARATOR__",
-                                "windowId": -1,
-                                "windowTitle": "",
-                                "workspaceId": -1,
-                                "isPinned": false,
-                                "isRunning": false
-                            })
-                        }
-
-                        unpinnedGroups.forEach(item => items.push(item))
-                        root.pinnedAppCount = pinnedGroups.length
-                    } else {
-                        pinnedApps.forEach(appId => {
-                            items.push({
-                                "type": "pinned",
-                                "appId": appId,
-                                "windowId": -1,
-                                "windowTitle": "",
-                                "workspaceId": -1,
-                                "isPinned": true,
-                                "isRunning": false
-                            })
-                        })
-
-                        root.pinnedAppCount = pinnedApps.length
-
-                        if (pinnedApps.length > 0 && sortedToplevels.length > 0) {
-                            items.push({
-                                "type": "separator",
-                                "appId": "__SEPARATOR__",
-                                "windowId": -1,
-                                "windowTitle": "",
-                                "workspaceId": -1,
-                                "isPinned": false,
-                                "isRunning": false,
-                                "isFocused": false
-                            })
-                        }
-
-                        sortedToplevels.forEach((toplevel, index) => {
-                            const title = toplevel.title || "(Unnamed)"
-                            const truncatedTitle = title.length > 50 ? title.substring(0, 47) + "..." : title
-                            const uniqueId = toplevel.title + "|" + (toplevel.appId || "") + "|" + index
-
-                            items.push({
-                                "type": "window",
-                                "appId": toplevel.appId,
-                                "windowId": index,
-                                "windowTitle": truncatedTitle,
-                                "workspaceId": -1,
-                                "isPinned": false,
-                                "isRunning": true,
-                                "uniqueId": uniqueId
-                            })
-                        })
-                    }
-
-                    items.forEach(item => append(item))
-                }
-            }
-
-            delegate: Item {
-                id: delegateItem
-                property alias dockButton: button
-
-                width: model.type === "separator" ? 16 : 40
-                height: 40
-
-                Rectangle {
-                    visible: model.type === "separator"
-                    width: 2
-                    height: 20
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
-                    radius: 1
-                    anchors.centerIn: parent
-                }
-
-                DockAppButton {
-                    id: button
-                    visible: model.type !== "separator"
-                    anchors.centerIn: parent
-
-                    width: 40
-                    height: 40
-
-                    appData: model
-                    contextMenu: root.contextMenu
-                    dockApps: root
-                    index: model.index
-
-                    // Override tooltip for windows to show window title
-                    showWindowTitle: model.type === "window" || model.type === "grouped"
-                    windowTitle: model.windowTitle || ""
-                }
-            }
-        }
-        }
-    }
-
-    Connections {
-        target: CompositorService
-        function onSortedToplevelsChanged() {
-            dockModel.updateModel()
-        }
-    }
-
-    Connections {
-        target: SessionData
-        function onPinnedAppsChanged() {
-            dockModel.updateModel()
-        }
-    }
-
-    onGroupByAppChanged: {
-        dockModel.updateModel()
-    }
-}

Modules/Greetd/GreeterSurface.qml

@@ -1,18 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Services.Greetd
-
-WlSessionLockSurface {
-    id: root
-
-    required property WlSessionLock lock
-
-    color: "transparent"
-
-    GreeterContent {
-        anchors.fill: parent
-        screenName: root.screen?.name ?? ""
-        sessionLock: root.lock
-    }
-}

Modules/Greetd/README.md

@@ -1,100 +0,0 @@
-# Dank (dms) Greeter
-
-A greeter for [greetd](https://github.com/kennylevinsen/greetd) that follows the aesthetics of the dms lock screen.
-
-## Features
-
-- **Multi user**: Login with any system user
-- **dms sync**: Sync settings with dms for consistent styling between shell and greeter
-- **niri or Hyprland**: Use either niri or Hyprland for the greeter's compositor.
-- **Custom PAM**: Supports custom PAM configuration in `/etc/pam.d/dankshell`
-- **Session Memory**: Remembers last selected session and user
-
-## Installation
-
-### Automatic
-
-The easiest thing is to run `dms greeter install` or `dms` for interactive installation.
-
-### Manual
-
-1. Install `greetd` (in most distro's standard repositories)
-2. Copy `assets/dms-niri.kdl` or `assets/dms-hypr.conf` to `/etc/greetd`
-  - niri if you want to run the greeter under niri, hypr if you want to run the greeter under Hyprland
-3. Copy `assets/greet-niri.sh` or `assets/greet-hyprland.sh` to `/usr/local/bin/start-dms-greetd.sh`
-4. Edit `/etc/greetd/dms-niri.kdl` or `/etc/greetd/dms-hypr.conf` and replace `_DMS_PATH_` with the absolute path to dms, e.g. `/home/joecool/.config/quickshell/dms`
-5. Edit or create `/etc/greetd/config.toml` 
-```toml
-[terminal]
-# The VT to run the greeter on. Can be "next", "current" or a number
-# designating the VT.
-vt = 1
-
-# The default session, also known as the greeter.
-[default_session]
-
-# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
-# with whatever you want started, such as `sway`.
-
-# The user to run the command as. The privileges this user must have depends
-# on the greeter. A graphical greeter may for example require the user to be
-# in the `video` group.
-user = "greeter"
-
-command = "/usr/local/bin/start-dms-greetd.sh"
-```
-
-Enable the greeter with `sudo systemctl enable greetd`
-
-### NixOS
-
-To install the greeter on NixOS add the repo to your flake inputs as described in the readme. Then somewhere in your NixOS config add this to imports:
-```nix
-imports = [
-  inputs.dankMaterialShell.nixosModules.greeter
-]
-```
-
-Enable the greeter with this in your NixOS config:
-```nix
-programs.dankMaterialShell.greeter = {
-  enable = true;
-  compositor.name = "niri"; # or set to hyprland
-  configHome = "/home/user"; # optionally copyies that users DMS settings (and wallpaper if set) to the greeters data directory as root before greeter starts
-};
-```
-
-## Usage
-
-To run dms in greeter mode you just need to set `DMS_RUN_GREETER=1` in the environment.
-
-```bash
-DMS_RUN_GREETER=1 qs -p /path/to/dms
-```
-
-### Configuration
-
-#### Compositor
-
-You can configure compositor specific settings such as outputs/displays the same as you would in niri or Hyprland.
-
-Simply edit `/etc/greetd/dms-niri.kdl` or `/etc/greetd/dms-hypr.conf` to change compositor settings for the greeter
-
-#### Personalization
-
-Wallpapers and themes and weather and clock formats and things are a TODO on the documentation, but it's configured exactly the same as dms.
-
-You can synchronize those configurations with a specific user if you want greeter settings to always mirror the shell.
-
-```bash
-# For core settings (theme, clock formats, etc)
-sudo ln -sf ~/.config/DankMaterialShell/settings.json /etc/greetd/.dms/settings.json
-# For state (mainly you would configure wallpaper in this file)
-sudo ln -sf ~/.local/state/DankMaterialShell/session.json /etc/greetd/.dms/session.json
-# For wallpaper based theming
-sudo ln -sf ~/.cache/quickshell/dankshell/dms-colors.json /etc/greetd/.dms/dms-colors.json
-```
-
-You can override the configuration path with the `DMS_GREET_CFG_DIR` environment variable, the default is `/etc/greetd/.dms`
-
-It should be writable by the greeter user.

Modules/Lock/CustomButtonKeyboard.qml

@@ -1,24 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankActionButton {
-    id: customButtonKeyboard
-    circular: false
-    property string text: ""
-    width: 40
-    height: 40
-    property bool isShift: false
-    color: Theme.surface
-
-    StyledText {
-        id: contentItem
-        anchors.centerIn: parent
-        text: parent.text
-        color: Theme.surfaceText
-        font.pixelSize: Theme.fontSizeXLarge
-        font.weight: Font.Normal
-    }
-}

Modules/Lock/Keyboard.qml

@@ -1,361 +0,0 @@
-import QtQuick
-import qs.Common
-
-Rectangle {
-    id: root
-    property Item target
-    height: 60 * 5
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    color: Theme.widgetBackground
-
-    property double rowSpacing: 0.01 * width  // horizontal spacing between keyboard
-    property double columnSpacing: 0.02 * height // vertical   spacing between keyboard
-    property bool shift: false //Boolean for the shift state
-    property bool symbols: false //Boolean for the symbol state
-    property double columns: 10 // Number of column
-    property double rows: 4 // Number of row
-
-    property string strShift: '\u2191' // UPWARDS ARROW unicode
-    property string strBackspace: "Backspace"
-
-    property var modelKeyboard: {
-        "row_1": [
-            {
-                text: 'q',
-                symbol: '1',
-                width: 1
-            },
-            {
-                text: 'w',
-                symbol: '2',
-                width: 1
-            },
-            {
-                text: 'e',
-                symbol: '3',
-                width: 1
-            },
-            {
-                text: 'r',
-                symbol: '4',
-                width: 1
-            },
-            {
-                text: 't',
-                symbol: '5',
-                width: 1
-            },
-            {
-                text: 'y',
-                symbol: '6',
-                width: 1
-            },
-            {
-                text: 'u',
-                symbol: '7',
-                width: 1
-            },
-            {
-                text: 'i',
-                symbol: '8',
-                width: 1
-            },
-            {
-                text: 'o',
-                symbol: '9',
-                width: 1
-            },
-            {
-                text: 'p',
-                symbol: '0',
-                width: 1
-            },
-        ],
-        "row_2": [
-            {
-                text: 'a',
-                symbol: '-',
-                width: 1
-            },
-            {
-                text: 's',
-                symbol: '/',
-                width: 1
-            },
-            {
-                text: 'd',
-                symbol: ':',
-                width: 1
-            },
-            {
-                text: 'f',
-                symbol: ';',
-                width: 1
-            },
-            {
-                text: 'g',
-                symbol: '(',
-                width: 1
-            },
-            {
-                text: 'h',
-                symbol: ')',
-                width: 1
-            },
-            {
-                text: 'j',
-                symbol: '€',
-                width: 1
-            },
-            {
-                text: 'k',
-                symbol: '&',
-                width: 1
-            },
-            {
-                text: 'l',
-                symbol: '@',
-                width: 1
-            }
-        ],
-        "row_3": [
-            {
-                text: strShift,
-                symbol: strShift,
-                width: 1.5
-            },
-            {
-                text: 'z',
-                symbol: '.',
-                width: 1
-            },
-            {
-                text: 'x',
-                symbol: ',',
-                width: 1
-            },
-            {
-                text: 'c',
-                symbol: '?',
-                width: 1
-            },
-            {
-                text: 'v',
-                symbol: '!',
-                width: 1
-            },
-            {
-                text: 'b',
-                symbol: "'",
-                width: 1
-            },
-            {
-                text: 'n',
-                symbol: "%",
-                width: 1
-            },
-            {
-                text: 'm',
-                symbol: '"',
-                width: 1
-            },
-            {
-                text: "'",
-                symbol: "*",
-                width: 1.5
-            }
-        ],
-        "row_4": [
-            {
-                text: "123",
-                symbol: 'ABC',
-                width: 1.5
-            },
-            {
-                text: ' ',
-                symbol: ' ',
-                width: 6
-            },
-            {
-                text: '.',
-                symbol: '.',
-                width: 1
-            },
-            {
-                text: strBackspace,
-                symbol: strBackspace,
-                width: 1.5
-            }
-        ]
-    }
-
-    //Here is the corresponding table between the ascii and the key event
-    property var tableKeyEvent: {
-        "_0": Qt.Key_0,
-        "_1": Qt.Key_1,
-        "_2": Qt.Key_2,
-        "_3": Qt.Key_3,
-        "_4": Qt.Key_4,
-        "_5": Qt.Key_5,
-        "_6": Qt.Key_6,
-        "_7": Qt.Key_7,
-        "_8": Qt.Key_8,
-        "_9": Qt.Key_9,
-        "_a": Qt.Key_A,
-        "_b": Qt.Key_B,
-        "_c": Qt.Key_C,
-        "_d": Qt.Key_D,
-        "_e": Qt.Key_E,
-        "_f": Qt.Key_F,
-        "_g": Qt.Key_G,
-        "_h": Qt.Key_H,
-        "_i": Qt.Key_I,
-        "_j": Qt.Key_J,
-        "_k": Qt.Key_K,
-        "_l": Qt.Key_L,
-        "_m": Qt.Key_M,
-        "_n": Qt.Key_N,
-        "_o": Qt.Key_O,
-        "_p": Qt.Key_P,
-        "_q": Qt.Key_Q,
-        "_r": Qt.Key_R,
-        "_s": Qt.Key_S,
-        "_t": Qt.Key_T,
-        "_u": Qt.Key_U,
-        "_v": Qt.Key_V,
-        "_w": Qt.Key_W,
-        "_x": Qt.Key_X,
-        "_y": Qt.Key_Y,
-        "_z": Qt.Key_Z,
-        "_\u2190": Qt.Key_Backspace,
-        "_return": Qt.Key_Return,
-        "_ ": Qt.Key_Space,
-        "_-": Qt.Key_Minus,
-        "_/": Qt.Key_Slash,
-        "_:": Qt.Key_Colon,
-        "_;": Qt.Key_Semicolon,
-        "_(": Qt.Key_BracketLeft,
-        "_)": Qt.Key_BracketRight,
-        "_€": parseInt("20ac", 16) // I didn't find the appropriate Qt event so I used the hex format
-        ,
-        "_&": Qt.Key_Ampersand,
-        "_@": Qt.Key_At,
-        '_"': Qt.Key_QuoteDbl,
-        "_.": Qt.Key_Period,
-        "_,": Qt.Key_Comma,
-        "_?": Qt.Key_Question,
-        "_!": Qt.Key_Exclam,
-        "_'": Qt.Key_Apostrophe,
-        "_%": Qt.Key_Percent,
-        "_*": Qt.Key_Asterisk
-    }
-
-    Item {
-        id: keyboard_container
-        anchors.left: parent.left
-        anchors.leftMargin: 5
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: 5
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 5
-
-        //One column which contains 5 rows
-        Column {
-            spacing: columnSpacing
-
-            Row {
-                id: row_1
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_1"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-            Row {
-                id: row_2
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_2"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-            Row {
-                id: row_3
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_3"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-                        isShift: shift && text === strShift
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-            Row {
-                id: row_4
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_4"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-        }
-    }
-    signal clicked(string text)
-
-    Connections {
-        target: root
-        function onClicked(text) {
-            if (!keyboard_controller.target)
-                return;
-            if (text === strShift) {
-                root.shift = !root.shift; // toggle shift
-            } else if (text === '123') {
-                root.symbols = true;
-            } else if (text === 'ABC') {
-                root.symbols = false;
-            } else {
-                // insert text into target
-                if (text === strBackspace) {
-                    var current = keyboard_controller.target.text;
-                    keyboard_controller.target.text = current.slice(0, current.length - 1);
-                } else {
-                    // normal character
-                    var charToInsert = root.symbols ? text : (root.shift ? text.toUpperCase() : text);
-                    var current = keyboard_controller.target.text;
-                    var cursorPos = keyboard_controller.target.cursorPosition;
-                    keyboard_controller.target.text = current.slice(0, cursorPos) + charToInsert + current.slice(cursorPos);
-                    keyboard_controller.target.cursorPosition = cursorPos + 1;
-                }
-
-                // shift is momentary
-                if (root.shift && text !== strShift)
-                    root.shift = false;
-            }
-        }
-    }
-}

Modules/Lock/Lock.qml

@@ -1,112 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    function activate() {
-        loader.activeAsync = true
-    }
-
-    Component.onCompleted: {
-        if (SessionService.loginctlAvailable || SessionService.sessionPath) {
-            if (SessionService.locked || SessionService.lockedHint) {
-                console.log("Lock: Session locked on startup")
-                loader.activeAsync = true
-            }
-        }
-    }
-
-    Connections {
-        target: IdleService
-        function onLockRequested() {
-            console.log("Lock: Received lock request from IdleService")
-            loader.activeAsync = true
-        }
-    }
-
-    Connections {
-        target: SessionService
-
-        function onSessionLocked() {
-            console.log("Lock: Lock signal received -> show lock")
-            loader.activeAsync = true
-        }
-
-        function onSessionUnlocked() {
-            console.log("Lock: Unlock signal received -> hide lock")
-            loader.active = false
-        }
-
-        function onLoginctlStateChanged() {
-            if (SessionService.lockedHint && !loader.active) {
-                console.log("Lock: LockedHint=true -> show lock")
-                loader.activeAsync = true
-            } else if (!SessionService.locked && !SessionService.lockedHint && loader.active) {
-                console.log("Lock: LockedHint=false -> hide lock")
-                loader.active = false
-            }
-        }
-
-        function onPrepareForSleep() {
-            if (SessionService.preparingForSleep && SessionData.lockBeforeSuspend) {
-                console.log("Lock: PrepareForSleep -> lock before suspend")
-                loader.activeAsync = true
-            }
-        }
-    }
-
-    LazyLoader {
-        id: loader
-
-        WlSessionLock {
-            id: sessionLock
-
-            property bool unlocked: false
-            property string sharedPasswordBuffer: ""
-
-            locked: true
-
-            onLockedChanged: {
-                if (!locked) {
-                    loader.active = false
-                }
-            }
-
-            LockSurface {
-                id: lockSurface
-                lock: sessionLock
-                sharedPasswordBuffer: sessionLock.sharedPasswordBuffer
-                onPasswordChanged: newPassword => {
-                                       sessionLock.sharedPasswordBuffer = newPassword
-                                   }
-            }
-        }
-    }
-
-    LockScreenDemo {
-        id: demoWindow
-    }
-
-    IpcHandler {
-        target: "lock"
-
-        function lock() {
-            console.log("Lock screen requested via IPC")
-            loader.activeAsync = true
-        }
-
-        function demo() {
-            console.log("Lock screen DEMO mode requested via IPC")
-            demoWindow.showDemo()
-        }
-
-        function isLocked(): bool {
-            return SessionService.locked || loader.active
-        }
-    }
-}

Modules/Lock/LockSurface.qml

@@ -1,37 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-
-WlSessionLockSurface {
-    id: root
-
-    required property WlSessionLock lock
-    required property string sharedPasswordBuffer
-
-    signal passwordChanged(string newPassword)
-
-    readonly property bool locked: lock && !lock.locked
-
-    function unlock(): void {
-        lock.locked = false
-    }
-
-    color: "transparent"
-
-    Loader {
-        anchors.fill: parent
-        sourceComponent: LockScreenContent {
-            demoMode: false
-            passwordBuffer: root.sharedPasswordBuffer
-            screenName: root.screen?.name ?? ""
-            onUnlockRequested: root.unlock()
-            onPasswordBufferChanged: {
-                if (root.sharedPasswordBuffer !== passwordBuffer) {
-                    root.passwordChanged(passwordBuffer)
-                }
-            }
-        }
-    }
-}

Modules/OSD/BrightnessOSD.qml

@@ -1,136 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankOSD {
-    id: root
-
-    osdWidth: Math.min(260, Screen.width - Theme.spacingM * 2)
-    osdHeight: 40 + Theme.spacingS * 2
-    autoHideInterval: 3000
-    enableMouseInteraction: true
-
-    property var brightnessDebounceTimer: Timer {
-        property int pendingValue: 0
-
-        interval: {
-            const deviceInfo = DisplayService.getCurrentDeviceInfo()
-            return (deviceInfo && deviceInfo.class === "ddc") ? 200 : 50
-        }
-        repeat: false
-        onTriggered: {
-            DisplayService.setBrightnessInternal(pendingValue, DisplayService.lastIpcDevice)
-        }
-    }
-
-    Connections {
-        target: DisplayService
-        function onBrightnessChanged() {
-            root.show()
-        }
-    }
-
-    content: Item {
-        anchors.fill: parent
-
-        Item {
-            property int gap: Theme.spacingS
-
-            anchors.centerIn: parent
-            width: parent.width - Theme.spacingS * 2
-            height: 40
-
-            Rectangle {
-                width: Theme.iconSize
-                height: Theme.iconSize
-                radius: Theme.iconSize / 2
-                color: "transparent"
-                x: parent.gap
-                anchors.verticalCenter: parent.verticalCenter
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: {
-                        const deviceInfo = DisplayService.getCurrentDeviceInfo()
-                        if (!deviceInfo || deviceInfo.class === "backlight" || deviceInfo.class === "ddc") {
-                            return "brightness_medium"
-                        } else if (deviceInfo.name.includes("kbd")) {
-                            return "keyboard"
-                        } else {
-                            return "lightbulb"
-                        }
-                    }
-                    size: Theme.iconSize
-                    color: Theme.primary
-                }
-            }
-
-            DankSlider {
-                id: brightnessSlider
-
-                width: parent.width - Theme.iconSize - parent.gap * 3
-                height: 40
-                x: parent.gap * 2 + Theme.iconSize
-                anchors.verticalCenter: parent.verticalCenter
-                minimum: 1
-                maximum: 100
-                enabled: DisplayService.brightnessAvailable
-                showValue: true
-                unit: "%"
-                thumbOutlineColor: Theme.surfaceContainer
-                alwaysShowValue: SettingsData.osdAlwaysShowValue
-
-                Component.onCompleted: {
-                    if (DisplayService.brightnessAvailable) {
-                        value = DisplayService.brightnessLevel
-                    }
-                }
-
-                onSliderValueChanged: newValue => {
-                                          if (DisplayService.brightnessAvailable) {
-                                              root.brightnessDebounceTimer.pendingValue = newValue
-                                              root.brightnessDebounceTimer.restart()
-                                              resetHideTimer()
-                                          }
-                                      }
-
-                onContainsMouseChanged: {
-                    setChildHovered(containsMouse)
-                }
-
-                onSliderDragFinished: finalValue => {
-                                          if (DisplayService.brightnessAvailable) {
-                                              root.brightnessDebounceTimer.stop()
-                                              DisplayService.setBrightnessInternal(finalValue, DisplayService.lastIpcDevice)
-                                          }
-                                      }
-
-                Connections {
-                    target: DisplayService
-
-                    function onBrightnessChanged() {
-                        if (!brightnessSlider.pressed) {
-                            brightnessSlider.value = DisplayService.brightnessLevel
-                        }
-                    }
-
-                    function onDeviceSwitched() {
-                        if (!brightnessSlider.pressed) {
-                            brightnessSlider.value = DisplayService.brightnessLevel
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    onOsdShown: {
-        if (DisplayService.brightnessAvailable && contentLoader.item) {
-            const slider = contentLoader.item.children[0].children[1]
-            if (slider) {
-                slider.value = DisplayService.brightnessLevel
-            }
-        }
-    }
-}

Modules/OSD/VolumeOSD.qml

@@ -1,138 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankOSD {
-    id: root
-
-    osdWidth: Math.min(260, Screen.width - Theme.spacingM * 2)
-    osdHeight: 40 + Theme.spacingS * 2
-    autoHideInterval: 3000
-    enableMouseInteraction: true
-
-    Connections {
-        target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
-
-        function onVolumeChanged() {
-            if (!AudioService.suppressOSD) {
-                root.show()
-            }
-        }
-
-        function onMutedChanged() {
-            if (!AudioService.suppressOSD) {
-                root.show()
-            }
-        }
-    }
-
-    Connections {
-        target: AudioService
-
-        function onSinkChanged() {
-            if (root.shouldBeVisible) {
-                root.show()
-            }
-        }
-    }
-
-    content: Item {
-        anchors.fill: parent
-
-        Item {
-            property int gap: Theme.spacingS
-
-            anchors.centerIn: parent
-            width: parent.width - Theme.spacingS * 2
-            height: 40
-
-            Rectangle {
-                width: Theme.iconSize
-                height: Theme.iconSize
-                radius: Theme.iconSize / 2
-                color: "transparent"
-                x: parent.gap
-                anchors.verticalCenter: parent.verticalCenter
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.muted ? "volume_off" : "volume_up"
-                    size: Theme.iconSize
-                    color: muteButton.containsMouse ? Theme.primary : Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: muteButton
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        AudioService.toggleMute()
-                    }
-                    onContainsMouseChanged: {
-                        setChildHovered(containsMouse || volumeSlider.containsMouse)
-                    }
-                }
-            }
-
-            DankSlider {
-                id: volumeSlider
-
-                readonly property real actualVolumePercent: AudioService.sink && AudioService.sink.audio ? Math.round(AudioService.sink.audio.volume * 100) : 0
-                readonly property real displayPercent: actualVolumePercent
-
-                width: parent.width - Theme.iconSize - parent.gap * 3
-                height: 40
-                x: parent.gap * 2 + Theme.iconSize
-                anchors.verticalCenter: parent.verticalCenter
-                minimum: 0
-                maximum: 100
-                enabled: AudioService.sink && AudioService.sink.audio
-                showValue: true
-                unit: "%"
-                thumbOutlineColor: Theme.surfaceContainer
-                valueOverride: displayPercent
-                alwaysShowValue: SettingsData.osdAlwaysShowValue
-
-                Component.onCompleted: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100))
-                    }
-                }
-
-                onSliderValueChanged: newValue => {
-                                          if (AudioService.sink && AudioService.sink.audio) {
-                                              AudioService.suppressOSD = true
-                                              AudioService.sink.audio.volume = newValue / 100
-                                              AudioService.suppressOSD = false
-                                          }
-                                      }
-
-                onContainsMouseChanged: {
-                    setChildHovered(containsMouse || muteButton.containsMouse)
-                }
-
-                Connections {
-                    target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
-
-                    function onVolumeChanged() {
-                        if (volumeSlider && !volumeSlider.pressed) {
-                            volumeSlider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    onOsdShown: {
-        if (AudioService.sink && AudioService.sink.audio && contentLoader.item) {
-            const slider = contentLoader.item.children[0].children[1]
-            if (slider) {
-                slider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100))
-            }
-        }
-    }
-}

Modules/Plugins/BasePill.qml

@@ -1,55 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property var axis: null
-    property string section: "center"
-    property var popoutTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    property bool isVerticalOrientation: false
-    property alias content: contentLoader.sourceComponent
-
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: isVerticalOrientation ? widgetThickness : contentLoader.item ? (contentLoader.item.implicitWidth + horizontalPadding * 2) : 0
-    height: isVerticalOrientation ? (contentLoader.item ? (contentLoader.item.implicitHeight + horizontalPadding * 2) : 0) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent"
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-
-    Loader {
-        id: contentLoader
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popoutTarget && popoutTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked()
-        }
-    }
-}

Modules/Settings/DisplaysTab.qml

@@ -1,369 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: displaysTab
-
-    property var variantComponents: [{
-        "id": "dankBar",
-        "name": "Dank Bar",
-        "description": "System bar with widgets and system information",
-        "icon": "toolbar"
-    }, {
-        "id": "dock",
-        "name": "Application Dock",
-        "description": "Bottom dock for pinned and running applications",
-        "icon": "dock"
-    }, {
-        "id": "notifications",
-        "name": "Notification Popups",
-        "description": "Notification toast popups",
-        "icon": "notifications"
-    }, {
-        "id": "wallpaper",
-        "name": "Wallpaper",
-        "description": "Desktop background images",
-        "icon": "wallpaper"
-    }, {
-        "id": "osd",
-        "name": "On-Screen Displays",
-        "description": "Volume, brightness, and other system OSDs",
-        "icon": "picture_in_picture"
-    }, {
-        "id": "toast",
-        "name": "Toast Messages",
-        "description": "System toast notifications",
-        "icon": "campaign"
-    }, {
-        "id": "notepad",
-        "name": "Notepad Slideout",
-        "description": "Quick note-taking slideout panel",
-        "icon": "sticky_note_2"
-    }, {
-        "id": "systemTray",
-        "name": "System Tray",
-        "description": "System tray icons",
-        "icon": "notifications"
-    }]
-
-    function getScreenPreferences(componentId) {
-        return SettingsData.screenPreferences && SettingsData.screenPreferences[componentId] || ["all"];
-    }
-
-    function setScreenPreferences(componentId, screenNames) {
-        var prefs = SettingsData.screenPreferences || {
-        };
-        prefs[componentId] = screenNames;
-        SettingsData.setScreenPreferences(prefs);
-    }
-
-    DankFlickable {
-        anchors.fill: parent
-        anchors.topMargin: Theme.spacingL
-        anchors.bottomMargin: Theme.spacingS
-        clip: true
-        contentHeight: mainColumn.height
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            width: parent.width
-            spacing: Theme.spacingXL
-
-            StyledRect {
-                width: parent.width
-                height: screensInfoSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: screensInfoSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "monitor"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            width: parent.width - Theme.iconSize - Theme.spacingM
-                            spacing: Theme.spacingXS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            StyledText {
-                                text: I18n.tr("Connected Displays")
-                                font.pixelSize: Theme.fontSizeLarge
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Configure which displays show shell components")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                wrapMode: Text.WordWrap
-                                width: parent.width
-                            }
-
-                        }
-
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        StyledText {
-                            text: I18n.tr("Available Screens (") + Quickshell.screens.length + ")"
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                        }
-
-                        Repeater {
-                            model: Quickshell.screens
-
-                            delegate: Rectangle {
-                                width: parent.width
-                                height: screenRow.implicitHeight + Theme.spacingS * 2
-                                radius: Theme.cornerRadius
-                                color: Theme.surfaceContainerHigh
-                                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
-                                border.width: 0
-
-                                Row {
-                                    id: screenRow
-
-                                    anchors.fill: parent
-                                    anchors.margins: Theme.spacingS
-                                    spacing: Theme.spacingM
-
-                                    DankIcon {
-                                        name: "desktop_windows"
-                                        size: Theme.iconSize - 4
-                                        color: Theme.primary
-                                        anchors.verticalCenter: parent.verticalCenter
-                                    }
-
-                                    Column {
-                                        width: parent.width - Theme.iconSize - Theme.spacingM * 2
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        spacing: Theme.spacingXS / 2
-
-                                        StyledText {
-                                            text: modelData.name
-                                            font.pixelSize: Theme.fontSizeMedium
-                                            font.weight: Font.Medium
-                                            color: Theme.surfaceText
-                                        }
-
-                                        Row {
-                                            spacing: Theme.spacingS
-
-                                            StyledText {
-                                                text: modelData.width + "×" + modelData.height
-                                                font.pixelSize: Theme.fontSizeSmall
-                                                color: Theme.surfaceVariantText
-                                            }
-
-                                            StyledText {
-                                                text: "•"
-                                                font.pixelSize: Theme.fontSizeSmall
-                                                color: Theme.surfaceVariantText
-                                            }
-
-                                            StyledText {
-                                                text: modelData.model || "Unknown Model"
-                                                font.pixelSize: Theme.fontSizeSmall
-                                                color: Theme.surfaceVariantText
-                                            }
-
-                                        }
-
-                                    }
-
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                }
-
-            }
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingL
-
-                Repeater {
-                    model: displaysTab.variantComponents
-
-                    delegate: StyledRect {
-                        width: parent.width
-                        height: componentSection.implicitHeight + Theme.spacingL * 2
-                        radius: Theme.cornerRadius
-                        color: Theme.surfaceContainerHigh
-                        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                        border.width: 0
-
-                        Column {
-                            id: componentSection
-
-                            anchors.fill: parent
-                            anchors.margins: Theme.spacingL
-                            spacing: Theme.spacingM
-
-                            Row {
-                                width: parent.width
-                                spacing: Theme.spacingM
-
-                                DankIcon {
-                                    name: modelData.icon
-                                    size: Theme.iconSize
-                                    color: Theme.primary
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-
-                                Column {
-                                    width: parent.width - Theme.iconSize - Theme.spacingM
-                                    spacing: Theme.spacingXS
-                                    anchors.verticalCenter: parent.verticalCenter
-
-                                    StyledText {
-                                        text: modelData.name
-                                        font.pixelSize: Theme.fontSizeLarge
-                                        font.weight: Font.Medium
-                                        color: Theme.surfaceText
-                                    }
-
-                                    StyledText {
-                                        text: modelData.description
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                        wrapMode: Text.WordWrap
-                                        width: parent.width
-                                    }
-
-                                }
-
-                            }
-
-                            Column {
-                                width: parent.width
-                                spacing: Theme.spacingS
-
-                                StyledText {
-                                    text: I18n.tr("Show on screens:")
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceText
-                                    font.weight: Font.Medium
-                                }
-
-                                Column {
-                                    property string componentId: modelData.id
-                                    property var selectedScreens: displaysTab.getScreenPreferences(componentId)
-
-                                    width: parent.width
-                                    spacing: Theme.spacingXS
-
-                                    DankToggle {
-                                        width: parent.width
-                                        text: I18n.tr("All displays")
-                                        description: I18n.tr("Show on all connected displays")
-                                        checked: parent.selectedScreens.includes("all")
-                                        onToggled: (checked) => {
-                                            if (checked)
-                                                displaysTab.setScreenPreferences(parent.componentId, ["all"]);
-                                            else
-                                                displaysTab.setScreenPreferences(parent.componentId, []);
-                                        }
-                                    }
-
-                                    Rectangle {
-                                        width: parent.width
-                                        height: 1
-                                        color: Theme.outline
-                                        opacity: 0.2
-                                        visible: !parent.selectedScreens.includes("all")
-                                    }
-
-                                    Column {
-                                        width: parent.width
-                                        spacing: Theme.spacingXS
-                                        visible: !parent.selectedScreens.includes("all")
-
-                                        Repeater {
-                                            model: Quickshell.screens
-
-                                            delegate: DankToggle {
-                                                property string screenName: modelData.name
-                                                property string componentId: parent.parent.componentId
-
-                                                width: parent.width
-                                                text: screenName
-                                                description: modelData.width + "×" + modelData.height + " • " + (modelData.model || "Unknown Model")
-                                                checked: {
-                                                    var prefs = displaysTab.getScreenPreferences(componentId);
-                                                    return !prefs.includes("all") && prefs.includes(screenName);
-                                                }
-                                                onToggled: (checked) => {
-                                                    var currentPrefs = displaysTab.getScreenPreferences(componentId);
-                                                    if (currentPrefs.includes("all"))
-                                                        currentPrefs = [];
-
-                                                    var newPrefs = currentPrefs.slice();
-                                                    if (checked) {
-                                                        if (!newPrefs.includes(screenName))
-                                                            newPrefs.push(screenName);
-
-                                                    } else {
-                                                        var index = newPrefs.indexOf(screenName);
-                                                        if (index > -1)
-                                                            newPrefs.splice(index, 1);
-
-                                                    }
-                                                    displaysTab.setScreenPreferences(componentId, newPrefs);
-                                                }
-                                            }
-
-                                        }
-
-                                    }
-
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modules/Settings/TimeTab.qml

@@ -1,378 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: timeTab
-
-    DankFlickable {
-        anchors.fill: parent
-        anchors.topMargin: Theme.spacingL
-        clip: true
-        contentHeight: mainColumn.height
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            width: parent.width
-            spacing: Theme.spacingXL
-
-            // Time Format
-            StyledRect {
-                width: parent.width
-                height: timeSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: timeSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "schedule"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            width: parent.width - Theme.iconSize - Theme.spacingM
-                                   - toggle.width - Theme.spacingM
-                            spacing: Theme.spacingXS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            StyledText {
-                                text: I18n.tr("24-Hour Format")
-                                font.pixelSize: Theme.fontSizeLarge
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Use 24-hour time format instead of 12-hour AM/PM")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                wrapMode: Text.WordWrap
-                                width: parent.width
-                            }
-                        }
-
-                        DankToggle {
-                            id: toggle
-
-                            anchors.verticalCenter: parent.verticalCenter
-                            checked: SettingsData.use24HourClock
-                            onToggled: checked => {
-                                           return SettingsData.setClockFormat(
-                                               checked)
-                                       }
-                        }
-                    }
-                }
-            }
-
-            // Date Format Section
-            StyledRect {
-                width: parent.width
-                height: dateSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: dateSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "calendar_today"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Date Format")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankDropdown {
-                        height: 50
-                        text: I18n.tr("Top Bar Format")
-                        description: "Preview: " + (SettingsData.clockDateFormat ? new Date().toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(Qt.locale(), "ddd d"))
-                        currentValue: {
-                            if (!SettingsData.clockDateFormat || SettingsData.clockDateFormat.length === 0) {
-                                return "System Default"
-                            }
-                            // Find matching preset or show "Custom"
-                            const presets = [{
-                                                 "format": "ddd d",
-                                                 "label": "Day Date"
-                                             }, {
-                                                 "format": "ddd MMM d",
-                                                 "label": "Day Month Date"
-                                             }, {
-                                                 "format": "MMM d",
-                                                 "label": "Month Date"
-                                             }, {
-                                                 "format": "M/d",
-                                                 "label": "Numeric (M/D)"
-                                             }, {
-                                                 "format": "d/M",
-                                                 "label": "Numeric (D/M)"
-                                             }, {
-                                                 "format": "ddd d MMM yyyy",
-                                                 "label": "Full with Year"
-                                             }, {
-                                                 "format": "yyyy-MM-dd",
-                                                 "label": "ISO Date"
-                                             }, {
-                                                 "format": "dddd, MMMM d",
-                                                 "label": "Full Day & Month"
-                                             }]
-                            const match = presets.find(p => {
-                                                           return p.format
-                                                           === SettingsData.clockDateFormat
-                                                       })
-                            return match ? match.label: I18n.tr("Custom: ") + SettingsData.clockDateFormat
-                        }
-                        options: ["System Default", "Day Date", "Day Month Date", "Month Date", "Numeric (M/D)", "Numeric (D/M)", "Full with Year", "ISO Date", "Full Day & Month", "Custom..."]
-                        onValueChanged: value => {
-                                            const formatMap = {
-                                                "System Default": "",
-                                                "Day Date": "ddd d",
-                                                "Day Month Date": "ddd MMM d",
-                                                "Month Date": "MMM d",
-                                                "Numeric (M/D)": "M/d",
-                                                "Numeric (D/M)": "d/M",
-                                                "Full with Year": "ddd d MMM yyyy",
-                                                "ISO Date": "yyyy-MM-dd",
-                                                "Full Day & Month": "dddd, MMMM d"
-                                            }
-                                            if (value === "Custom...") {
-                                                customFormatInput.visible = true
-                                            } else {
-                                                customFormatInput.visible = false
-                                                SettingsData.setClockDateFormat(
-                                                    formatMap[value])
-                                            }
-                                        }
-                    }
-
-                    DankDropdown {
-                        height: 50
-                        text: I18n.tr("Lock Screen Format")
-                        description: "Preview: " + (SettingsData.lockDateFormat ? new Date().toLocaleDateString(Qt.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(Qt.locale(), Locale.LongFormat))
-                        currentValue: {
-                            if (!SettingsData.lockDateFormat || SettingsData.lockDateFormat.length === 0) {
-                                return "System Default"
-                            }
-                            // Find matching preset or show "Custom"
-                            const presets = [{
-                                                 "format": "ddd d",
-                                                 "label": "Day Date"
-                                             }, {
-                                                 "format": "ddd MMM d",
-                                                 "label": "Day Month Date"
-                                             }, {
-                                                 "format": "MMM d",
-                                                 "label": "Month Date"
-                                             }, {
-                                                 "format": "M/d",
-                                                 "label": "Numeric (M/D)"
-                                             }, {
-                                                 "format": "d/M",
-                                                 "label": "Numeric (D/M)"
-                                             }, {
-                                                 "format": "ddd d MMM yyyy",
-                                                 "label": "Full with Year"
-                                             }, {
-                                                 "format": "yyyy-MM-dd",
-                                                 "label": "ISO Date"
-                                             }, {
-                                                 "format": "dddd, MMMM d",
-                                                 "label": "Full Day & Month"
-                                             }]
-                            const match = presets.find(p => {
-                                                           return p.format
-                                                           === SettingsData.lockDateFormat
-                                                       })
-                            return match ? match.label: I18n.tr("Custom: ") + SettingsData.lockDateFormat
-                        }
-                        options: ["System Default", "Day Date", "Day Month Date", "Month Date", "Numeric (M/D)", "Numeric (D/M)", "Full with Year", "ISO Date", "Full Day & Month", "Custom..."]
-                        onValueChanged: value => {
-                                            const formatMap = {
-                                                "System Default": "",
-                                                "Day Date": "ddd d",
-                                                "Day Month Date": "ddd MMM d",
-                                                "Month Date": "MMM d",
-                                                "Numeric (M/D)": "M/d",
-                                                "Numeric (D/M)": "d/M",
-                                                "Full with Year": "ddd d MMM yyyy",
-                                                "ISO Date": "yyyy-MM-dd",
-                                                "Full Day & Month": "dddd, MMMM d"
-                                            }
-                                            if (value === "Custom...") {
-                                                customLockFormatInput.visible = true
-                                            } else {
-                                                customLockFormatInput.visible = false
-                                                SettingsData.setLockDateFormat(
-                                                    formatMap[value])
-                                            }
-                                        }
-                    }
-
-                    DankTextField {
-                        id: customFormatInput
-
-                        width: parent.width
-                        visible: false
-                        placeholderText: I18n.tr("Enter custom top bar format (e.g., ddd MMM d)")
-                        text: SettingsData.clockDateFormat
-                        onTextChanged: {
-                            if (visible && text)
-                                SettingsData.setClockDateFormat(text)
-                        }
-                    }
-
-                    DankTextField {
-                        id: customLockFormatInput
-
-                        width: parent.width
-                        visible: false
-                        placeholderText: I18n.tr("Enter custom lock screen format (e.g., dddd, MMMM d)")
-                        text: SettingsData.lockDateFormat
-                        onTextChanged: {
-                            if (visible && text)
-                                SettingsData.setLockDateFormat(text)
-                        }
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: formatHelp.implicitHeight + Theme.spacingM * 2
-                        radius: Theme.cornerRadius
-                        color: Theme.surfaceContainerHigh
-                        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                              Theme.outline.b, 0.1)
-                        border.width: 0
-
-                        Column {
-                            id: formatHelp
-
-                            anchors.fill: parent
-                            anchors.margins: Theme.spacingM
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Format Legend")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.primary
-                                font.weight: Font.Medium
-                            }
-
-                            Row {
-                                width: parent.width
-                                spacing: Theme.spacingL
-
-                                Column {
-                                    width: (parent.width - Theme.spacingL) / 2
-                                    spacing: 2
-
-                                    StyledText {
-                                        text: I18n.tr("• d - Day (1-31)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• dd - Day (01-31)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• ddd - Day name (Mon)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• dddd - Day name (Monday)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• M - Month (1-12)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-                                }
-
-                                Column {
-                                    width: (parent.width - Theme.spacingL) / 2
-                                    spacing: 2
-
-                                    StyledText {
-                                        text: I18n.tr("• MM - Month (01-12)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• MMM - Month (Jan)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• MMMM - Month (January)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• yy - Year (24)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("• yyyy - Year (2024)")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Modules/Settings/WeatherTab.qml

@@ -1,390 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: weatherTab
-
-    DankFlickable {
-        anchors.fill: parent
-        anchors.topMargin: Theme.spacingL
-        clip: true
-        contentHeight: mainColumn.height
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            width: parent.width
-            spacing: Theme.spacingXL
-
-            // Enable Weather
-            StyledRect {
-                width: parent.width
-                height: enableWeatherSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: enableWeatherSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "cloud"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            width: parent.width - Theme.iconSize - Theme.spacingM
-                                   - enableToggle.width - Theme.spacingM
-                            spacing: Theme.spacingXS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            StyledText {
-                                text: I18n.tr("Enable Weather")
-                                font.pixelSize: Theme.fontSizeLarge
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Show weather information in top bar and control center")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                wrapMode: Text.WordWrap
-                                width: parent.width
-                            }
-                        }
-
-                        DankToggle {
-                            id: enableToggle
-
-                            anchors.verticalCenter: parent.verticalCenter
-                            checked: SettingsData.weatherEnabled
-                            onToggled: checked => {
-                                           return SettingsData.setWeatherEnabled(
-                                               checked)
-                                       }
-                        }
-                    }
-                }
-            }
-
-            // Temperature Unit
-            StyledRect {
-                width: parent.width
-                height: temperatureSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-                visible: SettingsData.weatherEnabled
-                opacity: visible ? 1 : 0
-
-                Column {
-                    id: temperatureSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "thermostat"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            width: parent.width - Theme.iconSize - Theme.spacingM
-                                   - temperatureToggle.width - Theme.spacingM
-                            spacing: Theme.spacingXS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            StyledText {
-                                text: I18n.tr("Use Fahrenheit")
-                                font.pixelSize: Theme.fontSizeLarge
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Use Fahrenheit instead of Celsius for temperature")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                wrapMode: Text.WordWrap
-                                width: parent.width
-                            }
-                        }
-
-                        DankToggle {
-                            id: temperatureToggle
-
-                            anchors.verticalCenter: parent.verticalCenter
-                            checked: SettingsData.useFahrenheit
-                            onToggled: checked => {
-                                           return SettingsData.setTemperatureUnit(
-                                               checked)
-                                       }
-                        }
-                    }
-                }
-
-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-            }
-
-            // Location Settings
-            StyledRect {
-                width: parent.width
-                height: locationSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-                visible: SettingsData.weatherEnabled
-                opacity: visible ? 1 : 0
-
-                Column {
-                    id: locationSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "location_on"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            width: parent.width - Theme.iconSize - Theme.spacingM
-                                   - autoLocationToggle.width - Theme.spacingM
-                            spacing: Theme.spacingXS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            StyledText {
-                                text: I18n.tr("Auto Location")
-                                font.pixelSize: Theme.fontSizeLarge
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Automatically determine your location using your IP address")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                wrapMode: Text.WordWrap
-                                width: parent.width
-                            }
-                        }
-
-                        DankToggle {
-                            id: autoLocationToggle
-
-                            anchors.verticalCenter: parent.verticalCenter
-                            checked: SettingsData.useAutoLocation
-                            onToggled: checked => {
-                                           return SettingsData.setAutoLocation(
-                                               checked)
-                                       }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        visible: !SettingsData.useAutoLocation
-
-                        Rectangle {
-                            width: parent.width
-                            height: 1
-                            color: Theme.outline
-                            opacity: 0.2
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Custom Location")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                        }
-
-                        Row {
-                                width: parent.width
-                                spacing: Theme.spacingM
-
-                                Column {
-                                    width: (parent.width - Theme.spacingM) / 2
-                                    spacing: Theme.spacingXS
-
-                                    StyledText {
-                                        text: I18n.tr("Latitude")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    DankTextField {
-                                        id: latitudeInput
-                                        width: parent.width
-                                        height: 48
-                                        placeholderText: "40.7128"
-                                        backgroundColor: Theme.surfaceVariant
-                                        normalBorderColor: Theme.primarySelected
-                                        focusedBorderColor: Theme.primary
-                                        keyNavigationTab: longitudeInput
-
-                                        Component.onCompleted: {
-                                            if (SettingsData.weatherCoordinates) {
-                                                const coords = SettingsData.weatherCoordinates.split(',')
-                                                if (coords.length > 0) {
-                                                    text = coords[0].trim()
-                                                }
-                                            }
-                                        }
-
-                                        Connections {
-                                            target: SettingsData
-                                            function onWeatherCoordinatesChanged() {
-                                                if (SettingsData.weatherCoordinates) {
-                                                    const coords = SettingsData.weatherCoordinates.split(',')
-                                                    if (coords.length > 0) {
-                                                        latitudeInput.text = coords[0].trim()
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                        onTextEdited: {
-                                            if (text && longitudeInput.text) {
-                                                const coords = text + "," + longitudeInput.text
-                                                SettingsData.weatherCoordinates = coords
-                                                SettingsData.saveSettings()
-                                            }
-                                        }
-                                    }
-                                }
-
-                                Column {
-                                    width: (parent.width - Theme.spacingM) / 2
-                                    spacing: Theme.spacingXS
-
-                                    StyledText {
-                                        text: I18n.tr("Longitude")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceVariantText
-                                    }
-
-                                    DankTextField {
-                                        id: longitudeInput
-                                        width: parent.width
-                                        height: 48
-                                        placeholderText: "-74.0060"
-                                        backgroundColor: Theme.surfaceVariant
-                                        normalBorderColor: Theme.primarySelected
-                                        focusedBorderColor: Theme.primary
-                                        keyNavigationTab: locationSearchInput
-                                        keyNavigationBacktab: latitudeInput
-
-                                        Component.onCompleted: {
-                                            if (SettingsData.weatherCoordinates) {
-                                                const coords = SettingsData.weatherCoordinates.split(',')
-                                                if (coords.length > 1) {
-                                                    text = coords[1].trim()
-                                                }
-                                            }
-                                        }
-
-                                        Connections {
-                                            target: SettingsData
-                                            function onWeatherCoordinatesChanged() {
-                                                if (SettingsData.weatherCoordinates) {
-                                                    const coords = SettingsData.weatherCoordinates.split(',')
-                                                    if (coords.length > 1) {
-                                                        longitudeInput.text = coords[1].trim()
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                        onTextEdited: {
-                                            if (text && latitudeInput.text) {
-                                                const coords = latitudeInput.text + "," + text
-                                                SettingsData.weatherCoordinates = coords
-                                                SettingsData.saveSettings()
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                        Column {
-                            width: parent.width
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Location Search")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                font.weight: Font.Medium
-                            }
-
-                            DankLocationSearch {
-                                id: locationSearchInput
-                                width: parent.width
-                                currentLocation: ""
-                                placeholderText: I18n.tr("New York, NY")
-                                keyNavigationBacktab: longitudeInput
-                                onLocationSelected: (displayName, coordinates) => {
-                                                        SettingsData.setWeatherLocation(displayName, coordinates)
-
-                                                        const coords = coordinates.split(',')
-                                                        if (coords.length >= 2) {
-                                                            latitudeInput.text = coords[0].trim()
-                                                            longitudeInput.text = coords[1].trim()
-                                                        }
-                                                    }
-                            }
-                        }
-                    }
-                }
-
-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-            }
-        }
-    }
-}

Modules/Settings/WidgetTweaksTab.qml

@@ -1,401 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: widgetTweaksTab
-
-    DankFlickable {
-        anchors.fill: parent
-        anchors.topMargin: Theme.spacingL
-        clip: true
-        contentHeight: mainColumn.height
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-            width: parent.width
-            spacing: Theme.spacingXL
-
-            StyledRect {
-                width: parent.width
-                height: workspaceSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: workspaceSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "view_module"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Workspace Settings")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Workspace Index Numbers")
-                        description: "Show workspace index numbers in the top bar workspace switcher"
-                        checked: SettingsData.showWorkspaceIndex
-                        onToggled: checked => {
-                                       return SettingsData.setShowWorkspaceIndex(
-                                           checked)
-                                   }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Workspace Padding")
-                        description: "Always show a minimum of 3 workspaces, even if fewer are available"
-                        checked: SettingsData.showWorkspacePadding
-                        onToggled: checked => {
-                                       return SettingsData.setShowWorkspacePadding(
-                                           checked)
-                                   }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Show Workspace Apps")
-                        description: "Display application icons in workspace indicators"
-                        checked: SettingsData.showWorkspaceApps
-                        onToggled: checked => {
-                                       return SettingsData.setShowWorkspaceApps(
-                                           checked)
-                                   }
-                    }
-
-		    Row {
-                        width: parent.width - Theme.spacingL
-                        spacing: Theme.spacingL
-                        visible: SettingsData.showWorkspaceApps
-                        opacity: visible ? 1 : 0
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingL
-
-                        Column {
-                            width: 120
-                            spacing: Theme.spacingS
-
-                            StyledText {
-                                text: I18n.tr("Max apps to show")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-
-                            DankTextField {
-                                width: 100
-                                height: 28
-                                placeholderText: "#ffffff"
-                                text: SettingsData.maxWorkspaceIcons
-                                maximumLength: 7
-                                font.pixelSize: Theme.fontSizeSmall
-                                topPadding: Theme.spacingXS
-                                bottomPadding: Theme.spacingXS
-                                onEditingFinished: {
-                                    SettingsData.setMaxWorkspaceIcons(parseInt(text, 10))
-                                }
-                            }
-                        }
-
-                        Behavior on opacity {
-                            NumberAnimation {
-                                duration: Theme.mediumDuration
-                                easing.type: Theme.emphasizedEasing
-                            }
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Per-Monitor Workspaces")
-                        description: "Show only workspaces belonging to each specific monitor."
-                        checked: SettingsData.workspacesPerMonitor
-                        onToggled: checked => {
-                            return SettingsData.setWorkspacesPerMonitor(checked);
-                        }
-                    }
-                }
-            }
-
-            StyledRect {
-                width: parent.width
-                height: mediaSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: mediaSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "music_note"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Media Player Settings")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Wave Progress Bars")
-                        description: "Use animated wave progress bars for media playback"
-                        checked: SettingsData.waveProgressEnabled
-                        onToggled: checked => {
-                            return SettingsData.setWaveProgressEnabled(checked)
-                        }
-                    }
-                }
-            }
-
-            StyledRect {
-                width: parent.width
-                height: runningAppsSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: runningAppsSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "apps"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Running Apps Settings")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Running Apps Only In Current Workspace")
-                        description: "Show only apps running in current workspace"
-                        checked: SettingsData.runningAppsCurrentWorkspace
-                        onToggled: checked => {
-                                       return SettingsData.setRunningAppsCurrentWorkspace(
-                                           checked)
-                                   }
-                    }
-                }
-            }
-
-            StyledRect {
-                width: parent.width
-                height: workspaceIconsSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                      Theme.outline.b, 0.2)
-                border.width: 0
-                visible: SettingsData.hasNamedWorkspaces()
-
-                Column {
-                    id: workspaceIconsSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "label"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Named Workspace Icons")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    StyledText {
-                        width: parent.width
-                        text: I18n.tr("Configure icons for named workspaces. Icons take priority over numbers when both are enabled.")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.outline
-                        wrapMode: Text.WordWrap
-                    }
-
-                    Repeater {
-                        model: SettingsData.getNamedWorkspaces()
-
-                        Rectangle {
-                            width: parent.width
-                            height: workspaceIconRow.implicitHeight + Theme.spacingM
-                            radius: Theme.cornerRadius
-                            color: Qt.rgba(Theme.surfaceContainer.r,
-                                           Theme.surfaceContainer.g,
-                                           Theme.surfaceContainer.b, 0.5)
-                            border.color: Qt.rgba(Theme.outline.r,
-                                                  Theme.outline.g,
-                                                  Theme.outline.b, 0.3)
-                            border.width: 0
-
-                            Row {
-                                id: workspaceIconRow
-
-                                anchors.left: parent.left
-                                anchors.right: parent.right
-                                anchors.verticalCenter: parent.verticalCenter
-                                anchors.leftMargin: Theme.spacingM
-                                anchors.rightMargin: Theme.spacingM
-                                spacing: Theme.spacingM
-
-                                StyledText {
-                                    text: "\"" + modelData + "\""
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    font.weight: Font.Medium
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    width: 150
-                                    elide: Text.ElideRight
-                                }
-
-                                DankIconPicker {
-                                    id: iconPicker
-                                    anchors.verticalCenter: parent.verticalCenter
-
-                                    Component.onCompleted: {
-                                        var iconData = SettingsData.getWorkspaceNameIcon(
-                                                    modelData)
-                                        if (iconData) {
-                                            setIcon(iconData.value,
-                                                    iconData.type)
-                                        }
-                                    }
-
-                                    onIconSelected: (iconName, iconType) => {
-                                                        SettingsData.setWorkspaceNameIcon(
-                                                            modelData, {
-                                                                "type": iconType,
-                                                                "value": iconName
-                                                            })
-                                                        setIcon(iconName,
-                                                                iconType)
-                                                    }
-
-                                    Connections {
-                                        target: SettingsData
-                                        function onWorkspaceIconsUpdated() {
-                                            var iconData = SettingsData.getWorkspaceNameIcon(
-                                                        modelData)
-                                            if (iconData) {
-                                                iconPicker.setIcon(
-                                                            iconData.value,
-                                                            iconData.type)
-                                            } else {
-                                                iconPicker.setIcon("", "icon")
-                                            }
-                                        }
-                                    }
-                                }
-
-                                Rectangle {
-                                    width: 28
-                                    height: 28
-                                    radius: Theme.cornerRadius
-                                    color: clearMouseArea.containsMouse ? Theme.errorHover : Theme.surfaceContainer
-                                    border.color: clearMouseArea.containsMouse ? Theme.error : Theme.outline
-                                    border.width: 0
-                                    anchors.verticalCenter: parent.verticalCenter
-
-                                    DankIcon {
-                                        name: "close"
-                                        size: 16
-                                        color: clearMouseArea.containsMouse ? Theme.error : Theme.outline
-                                        anchors.centerIn: parent
-                                    }
-
-                                    MouseArea {
-                                        id: clearMouseArea
-
-                                        anchors.fill: parent
-                                        hoverEnabled: true
-                                        cursorShape: Qt.PointingHandCursor
-                                        onClicked: {
-                                            SettingsData.removeWorkspaceNameIcon(
-                                                        modelData)
-                                        }
-                                    }
-                                }
-
-                                Item {
-                                    width: parent.width - 150 - 240 - 28 - Theme.spacingM * 4
-                                    height: 1
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Modules/WallpaperEngineProc.qml

@@ -1,63 +0,0 @@
-import QtCore
-import QtQuick
-import Quickshell.Io
-import Quickshell
-import qs.Common
-
-Item {
-    id: root
-    property string monitor: ""
-    property string sceneId: ""
-    property string pendingSceneId: ""
-
-    Process {
-        id: weProcess
-        running: false
-        command: []
-    }
-
-    Process {
-        id: killer
-        running: false
-        command: []
-        onExited: (code) => {
-            if (pendingSceneId !== "") {
-                const cacheHome = StandardPaths.writableLocation(StandardPaths.CacheLocation).toString()
-                const baseDir = Paths.strip(cacheHome)
-                const outDir = baseDir + "/dankshell/we_screenshots" 
-                const outPath = outDir + "/" + pendingSceneId + ".jpg"
-
-                Quickshell.execDetached(["mkdir", "-p", outDir])
-                weProcess.command = [
-                    "linux-wallpaperengine",
-                    "--screen-root", monitor,
-                    "--screenshot", outPath,
-                    "--bg", pendingSceneId,
-                    "--silent"
-                ]
-                weProcess.running = true
-                sceneId = pendingSceneId
-                pendingSceneId = ""
-            }
-        }
-    }
-
-    function start(newSceneId) {
-        if (sceneId === newSceneId && weProcess.running) {
-            return
-        }
-        pendingSceneId = newSceneId
-        stop()
-    }
-
-    function stop() {
-        if (weProcess.running) {
-            weProcess.running = false
-        }
-        killer.command = [
-            "pkill", "-f",
-            "linux-wallpaperengine --screen-root " + monitor
-        ]
-        killer.running = true
-    }
-}

README.md

@@ -1,770 +1,192 @@
-# DankMaterialShell (dms)
+# DankMaterialShell
 
-<div align=center>
+<div align="center">
+  <a href="https://danklinux.com">
+    <img src="assets/danklogo.svg" alt="DankMaterialShell" width="200">
+  </a>
 
+  ### A modern desktop shell for Wayland
+
+  Built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/)
+
+[![Documentation](https://img.shields.io/badge/docs-danklinux.com-9ccbfb?style=for-the-badge&labelColor=101418)](https://danklinux.com/docs)
 [![GitHub stars](https://img.shields.io/github/stars/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=ffd700)](https://github.com/AvengeMedia/DankMaterialShell/stargazers)
 [![GitHub License](https://img.shields.io/github/license/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=b9c8da)](https://github.com/AvengeMedia/DankMaterialShell/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/v/release/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/releases)
-[![GitHub last commit](https://img.shields.io/github/last-commit/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/commits/master)
 [![AUR version](https://img.shields.io/aur/version/dms-shell-bin?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://aur.archlinux.org/packages/dms-shell-bin)
 [![AUR version (git)](https://img.shields.io/aur/version/dms-shell-git?style=for-the-badge&labelColor=101418&color=9ccbfb&label=AUR%20(git))](https://aur.archlinux.org/packages/dms-shell-git)
 [![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Favengemediallc)](https://ko-fi.com/avengemediallc)
 
 </div>
 
-A modern Wayland desktop shell built with [Quickshell](https://quickshell.org/) and optimized for the [niri](https://github.com/YaLTeR/niri) and [Hyprland](https://hyprland.org/) compositors.
+DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org),  [labwc](https://labwc.github.io/), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop.
 
-Features notifications, app launcher, wallpaper customization, and fully customizable with [plugins](https://github.com/AvengeMedia/dms-plugin-registry).
+## Repository Structure
 
-## Screenshots
+This is a monorepo containing both the shell interface and the core backend services:
 
-<div align="center">
-<div style="max-width: 700px; margin: 0 auto;">
+```
+DankMaterialShell/
+├── quickshell/         # QML-based shell interface
+│   ├── Modules/        # UI components (panels, widgets, overlays)
+│   ├── Services/       # System integration (audio, network, bluetooth)
+│   ├── Widgets/        # Reusable UI controls
+│   └── Common/         # Shared resources and themes
+├── core/               # Go backend and CLI
+│   ├── cmd/            # dms CLI and dankinstall binaries
+│   ├── internal/       # System integration, IPC, distro support
+│   └── pkg/            # Shared packages
+├── distro/             # Distribution packaging
+│   ├── fedora/         # Fedora RPM specs
+│   ├── debian/         # Debian packaging
+│   └── nix/            # NixOS/home-manager modules
+└── flake.nix           # Nix flake for declarative installation
+```
 
-https://github.com/user-attachments/assets/9b99dbbf-42d3-44ab-83b6-fae6c2aa3cc0
-
-</div>
-</div>
-
-<details><summary><strong>View More Screenshots</strong></summary>
-
-<br>
+## See it in Action
 
 <div align="center">
 
-### Desktop Overview
+https://github.com/user-attachments/assets/1200a739-7770-4601-8b85-695ca527819a
 
-<img src="https://github.com/user-attachments/assets/203a9678-c3b7-4720-bb97-853a511ac5c8" width="600" alt="DankMaterialShell Desktop" />
+</div>
 
-### Dashboard
+<details><summary><strong>More Screenshots</strong></summary>
 
-<img width="600" alt="DankDash" src="https://github.com/user-attachments/assets/a937cf35-a43b-4558-8c39-5694ff5fcac4" />
+<div align="center">
 
-### Application Launcher
+<img src="https://github.com/user-attachments/assets/203a9678-c3b7-4720-bb97-853a511ac5c8" width="600" alt="Desktop" />
 
-<img src="https://github.com/user-attachments/assets/2da00ea1-8921-4473-a2a9-44a44535a822" width="450" alt="Spotlight Launcher" />
+<img src="https://github.com/user-attachments/assets/a937cf35-a43b-4558-8c39-5694ff5fcac4" width="600" alt="Dashboard" />
 
-### Control Center
+<img src="https://github.com/user-attachments/assets/2da00ea1-8921-4473-a2a9-44a44535a822" width="450" alt="Launcher" />
 
-<img width="600" alt="Control Center" src="https://github.com/user-attachments/assets/732c30de-5f4a-4a2b-a995-c8ab656cecd5" />
-
-### System Monitor
-
-<img src="https://github.com/user-attachments/assets/b3c817ec-734d-4974-929f-2d11a1065349" width="600" alt="System Monitor" />
-
-### Widget Customization
-
-<img src="https://github.com/user-attachments/assets/903f7c60-146f-4fb3-a75d-a4823828f298" width="500" alt="Widget Customization" />
-
-### Lock Screen
-
-<img src="https://github.com/user-attachments/assets/3fa07de2-c1b0-4e57-8f25-3830ac6baf4f" width="600" alt="Lock Screen" />
-
-### Dynamic Theming
-
-<img src="https://github.com/user-attachments/assets/a81a68e3-4f7e-4246-8199-0fef1013d4cf" width="700" alt="Auto Theme" />
-
-### Notification Center
-
-<img src="https://github.com/user-attachments/assets/07cbde9a-0242-4989-9f97-5765c6458c85" width="350" alt="Notification Center" />
-
-### Dock
-
-<img src="https://github.com/user-attachments/assets/e6999daf-f7bf-4329-98fa-0ce4f0e7219c" width="400" alt="Dock" />
+<img src="https://github.com/user-attachments/assets/732c30de-5f4a-4a2b-a995-c8ab656cecd5" width="600" alt="Control Center" />
 
 </div>
 
 </details>
 
-## Quick start (full dotfiles, most distros)
+## Installation
 
 ```bash
 curl -fsSL https://install.danklinux.com | sh
 ```
-*Or skip to [Installation](https://github.com/AvengeMedia/DankMaterialShell?tab=readme-ov-file#installation)*
 
-<details><summary><strong>Features</strong></summary>
+One command installs DMS and all dependencies on Arch, Fedora, Debian, Ubuntu, openSUSE, or Gentoo.
 
-**Core Widgets:**
-- **TopBar**: fully customizable bar where widgets can be added, removed, and re-arranged.
-  - **App Launcher** with fuzzy search, categories, and auto-sorting by most used apps.
-  - **Workspace Switcher** Configurable workspace switcher.
-  - **Focused Window** Displays the currently focused window app name and title.
-  - **Running Apps** A view of all running apps, sorted by monitor, workspace, then position on workspace.
-  - **Media Player** Short form media player with equalizer, song title, and controls.
-  - **Clock** Clock and date widget
-  - **Weather** Weather widget with customizable location
-  - **System Tray** System tray applets with context menus.
-  - **Process Monitor** CPU, RAM, and GPU usage percentages, temperatures. (requires [dgop](https://github.com/AvengeMedia/dgop))
-  - **Power/Battery** Power/Battery widget for battery metrics and power profile changing.
-  - **Notifications** Notification bell with a notification center popup
-  - **Control Center** High-level view of network, bluetooth, and audio status
-  - **Privacy Indicator** Attempts to reveal if a microphone or screen recording session is active, relying on Pipewire data sources
-  - **Idle Inhibitor** Creates a systemd idle inhibitor to prevent sleep/locking from occuring.
-- **Spotlight Launcher** A central app launcher/search that can be triggered via an IPC keybinding.
-- **Central Command** A combined music, weather, calendar, and events PopUp.
-- **Process List** A process list, with system metrics and information. More detailed modal available via IPC.
-- **Notification Center** A center for notifications that has support for grouping.
-- **Dock** A dock with pinned apps support, recent apps support, and currently running application support.
-- **Control Center** A full control center with user profile information, network, bluetooth, audio input/output, display controls, and night mode automation.
-- **Lock Screen** Using quickshell's WlSessionLock with embedded virtual keyboard for Niri (Niri doesn't support placing virtual keyboard above lockscreen natively: [issue](https://github.com/YaLTeR/niri/issues/2201))
-- **Notepad** A simple text notepad/scratchpad with auto-save to session data and file export/import functionality.
+**[Manual installation guide](https://danklinux.com/docs/dankmaterialshell/installation)**
 
-</details>
+## Features
 
-## Highlights
+**Dynamic Theming**
+Wallpaper-based color schemes that automatically theme GTK, Qt, terminals, editors (vscode, vscodium), and more using [matugen](https://github.com/InioX/matugen) and dank16.
 
-- Auto-theming GTK, QT, Terminal apps, and more with [matugen](https://github.com/InioX/matugen) + optional theme generation from wallpaper.
-- 20+ widgets that can be added and re-arranged on the bar.
-- Process list, temperature monitoring, and resource monitoring with [dgop](https://github.com/AvengeMedia/dgop)
-- Notification service with support for grouping and richtext
-- App launcher + Spotlighht launcher with fuzzy search
-- Control center with mpris player, weather, and calendar integration.
-- Clipboard history view with image previews.
-- A dock for running apps + pinned apps
-- Configure bluetooth, wifi, and audio input+output devices.
-- A lock screen
-- Idle monitoring - configure auto lock, screen off, suspend, and hibernate with different knobs for battery + AC power.
-- A greeter
-- A comprehensive plugin system for endless customization possibilities.
+**System Monitoring**
+Real-time CPU, RAM, GPU metrics and temperatures with [dgop](https://github.com/AvengeMedia/dgop). Process list with search and management.
 
-**TL;DR** *dms replaces your waybar, swaylock, swayidle, hypridle, hyprlock, fuzzels, walker, mako, and basically everything you use to stitch a desktop together*
+**Powerful Launcher**
+Spotlight-style search for applications, files ([dsearch](https://github.com/AvengeMedia/danksearch)), emojis, running windows, calculator, and commands. Extensible with plugins.
 
-## Installation
+**Control Center**
+Unified interface for network, Bluetooth, audio devices, display settings, and night mode.
 
-### Compositor Setup
+**Smart Notifications**
+Notification center with grouping, rich text support, and keyboard navigation.
 
-DankMaterialShell supports both **niri** and **Hyprland** compositors:
+**Media Integration**
+MPRIS player controls, calendar sync, weather widgets, and clipboard history with image previews.
 
-**Niri**:
-```bash
-# Arch Linux
-paru -S niri-git
+**Session Management**
+Lock screen, idle detection, auto-lock/suspend with separate AC/battery settings, and greeter support.
 
-# Fedora  
-sudo dnf copr enable yalter/niri && sudo dnf install niri
-```
+**Plugin System**
+Extend functionality with the [plugin registry](https://plugins.danklinux.com).
 
-For detailed niri installation instructions, see the [niri Getting Started guide](https://yalter.github.io/niri/Getting-Started.html).
+## Supported Compositors
 
-**Hyprland**:
-```bash
-# Arch Linux
-sudo pacman -S hyprland
+Works best with [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [Sway](https://swaywm.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), and [labwc](https://labwc.github.io/) with full workspace switching, overview integration, and monitor management. Other Wayland compositors work with reduced features.
 
-# Or from AUR for latest
-paru -S hyprland-git
+[Compositor configuration guide](https://danklinux.com/docs/dankmaterialshell/compositors)
 
-# Fedora
-sudo dnf install hyprland
+## Command Line Interface
 
-# Or use Copr for latest builds
-sudo dnf copr enable solopasha/hyprland && sudo dnf install hyprland
-```
-
-For detailed Hyprland installation instructions, see the [Hyprland wiki](https://wiki.hypr.land/Getting-Started/Installation/).
-
-### Dank Shell Installation
-
-*feel free to contribute steps for other distributions*
-
-#### Arch Linux - via AUR
+Control the shell from the command line or keybinds:
 
 ```bash
-paru -S dms-shell-git
-```
-
-#### nixOS - via flake
-
-```bash
-nix profile install github:AvengeMedia/DankMaterialShell
-```
-
-#### nixOS - via home-manager
-
-To install using home-manager, you need to add this repo into your flake inputs:
-
-``` nix
-dankMaterialShell = {
-  url = "github:AvengeMedia/DankMaterialShell";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-```
-
-Then somewhere in your home-manager config, add this to the imports:
-
-``` nix
-imports = [
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-];
-```
-
-If you use Niri, the `niri` homeModule provides additional options for Niri integration, such as key bindings and spawn:
-
-``` nix
-imports = [
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
-];
-```
-
-> [!IMPORTANT]
-> To use the `niri` homeModule, you must have `sobidoo/niri-flake` in your inputs:
-
-``` nix
-niri = {
-  url = "github:sodiboo/niri-flake";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-```
-
-And import it in home-manager:
-
-``` nix
-imports = [
-  inputs.niri.homeModules.niri
-];
-```
-
-Now you can enable it with:
-
-``` nix
-programs.dankMaterialShell.enable = true;
-```
-
-There are a lot of possible configurations that you can enable/disable in the flake, check [nix/default.nix](nix/default.nix) and [nix/niri.nix](nix/niri.nix) to see them all.
-
-#### Other Distributions - via manual installation
-
-**1. Install Quickshell (Varies by Distribution)**
-```bash
-# Arch
-paru -S quickshell-git
-# Fedora
-sudo dnf copr enable errornointernet/quickshell && sudo dnf install quickshell-git
-# ! TODO - document other distros
-```
-
-**2. Install fonts**
-*Inter Variable* and *Fira Code* are not strictly required, but they are the default fonts of dms.
-
-**2.1 Install Material Symbols**
-```bash
-sudo curl -L "https://github.com/google/material-design-icons/raw/master/variablefont/MaterialSymbolsRounded%5BFILL%2CGRAD%2Copsz%2Cwght%5D.ttf" -o /usr/share/fonts/MaterialSymbolsRounded.ttf
-```
-**2.2 Install Inter Variable**
-```bash
-sudo curl -L "https://github.com/rsms/inter/raw/refs/tags/v4.1/docs/font-files/InterVariable.ttf" -o /usr/share/fonts/InterVariable.ttf
-```
-
-**2.3 Install Fira Code (monospace font)**
-```bash
-sudo curl -L "https://github.com/tonsky/FiraCode/releases/latest/download/FiraCode-Regular.ttf" -o /usr/share/fonts/FiraCode-Regular.ttf
-```
-
-**2.4 Refresh font cache**
-```bash
-fc-cache -fv
-```
-
-**3. Install the shell**
-
-**3.1. Clone latest master**
-```bash
-mkdir ~/.config/quickshell && git clone https://github.com/AvengeMedia/DankMaterialShell.git ~/.config/quickshell/dms
-```
-
-**3.2. Install latest dms CLI**
-```bash
-sudo sh -c "curl -L https://github.com/AvengeMedia/danklinux/releases/latest/download/dms-$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').gz | gunzip | tee /usr/local/bin/dms > /dev/null && chmod +x /usr/local/bin/dms"
-```
-
-**4. Optional Features (system monitoring, clipboard history, brightness controls, etc.)**
-
-**4.1 Core optional dependencies**
-```bash
-# Arch Linux
-sudo pacman -S cava wl-clipboard cliphist brightnessctl
-paru -S matugen-bin dgop
-
-# Fedora
-sudo dnf install cava wl-clipboard brightnessctl
-sudo dnf copr enable wef/cliphist && sudo dnf install cliphist
-sudo dnf copr enable heus-sueh/packages && sudo dnf install matugen
-```
-
-*Other distros will just need to find sources for the above packages*
-
-**4.2 - dgop manual installation**
-
-`dgop` is available via AUR and a nix flake, other distributions can install it manually.
-
-```bash
-sudo sh -c "curl -L https://github.com/AvengeMedia/dgop/releases/latest/download/dgop-linux-$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').gz | gunzip | tee /usr/local/bin/dgop > /dev/null && chmod +x /usr/local/bin/dgop"
-```
-
-**Optional Requirement Overview**
-
-- `dgop`: Ability to have system resource widgets, process list modal, and temperature monitoring.
-- `matugen`: Wallpaper-based dynamic theming
-- `brightnessctl`: Backlight and LED brightness control
-- `wl-clipboard`: Required for copying various elements to clipboard.
-- `cava`: Audio visualizer
-- `cliphist`: Clipboard history
-- `gammastep`: Night mode support
-
-## Compositor Configuration
-
-A lot of options are subject to personal preference, but the below sets a good starting point for most features.
-
-### niri Integration
-
-Add to your niri config
-
-```kdl
-// Required for clipboard history integration
-spawn-at-startup "bash" "-c" "wl-paste --watch cliphist store &"
-
-// Recommended (must install polkit-mate before hand) for elevation prompts
-spawn-at-startup "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1"
-// This may be a different path on different distributions, the above is for the arch linux mate-polkit package
-
-// Starts DankShell
-spawn-at-startup "dms" "run"
-
-// If using niri newer than 271534e115e5915231c99df287bbfe396185924d (~aug 17 2025)
-// you can add this to disable built in config load errors since dank shell provides this
-config-notification {
-    disable-failed
-}
-
-// Dank keybinds
-// 1. These should not be in conflict with any pre-existing keybindings
-// 2. You need to merge them with your existing config if you want to use these
-// 3. You can change the keys to whatever you want, if you prefer something different
-// 4. For the increment/decrement ones you can change the steps to whatever you like too
-binds {
-   Mod+Space hotkey-overlay-title="Application Launcher" {
-      spawn "dms" "ipc" "call" "spotlight" "toggle";
-   }
-   Mod+V hotkey-overlay-title="Clipboard Manager" {
-      spawn "dms" "ipc" "call" "clipboard" "toggle";
-   }
-   Mod+M hotkey-overlay-title="Task Manager" {
-      spawn "dms" "ipc" "call" "processlist" "toggle";
-   }
-   Mod+N hotkey-overlay-title="Notification Center" {
-      spawn "dms" "ipc" "call" "notifications" "toggle";
-   }
-   Mod+Comma hotkey-overlay-title="Settings" {
-      spawn "dms" "ipc" "call" "settings" "toggle";
-   }
-   Mod+P hotkey-overlay-title="Notepad" {
-      spawn "dms" "ipc" "call" "notepad" "toggle";
-   }
-   Super+Alt+L hotkey-overlay-title="Lock Screen" {
-      spawn "dms" "ipc" "call" "lock" "lock";
-   }
-   Mod+X hotkey-overlay-title="Power Menu" {
-      spawn "dms" "ipc" "call" "powermenu" "toggle";
-   }
-   Mod+C hotkey-overlay-title="Control Center" {
-      spawn "dms" "ipc" "call" "control-center" "toggle";
-   }
-   XF86AudioRaiseVolume allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "increment" "3";
-   }
-   XF86AudioLowerVolume allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "decrement" "3";
-   }
-   XF86AudioMute allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "mute";
-   }
-   XF86AudioMicMute allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "micmute";
-   }
-   XF86MonBrightnessUp allow-when-locked=true {
-      spawn "dms" "ipc" "call" "brightness" "increment" "5" "";
-   }
-   // You can override the default device for e.g. keyboards by adding the device name to the last param
-   XF86MonBrightnessDown allow-when-locked=true {
-      spawn "dms" "ipc" "call" "brightness" "decrement" "5" "";
-   }
-   // Night mode toggle
-   Mod+Shift+N allow-when-locked=true {
-      spawn "dms" "ipc" "call" "night" "toggle";
-   }
-}
-```
-
-#### niri theming
-
-If using a niri build newer than [3933903](https://github.com/YaLTeR/niri/commit/39339032cee3453faa54c361a38db6d83756f750), you can synchronize colors and gaps with the shell settings by adding the following to your niri config.
-
-```bash
-# For colors
-echo -e 'include "dms/colors.kdl"' >> ~/.config/niri/config.kdl
-# For gaps, border widths, certain window rules
-echo -e 'include "dms/layout.kdl"' >> ~/.config/niri/config.kdl
-```
-
-### Hyprland Integration
-
-Add to your Hyprland config (`~/.config/hypr/hyprland.conf`):
-
-```bash
-# Required for clipboard history integration
-exec-once = bash -c "wl-paste --watch cliphist store &"
-
-# Recommended (must install polkit-mate beforehand) for elevation prompts  
-exec-once = /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
-# This may be a different path on different distributions, the above is for the arch linux mate-polkit package
-
-# Starts DankShell
-exec-once = dms run
-
-# Dank keybinds
-# 1. These should not be in conflict with any pre-existing keybindings
-# 2. You need to merge them with your existing config if you want to use these
-# 3. You can change the keys to whatever you want, if you prefer something different
-# 4. For the increment/decrement ones you can change the steps to whatever you like too
-
-# Application and system controls
-bind = SUPER, Space, exec, dms ipc call spotlight toggle
-bind = SUPER, V, exec, dms ipc call clipboard toggle
-bind = SUPER, M, exec, dms ipc call processlist toggle
-bind = SUPER, N, exec, dms ipc call notifications toggle
-bind = SUPER, comma, exec, dms ipc call settings toggle
-bind = SUPER, P, exec, dms ipc call notepad toggle
-bind = SUPERALT, L, exec, dms ipc call lock lock
-bind = SUPER, X, exec, dms ipc call powermenu toggle
-bind = SUPER, C, exec, dms ipc call control-center toggle 
-
-# Audio controls (function keys)
-bindl = , XF86AudioRaiseVolume, exec, dms ipc call audio increment 3
-bindl = , XF86AudioLowerVolume, exec, dms ipc call audio decrement 3
-bindl = , XF86AudioMute, exec, dms ipc call audio mute
-bindl = , XF86AudioMicMute, exec, dms ipc call audio micmute
-
-# Brightness controls (function keys)
-bindl = , XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 ""
-# You can override the default device for e.g. keyboards by adding the device name to the last param
-bindl = , XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 ""
-
-# Night mode toggle
-bind = SUPERSHIFT, N, exec, dms ipc call night toggle
-```
-
-## Greeter
-
-You can install a matching [greetd](https://github.com/kennylevinsen/greetd) greeter, that will give you a greeter that matches the lock screen.
-
-It's as simple as running `dms greeter install` in most cases, but more information is in the [Greetd module](Modules/Greetd/README.md)
-
-## IPC Commands
-
-Control everything from the command line, or via keybinds. For comprehensive documentation of all available IPC commands, see [docs/IPC.md](docs/IPC.md).
-
-### Audio control
-```bash
-dms ipc call audio setvolume 50
-dms ipc call audio mute
-```
-### Launch applications
-```bash
+dms run              # Start the shell
 dms ipc call spotlight toggle
-dms ipc call notepad toggle
-dms ipc call processlist toggle
-dms ipc call powermenu toggle
-```
-### System control
-```
+dms ipc call audio setvolume 50
 dms ipc call wallpaper set /path/to/image.jpg
-dms ipc call theme toggle
-dms ipc call night toggle
-dms ipc call lock lock
-```
-### Media control
-```
-dms ipc call mpris playPause
-dms ipc call mpris next
+dms brightness list  # List available displays
+dms plugins search   # Browse plugin registry
 ```
 
-## Theming
+[Full CLI and IPC documentation](https://danklinux.com/docs/dankmaterialshell/keybinds-ipc)
 
-dms will spawn a matugen process on theme changes to generate color palettes for installed and supported apps. If you do not want these files generated, you can set the env variable `DMS_DISABLE_MATUGEN=1` to disable it entirely.
+## Documentation
 
-### Custom Themes
+- **Website:** [danklinux.com](https://danklinux.com)
+- **Docs:** [danklinux.com/docs](https://danklinux.com/docs)
+- **Theming:** [Application themes](https://danklinux.com/docs/dankmaterialshell/application-themes) | [Custom themes](https://danklinux.com/docs/dankmaterialshell/custom-themes)
+- **Plugins:** [Development guide](https://danklinux.com/docs/dankmaterialshell/plugins-overview)
+- **Support:** [Ko-fi](https://ko-fi.com/avengemediallc)
 
-DankMaterialShell supports custom color themes! You can create your own Material Design 3 color schemes or use pre-made themes like Cyberpunk Electric, Hotline Miami, and Miami Vice.
+## Development
 
-For detailed instructions on creating and using custom themes, see [docs/CUSTOM_THEMES.md](docs/CUSTOM_THEMES.md).
+See component-specific documentation:
 
-### System App Integration
+- **[quickshell/](quickshell/)** - QML shell development, widgets, and modules
+- **[core/](core/)** - Go backend, CLI tools, and system integration
+- **[distro/](distro/)** - Distribution packaging (Fedora, Debian, NixOS)
 
-There's two toggles in the appearance section of settings, for GTK and QT apps.
-
-These settings will override some local GTK and QT configuration files, you can still integrate auto-theming if you do not wish DankShell to mess with your QTCT/GTK files.
-
-No matter what when matugen is enabled the files will be created on wallpaper changes:
-
-- ~/.config/gtk-3.0/dank-colors.css
-- ~/.config/gtk-4.0/dank-colors.css
-- ~/.config/qt6ct/colors/matugen.conf
-- ~/.config/qt5ct/colors/matugen.conf
-
-If you do not like our theme path, you can integrate this with other GTK themes, matugen themes, etc.
-
-#### GTK Apps
-
-1. Install [Colloid](https://github.com/vinceliuice/Colloid-gtk-theme)
-
-Colloid is a hard requirement for the auto-theming because of how it integrates with colloid css files, however you can integrate auto-theming with other themes, you just have to do it manually (so leave the toggle OFF in settings)
-
-It will still create `~/.config/gtk-3.0/4.0/dank-colors.css` on theme updates, these you can import into other compatible GTK themes.
+### Building from Source
 
+**Core + Dankinstall:**
 ```bash
-# Some default install settings for colloid
-./install.sh -s standard -l --tweaks normal
+cd core
+make              # Build dms CLI
+make dankinstall  # Build installer
 ```
 
-Configure in `~/.config/gtk-3.0/settings.ini` and `~/.config/gtk-4.0/settings.ini`:
-
-```ini
-[Settings]
-gtk-theme-name=Colloid
+**Shell:**
+```bash
+quickshell -p quickshell/
 ```
 
-#### QT: basic gtk3 based theme (Option 1)
+**NixOS:**
+```nix
+{
+  inputs.dms.url = "github:AvengeMedia/DankMaterialShell";
 
-If you mostly use gtk apps, you'll probably be happy to just set the QT platform theme to gtk3.
-
-```kdl
-environment {
-  // Add to existing environment block
-  QT_QPA_PLATFORMTHEME "gtk3"
-  QT_QPA_PLATFORMTHEME_QT6 "gtk3"
+  # Use in home-manager or NixOS configuration
+  imports = [ inputs.dms.homeModules.dankMaterialShell.default ];
 }
 ```
 
-#### QT: better theming (Option 2)
-
-1. Install qt6ct-kde
-
-```bash
-# Arch
-paru -S qt6ct-kde
-```
-
-*I'm not sure what it is on other distros, but you can manually install via instructions provides on [qt6ct-kde github](https://www.opencode.net/trialuser/qt6ct)
-
-2. **Configure Environment in niri**
-
-```kdl
-  // Add to existing environment block
-  QT_QPA_PLATFORMTHEME "qt6ct"
-  QT_QPA_PLATFORMTHEME_QT6 "qt6ct"
-```
-
-You'll have to restart your session for themes to take effect.
-
-Nevigate to dms settings -> themes & colors -> and click "Apply QT Themes"
-
-#### Firefox
-
-There are two theme paths for Firefox, using with [pywalfox](https://github.com/Frewacom/pywalfox) or [material fox](https://github.com/edelvarden/material-fox-updated)
-
-**(Option 1) - pywalfox**
-
-1. **Install [pywalfox](https://github.com/Frewacom/pywalfox)** on system.
-- Available in AUR via `paru -S python-pywalfox`
-
-2. **Install [pywalfox extension](https://addons.mozilla.org/firefox/addon/pywalfox/)** in firefox.
-
-3. **Restart dms and create symlink** to generate palette and then enable dank colors.
-- Run `ln -sf ~/.cache/wal/dank-pywalfox.json ~/.cache/wal/colors.json`
-
-
-**(Option 2) - Chrome-like theme with dynamic colors**
-
-Firefox does use the GTK3 theme, but it doesn't look that good on the stock theme IMO. A separate matugen css is generated for the [material fox](https://github.com/edelvarden/material-fox-updated) theme, you can configure that theme with dynamic colors by following the steps below.
-
-1. **In firefox, navigate to `about:config`**
-- set `toolkit.legacyuserprofilecustomizations.stylesheets` to `true`
-- set `svg.context-properties.content.enabled` to `true`
-- Create a new property called `userChrome.theme-material` and type `boolean`
-  - set to `true`
-
-<details><summary><strong>Expand for firefox screenshots</strong></summary>
-<img width="1262" height="104" alt="image" src="https://github.com/user-attachments/assets/4bca43d1-5735-4401-9b91-5ee4f0b1e357" />
-<img width="1262" height="104" alt="image" src="https://github.com/user-attachments/assets/348d37e0-5c6c-4db8-b7c9-89cabf282c25" />
-<img width="1244" height="106" alt="image" src="https://github.com/user-attachments/assets/75fd4972-bc4a-4657-b756-b31ef8061b3b" />
-</details>
-
-2. **Install material fox theme**
-```bash
-# Find Firefox profile directory
-export PROFILE_DIR=$(find ~/.mozilla/firefox -maxdepth 1 -type d -name "*.default-release" | head -n 1)
-
-# Download, extract to profile dir, and cleanup
-curl -L -o "$PROFILE_DIR/chrome.zip" https://github.com/edelvarden/material-fox-updated/releases/download/v2.0.0/chrome.zip
-unzip -o "$PROFILE_DIR/chrome.zip" -d "$PROFILE_DIR"
-rm "$PROFILE_DIR/chrome.zip"
-```
-
-3. **Configure dynamic colors for material fox theme**
-```bash
-export PROFILE_DIR=$(find ~/.mozilla/firefox -maxdepth 1 -type d -name "*.default-release" | head -n 1)
-rm -f "$PROFILE_DIR/chrome/theme-material-blue.css"
-ln -sf ~/.config/DankMaterialShell/firefox.css "$PROFILE_DIR/chrome/theme-material-blue.css"
-```
-
-### Terminal Integration
-
-The matugen integration will automatically generate new colors for certain apps only if they are installed.
-
-You can enable the dynamic color schemes in supported terminal apps by modifying their configurations:
-
-**Ghostty**:
-
-```bash
-echo "config-file = ./config-dankcolors" >> ~/.config/ghostty/config
-```
-
-If you want to disable excessive config reloaded popup sin ghostty, you may wish to also add this:
-
-```bash
-# These are the default danklinux options, if you still want config reloaded and copied to clipboard popups you can skip it.
-echo "app-notifications = no-clipboard-copy,no-config-reload" >> ~/.config/ghostty/config
-```
-
-**kitty**:
-
-```bash
-echo "include dank-theme.conf" >> ~/.config/kitty/kitty.conf
-```
-
-## Plugins
-
-[Plugin registry](https://github.com/AvengeMedia/dms-plugin-registry) - collection of available dms plugins.
-
-dms features a plugin system - meaning you can create your own widgets and load other user widgets.
-
-More comprehensive details available in the [PLUGINS](PLUGINS/README.md) - and examples [Emoji Plugin](PLUGINS/ExampleEmojiPlugin) and [Wallpaper Change Hook](PLUGINS/WallpaperWatcherDaemon) are available for reference.
-
-Install an example plugin by:
-
-```bash
-mkdir ~/.config/DankMaterialShell/plugins
-cp -R ./PLUGINS/ExampleEmojiPlugin ~/.config/DankMaterialShell/plugins
-```
-
-**Only install plugins from TRUSTED sources.** Plugins execute QML and javascript at runtime, plugins from third parties should be reviewed before enabling them in dms.
-
-### Calendar Setup
-
-Sync your caldev compatible calendar (Google, Office365, etc.) for dashboard integration:
-
-<details><summary>Configuration Steps</summary>
-
-**Install dependencies:**
-
-#### Arch
-```bash
-sudo pacman -S vdirsyncer khal python-aiohttp-oauthlib
-```
-
-#### Fedora
-```bash
-sudo dnf install python3-vdirsyncer khal python3-aiohttp-oauthlib
-```
-
-**Configure vdirsyncer** (`~/.vdirsyncer/config`):
-
-```ini
-[general]
-status_path = "~/.calendars/status"
-
-[pair personal_sync]
-a = "personal"
-b = "personallocal"
-collections = ["from a", "from b"]
-conflict_resolution = "a wins"
-metadata = ["color"]
-
-[storage personal]
-type = "google_calendar"
-token_file = "~/.vdirsyncer/google_calendar_token"
-client_id = "your_client_id"
-client_secret = "your_client_secret"
-
-[storage personallocal]
-type = "filesystem"
-path = "~/.calendars/Personal"
-fileext = ".ics"
-```
-
-**Setup sync:**
-
-```bash
-vdirsyncer sync
-khal configure
-```
-
-#### Auto-sync every 5 minutes
-```bash
-crontab -e
-# Add: */5 * * * * /usr/bin/vdirsyncer sync
-```
-
-</details>
-
-## Configuration
-
-All settings are configurable in
-```
-~/.config/DankMaterialShell/settings.json`, or more intuitively the built-in settings modal.
-```
-
-**Key configuration areas:**
-
-- Widget positioning and behavior
-- Theme and color preferences
-- Time format, weather units and location
-- Light/Dark modes
-- Wallpaper and Profile picture
-- Dock enable/disable and various tunes.
-
-## Troubleshooting
-
-**Common issues:**
-
-- **Missing icons:** Verify Material Symbols font installation with `fc-list | grep Material`
-- **No dynamic theming:** Install matugen and enable in settings
-- **Qt apps not themed:** Configure qt5ct/qt6ct and set QT_QPA_PLATFORMTHEME
-- **Calendar not syncing:** Check vdirsyncer credentials and network connectivity
-
-**Getting help:**
-
-- Check the [issues](https://github.com/AvengeMedia/DankMaterialShell/issues) for known problems
-- Re-run the shell with `dms kill && dms run` to capture logs.
-- Join the niri community for compositor-specific questions
-
 ## Contributing
 
-DankMaterialShell welcomes contributions! Whether it's bug fixes, new widgets, theme improvements, or documentation updates - all help is appreciated.
+Contributions welcome. Bug fixes, widgets, features, documentation, and plugins all help.
 
-**Areas that need attention:**
+1. Fork the repository
+2. Make your changes
+3. Test thoroughly
+4. Open a pull request
 
-- More widget options and customization
-- Additional compositor compatibility
-- Performance optimizations
-- Documentation and examples
+For documentation contributions, see [DankLinux-Docs](https://github.com/AvengeMedia/DankLinux-Docs).
 
 ## Credits
 
-- [quickshell](https://quickshell.org/) the core of what makes a shell like this possible.
-- [niri](https://github.com/YaLTeR/niri) for the awesome scrolling compositor.
-- [Ly-sec](http://github.com/ly-sec) for awesome wallpaper effects among other things from [Noctalia](https://github.com/noctalia-dev/noctalia-shell)
-- [soramanew](https://github.com/soramanew) who built [caelestia](https://github.com/caelestia-dots/shell) which served as inspiration and guidance for many dank widgets.
-- [end-4](https://github.com/end-4) for [dots-hyprland](https://github.com/end-4/dots-hyprland) which also served as inspiration and guidance for many dank widgets.
+- [quickshell](https://quickshell.org/) - Shell framework
+- [niri](https://github.com/YaLTeR/niri) - Scrolling window manager
+- [Ly-sec](http://github.com/ly-sec) - Wallpaper effects from [Noctalia](https://github.com/noctalia-dev/noctalia-shell)
+- [soramanew](https://github.com/soramanew) - [Caelestia](https://github.com/caelestia-dots/shell) inspiration
+- [end-4](https://github.com/end-4) - [dots-hyprland](https://github.com/end-4/dots-hyprland) inspiration
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=AvengeMedia/DankMaterialShell&type=date&legend=top-left)](https://www.star-history.com/#AvengeMedia/DankMaterialShell&type=date&legend=top-left)
+
+## License
+
+MIT License - See [LICENSE](LICENSE) for details.

Services/AppSearchService.qml

@@ -1,229 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import "../Common/fzf.js" as Fzf
-import qs.Common
-
-Singleton {
-    id: root
-
-    property var applications: DesktopEntries.applications.values.filter(app => !app.noDisplay && !app.runInTerminal)
-
-    function searchApplications(query) {
-        if (!query || query.length === 0)
-            return applications
-        if (applications.length === 0)
-            return []
-
-        const queryLower = query.toLowerCase().trim()
-        const scoredApps = []
-        const usageRanking = AppUsageHistoryData.appUsageRanking || {}
-
-        for (const app of applications) {
-            const name = (app.name || "").toLowerCase()
-            const genericName = (app.genericName || "").toLowerCase()
-            const comment = (app.comment || "").toLowerCase()
-            const keywords = app.keywords ? app.keywords.map(k => k.toLowerCase()) : []
-
-            let score = 0
-            let matched = false
-
-            const nameWords = name.trim().split(/\s+/).filter(w => w.length > 0)
-            const containsAsWord = nameWords.includes(queryLower)
-            const startsWithAsWord = nameWords.some(word => word.startsWith(queryLower))
-
-            if (name === queryLower) {
-                score = 10000
-                matched = true
-            } else if (containsAsWord) {
-                score = 9500 + (100 - Math.min(name.length, 100))
-                matched = true
-            } else if (name.startsWith(queryLower)) {
-                score = 9000 + (100 - Math.min(name.length, 100))
-                matched = true
-            } else if (startsWithAsWord) {
-                score = 8500 + (100 - Math.min(name.length, 100))
-                matched = true
-            } else if (name.includes(queryLower)) {
-                score = 8000 + (100 - Math.min(name.length, 100))
-                matched = true
-            } else if (keywords.length > 0) {
-                for (const keyword of keywords) {
-                    if (keyword === queryLower) {
-                        score = 6000
-                        matched = true
-                        break
-                    } else if (keyword.startsWith(queryLower)) {
-                        score = 5500
-                        matched = true
-                        break
-                    } else if (keyword.includes(queryLower)) {
-                        score = 5000
-                        matched = true
-                        break
-                    }
-                }
-            }
-            if (!matched && genericName.includes(queryLower)) {
-                if (genericName === queryLower) {
-                    score = 9000
-                } else if (genericName.startsWith(queryLower)) {
-                    score = 8500
-                } else {
-                    const genericWords = genericName.trim().split(/\s+/).filter(w => w.length > 0)
-                    if (genericWords.includes(queryLower)) {
-                        score = 8000
-                    } else if (genericWords.some(word => word.startsWith(queryLower))) {
-                        score = 7500
-                    } else {
-                        score = 7000
-                    }
-                }
-                matched = true
-            } else if (!matched && comment.includes(queryLower)) {
-                score = 3000
-                matched = true
-            } else if (!matched) {
-                const nameFinder = new Fzf.Finder([app], {
-                                                      "selector": a => a.name || "",
-                                                      "casing": "case-insensitive",
-                                                      "fuzzy": "v2"
-                                                  })
-                const fuzzyResults = nameFinder.find(query)
-                if (fuzzyResults.length > 0 && fuzzyResults[0].score > 0) {
-                    score = Math.min(fuzzyResults[0].score, 2000)
-                    matched = true
-                }
-            }
-
-            if (matched) {
-                const appId = app.id || (app.execString || app.exec || "")
-                const idVariants = [
-                    appId,
-                    appId.replace(".desktop", ""),
-                    app.id,
-                    app.id ? app.id.replace(".desktop", "") : null
-                ].filter(id => id)
-
-                let usageData = null
-                for (const variant of idVariants) {
-                    if (usageRanking[variant]) {
-                        usageData = usageRanking[variant]
-                        break
-                    }
-                }
-
-                if (usageData) {
-                    const usageCount = usageData.usageCount || 0
-                    const lastUsed = usageData.lastUsed || 0
-                    const now = Date.now()
-                    const daysSinceUsed = (now - lastUsed) / (1000 * 60 * 60 * 24)
-
-                    let usageBonus = 0
-                    usageBonus += Math.min(usageCount * 100, 2000)
-
-                    if (daysSinceUsed < 1) {
-                        usageBonus += 1500
-                    } else if (daysSinceUsed < 7) {
-                        usageBonus += 1000
-                    } else if (daysSinceUsed < 30) {
-                        usageBonus += 500
-                    }
-
-                    score += usageBonus
-                }
-
-                scoredApps.push({
-                                    "app": app,
-                                    "score": score
-                                })
-            }
-        }
-
-        scoredApps.sort((a, b) => b.score - a.score)
-        return scoredApps.slice(0, 50).map(item => item.app)
-    }
-
-    function getCategoriesForApp(app) {
-        if (!app?.categories)
-            return []
-
-        const categoryMap = {
-            "AudioVideo": I18n.tr("Media"),
-            "Audio": I18n.tr("Media"),
-            "Video": I18n.tr("Media"),
-            "Development": I18n.tr("Development"),
-            "TextEditor": I18n.tr("Development"),
-            "IDE": I18n.tr("Development"),
-            "Education": I18n.tr("Education"),
-            "Game": I18n.tr("Games"),
-            "Graphics": I18n.tr("Graphics"),
-            "Photography": I18n.tr("Graphics"),
-            "Network": I18n.tr("Internet"),
-            "WebBrowser": I18n.tr("Internet"),
-            "Email": I18n.tr("Internet"),
-            "Office": I18n.tr("Office"),
-            "WordProcessor": I18n.tr("Office"),
-            "Spreadsheet": I18n.tr("Office"),
-            "Presentation": I18n.tr("Office"),
-            "Science": I18n.tr("Science"),
-            "Settings": I18n.tr("Settings"),
-            "System": I18n.tr("System"),
-            "Utility": I18n.tr("Utilities"),
-            "Accessories": I18n.tr("Utilities"),
-            "FileManager": I18n.tr("Utilities"),
-            "TerminalEmulator": I18n.tr("Utilities")
-        }
-
-        const mappedCategories = new Set()
-
-        for (const cat of app.categories) {
-            if (categoryMap[cat])
-                mappedCategories.add(categoryMap[cat])
-        }
-
-        return Array.from(mappedCategories)
-    }
-
-    property var categoryIcons: ({
-                                     "All": "apps",
-                                     "Media": "music_video",
-                                     "Development": "code",
-                                     "Games": "sports_esports",
-                                     "Graphics": "photo_library",
-                                     "Internet": "web",
-                                     "Office": "content_paste",
-                                     "Settings": "settings",
-                                     "System": "host",
-                                     "Utilities": "build"
-                                 })
-
-    function getCategoryIcon(category) {
-        return categoryIcons[category] || "folder"
-    }
-
-    function getAllCategories() {
-        const categories = new Set([I18n.tr("All")])
-
-        for (const app of applications) {
-            const appCategories = getCategoriesForApp(app)
-            appCategories.forEach(cat => categories.add(cat))
-        }
-
-        return Array.from(categories).sort()
-    }
-
-    function getAppsInCategory(category) {
-        if (category === I18n.tr("All")) {
-            return applications
-        }
-
-        return applications.filter(app => {
-                                       const appCategories = getCategoriesForApp(app)
-                                       return appCategories.includes(category)
-                                   })
-    }
-}

Services/AudioService.qml

@@ -1,215 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Services.Pipewire
-
-Singleton {
-    id: root
-
-    readonly property PwNode sink: Pipewire.defaultAudioSink
-    readonly property PwNode source: Pipewire.defaultAudioSource
-
-    property bool suppressOSD: true
-
-    signal micMuteChanged
-
-    Timer {
-        id: startupTimer
-        interval: 500
-        repeat: false
-        running: true
-        onTriggered: root.suppressOSD = false
-    }
-
-    function displayName(node) {
-        if (!node) {
-            return ""
-        }
-
-        if (node.properties && node.properties["device.description"]) {
-            return node.properties["device.description"]
-        }
-
-        if (node.description && node.description !== node.name) {
-            return node.description
-        }
-
-        if (node.nickname && node.nickname !== node.name) {
-            return node.nickname
-        }
-
-        if (node.name.includes("analog-stereo")) {
-            return "Built-in Speakers"
-        }
-        if (node.name.includes("bluez")) {
-            return "Bluetooth Audio"
-        }
-        if (node.name.includes("usb")) {
-            return "USB Audio"
-        }
-        if (node.name.includes("hdmi")) {
-            return "HDMI Audio"
-        }
-
-        return node.name
-    }
-
-    function subtitle(name) {
-        if (!name) {
-            return ""
-        }
-
-        if (name.includes('usb-')) {
-            if (name.includes('SteelSeries')) {
-                return "USB Gaming Headset"
-            }
-            if (name.includes('Generic')) {
-                return "USB Audio Device"
-            }
-            return "USB Audio"
-        }
-
-        if (name.includes('pci-')) {
-            if (name.includes('01_00.1') || name.includes('01:00.1')) {
-                return "NVIDIA GPU Audio"
-            }
-            return "PCI Audio"
-        }
-
-        if (name.includes('bluez')) {
-            return "Bluetooth Audio"
-        }
-        if (name.includes('analog')) {
-            return "Built-in Audio"
-        }
-        if (name.includes('hdmi')) {
-            return "HDMI Audio"
-        }
-
-        return ""
-    }
-
-    PwObjectTracker {
-        objects: Pipewire.nodes.values.filter(node => node.audio && !node.isStream)
-    }
-
-    function setVolume(percentage) {
-        if (!root.sink?.audio) {
-            return "No audio sink available"
-        }
-
-        const clampedVolume = Math.max(0, Math.min(100, percentage))
-        root.sink.audio.volume = clampedVolume / 100
-        return `Volume set to ${clampedVolume}%`
-    }
-
-    function toggleMute() {
-        if (!root.sink?.audio) {
-            return "No audio sink available"
-        }
-
-        root.sink.audio.muted = !root.sink.audio.muted
-        return root.sink.audio.muted ? "Audio muted" : "Audio unmuted"
-    }
-
-    function setMicVolume(percentage) {
-        if (!root.source?.audio) {
-            return "No audio source available"
-        }
-
-        const clampedVolume = Math.max(0, Math.min(100, percentage))
-        root.source.audio.volume = clampedVolume / 100
-        return `Microphone volume set to ${clampedVolume}%`
-    }
-
-    function toggleMicMute() {
-        if (!root.source?.audio) {
-            return "No audio source available"
-        }
-
-        root.source.audio.muted = !root.source.audio.muted
-        return root.source.audio.muted ? "Microphone muted" : "Microphone unmuted"
-    }
-
-    IpcHandler {
-        target: "audio"
-
-        function setvolume(percentage: string): string {
-            return root.setVolume(parseInt(percentage))
-        }
-
-        function increment(step: string): string {
-            if (!root.sink?.audio) {
-                return "No audio sink available"
-            }
-
-            if (root.sink.audio.muted) {
-                root.sink.audio.muted = false
-            }
-
-            const currentVolume = Math.round(root.sink.audio.volume * 100)
-            const stepValue = parseInt(step || "5")
-            const newVolume = Math.max(0, Math.min(100, currentVolume + stepValue))
-
-            root.sink.audio.volume = newVolume / 100
-            return `Volume increased to ${newVolume}%`
-        }
-
-        function decrement(step: string): string {
-            if (!root.sink?.audio) {
-                return "No audio sink available"
-            }
-
-            if (root.sink.audio.muted) {
-                root.sink.audio.muted = false
-            }
-
-            const currentVolume = Math.round(root.sink.audio.volume * 100)
-            const stepValue = parseInt(step || "5")
-            const newVolume = Math.max(0, Math.min(100, currentVolume - stepValue))
-
-            root.sink.audio.volume = newVolume / 100
-            return `Volume decreased to ${newVolume}%`
-        }
-
-        function mute(): string {
-            return root.toggleMute()
-        }
-
-        function setmic(percentage: string): string {
-            return root.setMicVolume(parseInt(percentage))
-        }
-
-        function micmute(): string {
-            const result = root.toggleMicMute()
-            root.micMuteChanged()
-            return result
-        }
-
-        function status(): string {
-            let result = "Audio Status:\n"
-
-            if (root.sink?.audio) {
-                const volume = Math.round(root.sink.audio.volume * 100)
-                const muteStatus = root.sink.audio.muted ? " (muted)" : ""
-                result += `Output: ${volume}%${muteStatus}\n`
-            } else {
-                result += "Output: No sink available\n"
-            }
-
-            if (root.source?.audio) {
-                const micVolume = Math.round(root.source.audio.volume * 100)
-                const muteStatus = root.source.audio.muted ? " (muted)" : ""
-                result += `Input: ${micVolume}%${muteStatus}`
-            } else {
-                result += "Input: No source available"
-            }
-
-            return result
-        }
-    }
-}

Services/BatteryService.qml

@@ -1,157 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Services.UPower
-
-Singleton {
-    id: root
-
-    readonly property string preferredBatteryOverride: Quickshell.env("DMS_PREFERRED_BATTERY")
-
-    readonly property UPowerDevice device: {
-        var preferredDev
-        if (preferredBatteryOverride && preferredBatteryOverride.length > 0) {
-            preferredDev = UPower.devices.values.find(dev => dev.nativePath.toLowerCase().includes(preferredBatteryOverride.toLowerCase()))
-        }
-        return preferredDev || UPower.devices.values.find(dev => dev.isLaptopBattery) || null
-    }
-    readonly property bool batteryAvailable: device && device.ready
-    readonly property real batteryLevel: batteryAvailable ? Math.round(device.percentage * 100) : 0
-    readonly property bool isCharging: batteryAvailable && device.state === UPowerDeviceState.Charging && device.changeRate > 0
-    readonly property bool isPluggedIn: batteryAvailable && (device.state !== UPowerDeviceState.Discharging && device.state !== UPowerDeviceState.Empty)
-    readonly property bool isLowBattery: batteryAvailable && batteryLevel <= 20
-    readonly property string batteryHealth: {
-        if (!batteryAvailable) {
-            return "N/A"
-        }
-
-        if (device.healthSupported && device.healthPercentage > 0) {
-            return `${Math.round(device.healthPercentage)}%`
-        }
-
-        return "N/A"
-    }
-    readonly property real batteryCapacity: batteryAvailable && device.energyCapacity > 0 ? device.energyCapacity : 0
-    readonly property string batteryStatus: {
-        if (!batteryAvailable) {
-            return "No Battery"
-        }
-
-        if (device.state === UPowerDeviceState.Charging && device.changeRate <= 0) {
-            return "Plugged In"
-        }
-
-        return UPowerDeviceState.toString(device.state)
-    }
-    readonly property bool suggestPowerSaver: batteryAvailable && isLowBattery && UPower.onBattery && (typeof PowerProfiles !== "undefined" && PowerProfiles.profile !== PowerProfile.PowerSaver)
-
-    readonly property var bluetoothDevices: {
-        const btDevices = []
-        const bluetoothTypes = [UPowerDeviceType.BluetoothGeneric, UPowerDeviceType.Headphones, UPowerDeviceType.Headset, UPowerDeviceType.Keyboard, UPowerDeviceType.Mouse, UPowerDeviceType.Speakers]
-
-        for (var i = 0; i < UPower.devices.count; i++) {
-            const dev = UPower.devices.get(i)
-            if (dev && dev.ready && bluetoothTypes.includes(dev.type)) {
-                btDevices.push({
-                                   "name": dev.model || UPowerDeviceType.toString(dev.type),
-                                   "percentage": Math.round(dev.percentage),
-                                   "type": dev.type
-                               })
-            }
-        }
-        return btDevices
-    }
-
-    function formatTimeRemaining() {
-        if (!batteryAvailable) {
-            return "Unknown"
-        }
-
-        const timeSeconds = isCharging ? device.timeToFull : device.timeToEmpty
-
-        if (!timeSeconds || timeSeconds <= 0 || timeSeconds > 86400) {
-            return "Unknown"
-        }
-
-        const hours = Math.floor(timeSeconds / 3600)
-        const minutes = Math.floor((timeSeconds % 3600) / 60)
-
-        if (hours > 0) {
-            return `${hours}h ${minutes}m`
-        }
-
-        return `${minutes}m`
-    }
-
-    function getBatteryIcon() {
-        if (!batteryAvailable) {
-            return "power"
-        }
-
-        if (isCharging) {
-            if (batteryLevel >= 90) {
-                return "battery_charging_full"
-            }
-            if (batteryLevel >= 80) {
-                return "battery_charging_90"
-            }
-            if (batteryLevel >= 60) {
-                return "battery_charging_80"
-            }
-            if (batteryLevel >= 50) {
-                return "battery_charging_60"
-            }
-            if (batteryLevel >= 30) {
-                return "battery_charging_50"
-            }
-            if (batteryLevel >= 20) {
-                return "battery_charging_30"
-            }
-            return "battery_charging_20"
-        }
-        if (isPluggedIn) {
-            if (batteryLevel >= 90) {
-                return "battery_charging_full"
-            }
-            if (batteryLevel >= 80) {
-                return "battery_charging_90"
-            }
-            if (batteryLevel >= 60) {
-                return "battery_charging_80"
-            }
-            if (batteryLevel >= 50) {
-                return "battery_charging_60"
-            }
-            if (batteryLevel >= 30) {
-                return "battery_charging_50"
-            }
-            if (batteryLevel >= 20) {
-                return "battery_charging_30"
-            }
-            return "battery_charging_20"
-        }
-        if (batteryLevel >= 95) {
-            return "battery_full"
-        }
-        if (batteryLevel >= 85) {
-            return "battery_6_bar"
-        }
-        if (batteryLevel >= 70) {
-            return "battery_5_bar"
-        }
-        if (batteryLevel >= 55) {
-            return "battery_4_bar"
-        }
-        if (batteryLevel >= 40) {
-            return "battery_3_bar"
-        }
-        if (batteryLevel >= 25) {
-            return "battery_2_bar"
-        }
-        return "battery_1_bar"
-    }
-}

Services/CompositorService.qml

@@ -1,211 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Wayland
-import Quickshell.Hyprland
-
-Singleton {
-    id: root
-
-    property bool isHyprland: false
-    property bool isNiri: false
-    property string compositor: "unknown"
-
-    readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
-    readonly property string niriSocket: Quickshell.env("NIRI_SOCKET")
-
-    property bool useNiriSorting: isNiri && NiriService
-
-    property var sortedToplevels: {
-        if (!ToplevelManager.toplevels || !ToplevelManager.toplevels.values) {
-            return []
-        }
-
-        if (useNiriSorting) {
-            return NiriService.sortToplevels(ToplevelManager.toplevels.values)
-        }
-
-        if (isHyprland) {
-            const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-
-            const sortedHyprland = hyprlandToplevels.sort((a, b) => {
-                                                              if (a.monitor && b.monitor) {
-                                                                  const monitorCompare = a.monitor.name.localeCompare(b.monitor.name)
-                                                                  if (monitorCompare !== 0) {
-                                                                      return monitorCompare
-                                                                  }
-                                                              }
-
-                                                              if (a.workspace && b.workspace) {
-                                                                  const workspaceCompare = a.workspace.id - b.workspace.id
-                                                                  if (workspaceCompare !== 0) {
-                                                                      return workspaceCompare
-                                                                  }
-                                                              }
-
-                                                              if (a.lastIpcObject && b.lastIpcObject && a.lastIpcObject.at && b.lastIpcObject.at) {
-                                                                  const aX = a.lastIpcObject.at[0]
-                                                                  const bX = b.lastIpcObject.at[0]
-                                                                  const aY = a.lastIpcObject.at[1]
-                                                                  const bY = b.lastIpcObject.at[1]
-
-                                                                  const xCompare = aX - bX
-                                                                  if (Math.abs(xCompare) > 10) {
-                                                                      return xCompare
-                                                                  }
-                                                                  return aY - bY
-                                                              }
-
-                                                              if (a.lastIpcObject && !b.lastIpcObject) {
-                                                                  return -1
-                                                              }
-                                                              if (!a.lastIpcObject && b.lastIpcObject) {
-                                                                  return 1
-                                                              }
-
-                                                              if (a.title && b.title) {
-                                                                  return a.title.localeCompare(b.title)
-                                                              }
-
-                                                              return 0
-                                                          })
-
-            return sortedHyprland.map(hyprToplevel => hyprToplevel.wayland).filter(wayland => wayland !== null)
-        }
-
-        return ToplevelManager.toplevels.values
-    }
-
-    Timer {
-        id: compositorInitTimer
-        interval: 100
-        running: true
-        repeat: false
-        onTriggered: {
-            detectCompositor()
-            Qt.callLater(() => NiriService.generateNiriLayoutConfig())
-        }
-    }
-
-    function filterCurrentWorkspace(toplevels, screen) {
-        if (useNiriSorting) {
-            return NiriService.filterCurrentWorkspace(toplevels, screen)
-        }
-        if (isHyprland) {
-            return filterHyprlandCurrentWorkspace(toplevels, screen)
-        }
-        return toplevels
-    }
-
-    function filterHyprlandCurrentWorkspace(toplevels, screenName) {
-        if (!toplevels || toplevels.length === 0 || !Hyprland.toplevels) {
-            return toplevels
-        }
-
-        let currentWorkspaceId = null
-        const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-
-        for (const hyprToplevel of hyprlandToplevels) {
-            if (hyprToplevel.monitor && hyprToplevel.monitor.name === screenName && hyprToplevel.workspace) {
-                if (hyprToplevel.activated) {
-                    currentWorkspaceId = hyprToplevel.workspace.id
-                    break
-                }
-                if (currentWorkspaceId === null) {
-                    currentWorkspaceId = hyprToplevel.workspace.id
-                }
-            }
-        }
-
-        if (currentWorkspaceId === null && Hyprland.workspaces) {
-            const workspaces = Array.from(Hyprland.workspaces.values)
-            for (const workspace of workspaces) {
-                if (workspace.monitor && workspace.monitor === screenName) {
-                    if (Hyprland.focusedWorkspace && workspace.id === Hyprland.focusedWorkspace.id) {
-                        currentWorkspaceId = workspace.id
-                        break
-                    }
-                    if (currentWorkspaceId === null) {
-                        currentWorkspaceId = workspace.id
-                    }
-                }
-            }
-        }
-
-        if (currentWorkspaceId === null) {
-            return toplevels
-        }
-
-        return toplevels.filter(toplevel => {
-                                    for (const hyprToplevel of hyprlandToplevels) {
-                                        if (hyprToplevel.wayland === toplevel) {
-                                            return hyprToplevel.workspace && hyprToplevel.workspace.id === currentWorkspaceId
-                                        }
-                                    }
-                                    return false
-                                })
-    }
-
-    function detectCompositor() {
-        if (hyprlandSignature && hyprlandSignature.length > 0) {
-            isHyprland = true
-            isNiri = false
-            compositor = "hyprland"
-            console.log("CompositorService: Detected Hyprland")
-            return
-        }
-
-        if (niriSocket && niriSocket.length > 0) {
-            niriSocketCheck.running = true
-        } else {
-            isHyprland = false
-            isNiri = false
-            compositor = "unknown"
-            console.warn("CompositorService: No compositor detected")
-        }
-    }
-
-    function powerOffMonitors() {
-        if (isNiri) {
-            return NiriService.powerOffMonitors()
-        }
-        if (isHyprland) {
-            return Hyprland.dispatch("dpms off")
-        }
-        console.warn("CompositorService: Cannot power off monitors, unknown compositor")
-    }
-
-    function powerOnMonitors() {
-        if (isNiri) {
-            return NiriService.powerOnMonitors()
-        }
-        if (isHyprland) {
-            return Hyprland.dispatch("dpms on")
-        }
-        console.warn("CompositorService: Cannot power on monitors, unknown compositor")
-    }
-
-    Process {
-        id: niriSocketCheck
-        command: ["test", "-S", root.niriSocket]
-
-        onExited: exitCode => {
-            if (exitCode === 0) {
-                root.isNiri = true
-                root.isHyprland = false
-                root.compositor = "niri"
-                console.log("CompositorService: Detected Niri with socket:", root.niriSocket)
-                NiriService.generateNiriBinds()
-            } else {
-                root.isHyprland = false
-                root.isNiri = true
-                root.compositor = "niri"
-                console.warn("CompositorService: Niri socket check failed, defaulting to Niri anyway")
-            }
-        }
-    }
-}

Services/DMSService.qml

@@ -1,239 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtCore
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool dmsAvailable: false
-    property var capabilities: []
-    property var availablePlugins: []
-    property var installedPlugins: []
-    property bool isConnected: false
-    property bool isConnecting: false
-
-    readonly property string socketPath: Quickshell.env("DMS_SOCKET")
-
-    property var pendingRequests: ({})
-    property int requestIdCounter: 0
-
-    signal pluginsListReceived(var plugins)
-    signal installedPluginsReceived(var plugins)
-    signal searchResultsReceived(var plugins)
-    signal operationSuccess(string message)
-    signal operationError(string error)
-    signal connectionStateChanged()
-
-    Component.onCompleted: {
-        if (socketPath && socketPath.length > 0) {
-            testProcess.running = true
-        }
-    }
-
-    Process {
-        id: testProcess
-        command: ["test", "-S", root.socketPath]
-
-        onExited: exitCode => {
-            if (exitCode === 0) {
-                root.dmsAvailable = true
-                connectSocket()
-            } else {
-                root.dmsAvailable = false
-            }
-        }
-    }
-
-    function connectSocket() {
-        if (!dmsAvailable || isConnected || isConnecting) {
-            return
-        }
-
-        isConnecting = true
-        socket.connected = true
-    }
-
-    DankSocket {
-        id: socket
-        path: root.socketPath
-        connected: false
-
-        onConnectionStateChanged: {
-            if (connected) {
-                root.isConnected = true
-                root.isConnecting = false
-                root.connectionStateChanged()
-            } else {
-                root.isConnected = false
-                root.isConnecting = false
-                root.connectionStateChanged()
-            }
-        }
-
-        parser: SplitParser {
-            onRead: line => {
-                if (!line || line.length === 0) {
-                    return
-                }
-
-                try {
-                    const response = JSON.parse(line)
-
-                    if (response.capabilities) {
-                        root.capabilities = response.capabilities
-                        return
-                    }
-
-                    handleResponse(response)
-                } catch (e) {
-                    console.warn("DMSService: Failed to parse response:", line, e)
-                }
-            }
-        }
-    }
-
-    function sendRequest(method, params, callback) {
-        if (!isConnected) {
-            if (callback) {
-                callback({
-                             "error": "not connected to DMS socket"
-                         })
-            }
-            return
-        }
-
-        requestIdCounter++
-        const id = Date.now() + requestIdCounter
-        const request = {
-            "id": id,
-            "method": method
-        }
-
-        if (params) {
-            request.params = params
-        }
-
-        if (callback) {
-            pendingRequests[id] = callback
-        }
-
-        socket.send(request)
-    }
-
-    property var networkUpdateCallback: null
-
-    function handleResponse(response) {
-        if (response.id === undefined && response.result) {
-            if (response.result.type === "state_changed" && response.result.data) {
-                if (networkUpdateCallback) {
-                    networkUpdateCallback(response.result.data)
-                }
-            }
-            return
-        }
-
-        const callback = pendingRequests[response.id]
-
-        if (callback) {
-            delete pendingRequests[response.id]
-            callback(response)
-        }
-    }
-
-    function ping(callback) {
-        sendRequest("ping", null, callback)
-    }
-
-    function listPlugins(callback) {
-        sendRequest("plugins.list", null, response => {
-                        if (response.result) {
-                            availablePlugins = response.result
-                            pluginsListReceived(response.result)
-                        }
-                        if (callback) {
-                            callback(response)
-                        }
-                    })
-    }
-
-    function listInstalled(callback) {
-        sendRequest("plugins.listInstalled", null, response => {
-                        if (response.result) {
-                            installedPlugins = response.result
-                            installedPluginsReceived(response.result)
-                        }
-                        if (callback) {
-                            callback(response)
-                        }
-                    })
-    }
-
-    function search(query, category, compositor, capability, callback) {
-        const params = {
-            "query": query
-        }
-        if (category) {
-            params.category = category
-        }
-        if (compositor) {
-            params.compositor = compositor
-        }
-        if (capability) {
-            params.capability = capability
-        }
-
-        sendRequest("plugins.search", params, response => {
-                        if (response.result) {
-                            searchResultsReceived(response.result)
-                        }
-                        if (callback) {
-                            callback(response)
-                        }
-                    })
-    }
-
-    function install(pluginName, callback) {
-        sendRequest("plugins.install", {
-                        "name": pluginName
-                    }, response => {
-                        if (callback) {
-                            callback(response)
-                        }
-                        if (!response.error) {
-                            listInstalled()
-                        }
-                    })
-    }
-
-    function uninstall(pluginName, callback) {
-        sendRequest("plugins.uninstall", {
-                        "name": pluginName
-                    }, response => {
-                        if (callback) {
-                            callback(response)
-                        }
-                        if (!response.error) {
-                            listInstalled()
-                        }
-                    })
-    }
-
-    function update(pluginName, callback) {
-        sendRequest("plugins.update", {
-                        "name": pluginName
-                    }, response => {
-                        if (callback) {
-                            callback(response)
-                        }
-                        if (!response.error) {
-                            listInstalled()
-                        }
-                    })
-    }
-}

Services/DisplayService.qml

@@ -1,978 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool brightnessAvailable: devices.length > 0
-    property var devices: []
-    property var ddcDevices: []
-    property var deviceBrightness: ({})
-    property var ddcPendingInit: ({})
-    property string currentDevice: ""
-    property string lastIpcDevice: ""
-    property bool ddcAvailable: false
-    property var ddcInitQueue: []
-    property bool skipDdcRead: false
-    property int brightnessLevel: {
-        const deviceToUse = lastIpcDevice === "" ? getDefaultDevice() : (lastIpcDevice || currentDevice)
-        if (!deviceToUse) {
-            return 50
-        }
-
-        return getDeviceBrightness(deviceToUse)
-    }
-    property int maxBrightness: 100
-    property bool brightnessInitialized: false
-
-    signal brightnessChanged
-    signal deviceSwitched
-
-    property bool nightModeActive: nightModeEnabled
-
-    property bool nightModeEnabled: false
-    property bool automationAvailable: false
-    property bool geoclueAvailable: false
-    property bool isAutomaticNightTime: false
-
-    function buildGammastepCommand(gammastepArgs) {
-        const commandStr = "pkill gammastep; " + ["gammastep"].concat(gammastepArgs).join(" ")
-        return ["sh", "-c", commandStr]
-    }
-
-    function setBrightnessInternal(percentage, device) {
-        const clampedValue = Math.max(1, Math.min(100, percentage))
-        const actualDevice = device === "" ? getDefaultDevice() : (device || currentDevice || getDefaultDevice())
-
-        if (actualDevice) {
-            const newBrightness = Object.assign({}, deviceBrightness)
-            newBrightness[actualDevice] = clampedValue
-            deviceBrightness = newBrightness
-        }
-
-        const deviceInfo = getCurrentDeviceInfoByName(actualDevice)
-
-        if (deviceInfo && deviceInfo.class === "ddc") {
-            ddcBrightnessSetProcess.command = ["ddcutil", "setvcp", "-d", String(deviceInfo.ddcDisplay), "10", String(clampedValue)]
-            ddcBrightnessSetProcess.running = true
-        } else {
-            if (device) {
-                brightnessSetProcess.command = ["brightnessctl", "-d", device, "set", `${clampedValue}%`]
-            } else {
-                brightnessSetProcess.command = ["brightnessctl", "set", `${clampedValue}%`]
-            }
-            brightnessSetProcess.running = true
-        }
-    }
-
-    function setBrightness(percentage, device) {
-        setBrightnessInternal(percentage, device)
-        brightnessChanged()
-    }
-
-    function setCurrentDevice(deviceName, saveToSession = false) {
-        if (currentDevice === deviceName) {
-            return
-        }
-
-        currentDevice = deviceName
-        lastIpcDevice = deviceName
-
-        if (saveToSession) {
-            SessionData.setLastBrightnessDevice(deviceName)
-        }
-
-        deviceSwitched()
-
-        const deviceInfo = getCurrentDeviceInfoByName(deviceName)
-        if (deviceInfo && deviceInfo.class === "ddc") {
-            return
-        } else {
-            brightnessGetProcess.command = ["brightnessctl", "-m", "-d", deviceName, "get"]
-            brightnessGetProcess.running = true
-        }
-    }
-
-    function refreshDevices() {
-        deviceListProcess.running = true
-    }
-
-    function refreshDevicesInternal() {
-        const allDevices = [...devices, ...ddcDevices]
-
-        allDevices.sort((a, b) => {
-                            if (a.class === "backlight" && b.class !== "backlight") {
-                                return -1
-                            }
-                            if (a.class !== "backlight" && b.class === "backlight") {
-                                return 1
-                            }
-
-                            if (a.class === "ddc" && b.class !== "ddc" && b.class !== "backlight") {
-                                return -1
-                            }
-                            if (a.class !== "ddc" && b.class === "ddc" && a.class !== "backlight") {
-                                return 1
-                            }
-
-                            return a.name.localeCompare(b.name)
-                        })
-
-        devices = allDevices
-
-        if (devices.length > 0 && !currentDevice) {
-            const lastDevice = SessionData.lastBrightnessDevice || ""
-            const deviceExists = devices.some(d => d.name === lastDevice)
-            if (deviceExists) {
-                setCurrentDevice(lastDevice, false)
-            } else {
-                const nonKbdDevice = devices.find(d => !d.name.includes("kbd")) || devices[0]
-                setCurrentDevice(nonKbdDevice.name, false)
-            }
-        }
-    }
-
-    function getDeviceBrightness(deviceName) {
-        if (!deviceName) {
-            return
-        } 50
-
-        const deviceInfo = getCurrentDeviceInfoByName(deviceName)
-        if (!deviceInfo) {
-            return 50
-        }
-
-        if (deviceInfo.class === "ddc") {
-            return deviceBrightness[deviceName] || 50
-        }
-
-        return deviceBrightness[deviceName] || deviceInfo.percentage || 50
-    }
-
-    function getDefaultDevice() {
-        for (const device of devices) {
-            if (device.class === "backlight") {
-                return device.name
-            }
-        }
-        return devices.length > 0 ? devices[0].name : ""
-    }
-
-    function getCurrentDeviceInfo() {
-        const deviceToUse = lastIpcDevice === "" ? getDefaultDevice() : (lastIpcDevice || currentDevice)
-        if (!deviceToUse) {
-            return null
-        }
-
-        for (const device of devices) {
-            if (device.name === deviceToUse) {
-                return device
-            }
-        }
-        return null
-    }
-
-    function isCurrentDeviceReady() {
-        const deviceToUse = lastIpcDevice === "" ? getDefaultDevice() : (lastIpcDevice || currentDevice)
-        if (!deviceToUse) {
-            return false
-        }
-
-        if (ddcPendingInit[deviceToUse]) {
-            return false
-        }
-
-        return true
-    }
-
-    function getCurrentDeviceInfoByName(deviceName) {
-        if (!deviceName) {
-            return null
-        }
-
-        for (const device of devices) {
-            if (device.name === deviceName) {
-                return device
-            }
-        }
-        return null
-    }
-
-    function processNextDdcInit() {
-        if (ddcInitQueue.length === 0 || ddcInitialBrightnessProcess.running) {
-            return
-        }
-
-        const displayId = ddcInitQueue.shift()
-        ddcInitialBrightnessProcess.command = ["ddcutil", "getvcp", "-d", String(displayId), "10", "--brief"]
-        ddcInitialBrightnessProcess.running = true
-    }
-
-    // Night Mode Functions - Simplified
-    function enableNightMode() {
-        if (!automationAvailable) {
-            gammaStepTestProcess.running = true
-            return
-        }
-
-        nightModeEnabled = true
-        SessionData.setNightModeEnabled(true)
-
-        // Apply immediately or start automation
-        if (SessionData.nightModeAutoEnabled) {
-            startAutomation()
-        } else {
-            applyNightModeDirectly()
-        }
-    }
-
-    function disableNightMode() {
-        nightModeEnabled = false
-        SessionData.setNightModeEnabled(false)
-        stopAutomation()
-        // Nuclear approach - kill ALL gammastep processes multiple times
-        Quickshell.execDetached(["pkill", "-f", "gammastep"])
-        Quickshell.execDetached(["pkill", "-9", "gammastep"])
-        Quickshell.execDetached(["killall", "gammastep"])
-        // Also stop all related processes
-        gammaStepProcess.running = false
-        automationProcess.running = false
-        gammaStepTestProcess.running = false
-    }
-
-    function toggleNightMode() {
-        if (nightModeEnabled) {
-            disableNightMode()
-        } else {
-            enableNightMode()
-        }
-    }
-
-    function applyNightModeDirectly() {
-        const temperature = SessionData.nightModeTemperature || 4500
-        gammaStepProcess.command = buildGammastepCommand(["-m", "wayland", "-O", String(temperature)])
-        gammaStepProcess.running = true
-    }
-
-    function resetToNormalMode() {
-        // Just kill gammastep to return to normal display temperature
-        Quickshell.execDetached(["pkill", "gammastep"])
-    }
-
-    function startAutomation() {
-        if (!automationAvailable) {
-            return
-        }
-
-        const mode = SessionData.nightModeAutoMode || "time"
-
-        switch (mode) {
-        case "time":
-            startTimeBasedMode()
-            break
-        case "location":
-            startLocationBasedMode()
-            break
-        }
-    }
-
-    function stopAutomation() {
-        automationProcess.running = false
-        gammaStepProcess.running = false
-        isAutomaticNightTime = false
-        // Nuclear approach - kill ALL gammastep processes multiple times
-        Quickshell.execDetached(["pkill", "-f", "gammastep"])
-        Quickshell.execDetached(["pkill", "-9", "gammastep"])
-        Quickshell.execDetached(["killall", "gammastep"])
-    }
-
-    function startTimeBasedMode() {
-        checkTimeBasedMode()
-    }
-
-    function startLocationBasedMode() {
-        const temperature = SessionData.nightModeTemperature || 4500
-        const dayTemp = 6500
-
-        if (SessionData.latitude !== 0.0 && SessionData.longitude !== 0.0) {
-            automationProcess.command = buildGammastepCommand(["-m", "wayland", "-l", `${SessionData.latitude.toFixed(6)}:${SessionData.longitude.toFixed(6)}`, "-t", `${dayTemp}:${temperature}`, "-v"])
-            automationProcess.running = true
-            return
-        }
-
-        if (SessionData.nightModeLocationProvider === "geoclue2") {
-            automationProcess.command = buildGammastepCommand(["-m", "wayland", "-l", "geoclue2", "-t", `${dayTemp}:${temperature}`, "-v"])
-            automationProcess.running = true
-            return
-        }
-
-        console.warn("DisplayService: Location mode selected but no coordinates or geoclue provider set")
-    }
-
-    function checkTimeBasedMode() {
-        if (!nightModeEnabled || !SessionData.nightModeAutoEnabled || SessionData.nightModeAutoMode !== "time") {
-            return
-        }
-
-        const currentTime = systemClock.hours * 60 + systemClock.minutes
-
-        const startMinutes = SessionData.nightModeStartHour * 60 + SessionData.nightModeStartMinute
-        const endMinutes = SessionData.nightModeEndHour * 60 + SessionData.nightModeEndMinute
-
-        let shouldBeNight = false
-
-        if (startMinutes > endMinutes) {
-            shouldBeNight = (currentTime >= startMinutes) || (currentTime < endMinutes)
-        } else {
-            shouldBeNight = (currentTime >= startMinutes) && (currentTime < endMinutes)
-        }
-
-        if (shouldBeNight !== isAutomaticNightTime) {
-            isAutomaticNightTime = shouldBeNight
-
-            if (shouldBeNight) {
-                applyNightModeDirectly()
-            } else {
-                resetToNormalMode()
-            }
-        }
-    }
-
-    function detectLocationProviders() {
-        geoclueDetectionProcess.running = true
-    }
-
-    function setNightModeAutomationMode(mode) {
-        SessionData.setNightModeAutoMode(mode)
-    }
-
-    function evaluateNightMode() {
-        // Always stop all processes first to clean slate
-        stopAutomation()
-
-        if (!nightModeEnabled) {
-            return
-        }
-
-        if (SessionData.nightModeAutoEnabled) {
-            restartTimer.nextAction = "automation"
-            restartTimer.start()
-        } else {
-            restartTimer.nextAction = "direct"
-            restartTimer.start()
-        }
-    }
-
-    function checkNightModeAvailability() {
-        gammastepAvailabilityProcess.running = true
-    }
-
-    Timer {
-        id: restartTimer
-        property string nextAction: ""
-        interval: 100
-        repeat: false
-
-        onTriggered: {
-            if (nextAction === "automation") {
-                startAutomation()
-            } else if (nextAction === "direct") {
-                applyNightModeDirectly()
-            }
-            nextAction = ""
-        }
-    }
-
-    Component.onCompleted: {
-        ddcDetectionProcess.running = true
-        refreshDevices()
-        checkNightModeAvailability()
-
-        // Initialize night mode state from session
-        nightModeEnabled = SessionData.nightModeEnabled
-    }
-
-    Component.onDestruction: {
-        gammaStepProcess.running = false
-        automationProcess.running = false
-    }
-
-    SystemClock {
-        id: systemClock
-        precision: SystemClock.Minutes
-        onDateChanged: {
-            if (nightModeEnabled && SessionData.nightModeAutoEnabled && SessionData.nightModeAutoMode === "time") {
-                checkTimeBasedMode()
-            }
-        }
-    }
-
-    Process {
-        id: ddcDetectionProcess
-
-        command: ["which", "ddcutil"]
-        running: false
-
-        onExited: function (exitCode) {
-            ddcAvailable = (exitCode === 0)
-            if (ddcAvailable) {
-                ddcDisplayDetectionProcess.running = true
-            } else {
-                console.log("DisplayService: ddcutil not available")
-            }
-        }
-    }
-
-    Process {
-        id: ddcDisplayDetectionProcess
-
-        command: ["bash", "-c", "ddcutil detect --brief 2>/dev/null | grep '^Display [0-9]' | awk '{print \"{\\\"display\\\":\" $2 \",\\\"name\\\":\\\"ddc-\" $2 \"\\\",\\\"class\\\":\\\"ddc\\\"}\"}' | tr '\\n' ',' | sed 's/,$//' | sed 's/^/[/' | sed 's/$/]/' || echo '[]'"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim()) {
-                    ddcDevices = []
-                    return
-                }
-
-                try {
-                    const parsedDevices = JSON.parse(text.trim())
-                    const newDdcDevices = []
-
-                    for (const device of parsedDevices) {
-                        if (device.display && device.class === "ddc") {
-                            newDdcDevices.push({
-                                                   "name": device.name,
-                                                   "class": "ddc",
-                                                   "current": 50,
-                                                   "percentage": 50,
-                                                   "max": 100,
-                                                   "ddcDisplay": device.display
-                                               })
-                        }
-                    }
-
-                    ddcDevices = newDdcDevices
-                    console.log("DisplayService: Found", ddcDevices.length, "DDC displays")
-
-                    // Queue initial brightness readings for DDC devices
-                    ddcInitQueue = []
-                    for (const device of ddcDevices) {
-                        ddcInitQueue.push(device.ddcDisplay)
-                        // Mark DDC device as pending initialization
-                        ddcPendingInit[device.name] = true
-                    }
-
-                    // Start processing the queue
-                    processNextDdcInit()
-
-                    // Refresh device list to include DDC devices
-                    refreshDevicesInternal()
-
-                    // Retry setting last device now that DDC devices are available
-                    const lastDevice = SessionData.lastBrightnessDevice || ""
-                    if (lastDevice) {
-                        const deviceExists = devices.some(d => d.name === lastDevice)
-                        if (deviceExists && (!currentDevice || currentDevice !== lastDevice)) {
-                            setCurrentDevice(lastDevice, false)
-                        }
-                    }
-                } catch (error) {
-                    console.warn("DisplayService: Failed to parse DDC devices:", error)
-                    ddcDevices = []
-                }
-            }
-        }
-
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to detect DDC displays:", exitCode)
-                ddcDevices = []
-            }
-        }
-    }
-
-    Process {
-        id: deviceListProcess
-
-        command: ["brightnessctl", "-m", "-l"]
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to list devices:", exitCode)
-                brightnessAvailable = false
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim()) {
-                    console.warn("DisplayService: No devices found")
-                    return
-                }
-                const lines = text.trim().split("\n")
-                const newDevices = []
-                for (const line of lines) {
-                    const parts = line.split(",")
-                    if (parts.length >= 5) {
-                        newDevices.push({
-                                            "name": parts[0],
-                                            "class": parts[1],
-                                            "current": parseInt(parts[2]),
-                                            "percentage": parseInt(parts[3]),
-                                            "max": parseInt(parts[4])
-                                        })
-                    }
-                }
-                // Store brightnessctl devices separately
-                devices = newDevices
-
-                // Always refresh to combine with DDC devices and set up device selection
-                refreshDevicesInternal()
-            }
-        }
-    }
-
-    Process {
-        id: brightnessSetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to set brightness:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: ddcBrightnessSetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to set DDC brightness:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: ddcInitialBrightnessProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to get initial DDC brightness:", exitCode)
-            }
-
-            processNextDdcInit()
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim())
-                return
-
-                const parts = text.trim().split(" ")
-                if (parts.length >= 5) {
-                    const current = parseInt(parts[3]) || 50
-                    const max = parseInt(parts[4]) || 100
-                    const brightness = Math.round((current / max) * 100)
-
-                    const commandParts = ddcInitialBrightnessProcess.command
-                    if (commandParts && commandParts.length >= 4) {
-                        const displayId = commandParts[3]
-                        const deviceName = "ddc-" + displayId
-
-                        var newBrightness = Object.assign({}, deviceBrightness)
-                        newBrightness[deviceName] = brightness
-                        deviceBrightness = newBrightness
-
-                        var newPending = Object.assign({}, ddcPendingInit)
-                        delete newPending[deviceName]
-                        ddcPendingInit = newPending
-
-                        console.log("DisplayService: Initial DDC Device", deviceName, "brightness:", brightness + "%")
-                    }
-                }
-            }
-        }
-    }
-
-    Process {
-        id: brightnessGetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to get brightness:", exitCode)
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim())
-                return
-
-                const parts = text.trim().split(",")
-                if (parts.length >= 5) {
-                    const current = parseInt(parts[2])
-                    const max = parseInt(parts[4])
-                    maxBrightness = max
-                    const brightness = Math.round((current / max) * 100)
-
-                    // Update the device brightness cache
-                    if (currentDevice) {
-                        var newBrightness = Object.assign({}, deviceBrightness)
-                        newBrightness[currentDevice] = brightness
-                        deviceBrightness = newBrightness
-                    }
-
-                    brightnessInitialized = true
-                    console.log("DisplayService: Device", currentDevice, "brightness:", brightness + "%")
-                    brightnessChanged()
-                }
-            }
-        }
-    }
-
-    Process {
-        id: ddcBrightnessGetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to get DDC brightness:", exitCode)
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim())
-                return
-
-                // Parse ddcutil getvcp output format: "VCP 10 C 50 100"
-                const parts = text.trim().split(" ")
-                if (parts.length >= 5) {
-                    const current = parseInt(parts[3]) || 50
-                    const max = parseInt(parts[4]) || 100
-                    maxBrightness = max
-                    const brightness = Math.round((current / max) * 100)
-
-                    // Update the device brightness cache
-                    if (currentDevice) {
-                        var newBrightness = Object.assign({}, deviceBrightness)
-                        newBrightness[currentDevice] = brightness
-                        deviceBrightness = newBrightness
-                    }
-
-                    brightnessInitialized = true
-                    console.log("DisplayService: DDC Device", currentDevice, "brightness:", brightness + "%")
-                    brightnessChanged()
-                }
-            }
-        }
-    }
-
-    Process {
-        id: gammastepAvailabilityProcess
-        command: ["which", "gammastep"]
-        running: false
-
-        onExited: function (exitCode) {
-            automationAvailable = (exitCode === 0)
-            if (automationAvailable) {
-                detectLocationProviders()
-
-                // If night mode should be enabled on startup
-                if (nightModeEnabled && SessionData.nightModeAutoEnabled) {
-                    startAutomation()
-                } else if (nightModeEnabled) {
-                    applyNightModeDirectly()
-                }
-            } else {
-                console.log("DisplayService: gammastep not available")
-            }
-        }
-    }
-
-    Process {
-        id: geoclueDetectionProcess
-        command: ["sh", "-c", "busctl --system list | grep -qF org.freedesktop.GeoClue2"]
-        running: false
-
-        onExited: function (exitCode) {
-            geoclueAvailable = (exitCode === 0)
-        }
-    }
-
-    Process {
-        id: gammaStepTestProcess
-        command: ["which", "gammastep"]
-        running: false
-
-        onExited: function (exitCode) {
-            if (exitCode === 0) {
-                automationAvailable = true
-                nightModeEnabled = true
-                SessionData.setNightModeEnabled(true)
-
-                if (SessionData.nightModeAutoEnabled) {
-                    startAutomation()
-                } else {
-                    applyNightModeDirectly()
-                }
-            } else {
-                console.warn("DisplayService: gammastep not found")
-                ToastService.showWarning("Night mode failed: gammastep not found")
-            }
-        }
-    }
-
-    Process {
-        id: gammaStepProcess
-        running: false
-
-        onExited: function (exitCode) {
-            if (nightModeEnabled && exitCode !== 0 && exitCode !== 15) {
-                console.warn("DisplayService: Night mode process failed:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: automationProcess
-        running: false
-        property string processType: "automation"
-
-        onExited: function (exitCode) {
-            if (nightModeEnabled && SessionData.nightModeAutoEnabled && exitCode !== 0 && exitCode !== 15) {
-                console.warn("DisplayService: Night mode automation failed:", exitCode)
-                // Location mode failed
-                console.warn("DisplayService: Location-based night mode failed")
-            }
-        }
-    }
-
-    // Session Data Connections
-    Connections {
-        target: SessionData
-
-        function onNightModeEnabledChanged() {
-            nightModeEnabled = SessionData.nightModeEnabled
-            evaluateNightMode()
-        }
-
-        function onNightModeAutoEnabledChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeAutoModeChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeStartHourChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeStartMinuteChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeEndHourChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeEndMinuteChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeTemperatureChanged() {
-            evaluateNightMode()
-        }
-        function onLatitudeChanged() {
-            evaluateNightMode()
-        }
-        function onLongitudeChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeLocationProviderChanged() {
-            evaluateNightMode()
-        }
-    }
-
-    // IPC Handler for external control
-    IpcHandler {
-        function set(percentage: string, device: string): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            const value = parseInt(percentage)
-            if (isNaN(value)) {
-                return "Invalid brightness value: " + percentage
-            }
-
-            const clampedValue = Math.max(1, Math.min(100, value))
-            const targetDevice = device || ""
-
-            // Ensure device exists if specified
-            if (targetDevice && !root.devices.some(d => d.name === targetDevice)) {
-                return "Device not found: " + targetDevice
-            }
-
-            root.lastIpcDevice = targetDevice
-            if (targetDevice && targetDevice !== root.currentDevice) {
-                root.setCurrentDevice(targetDevice, false)
-            }
-            root.setBrightness(clampedValue, targetDevice)
-
-            if (targetDevice) {
-                return "Brightness set to " + clampedValue + "% on " + targetDevice
-            } else {
-                return "Brightness set to " + clampedValue + "%"
-            }
-        }
-
-        function increment(step: string, device: string): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            const targetDevice = device || ""
-            const actualDevice = targetDevice === "" ? root.getDefaultDevice() : targetDevice
-
-            // Ensure device exists
-            if (actualDevice && !root.devices.some(d => d.name === actualDevice)) {
-                return "Device not found: " + actualDevice
-            }
-
-            const currentLevel = actualDevice ? root.getDeviceBrightness(actualDevice) : root.brightnessLevel
-            const stepValue = parseInt(step || "10")
-            const newLevel = Math.max(1, Math.min(100, currentLevel + stepValue))
-
-            root.lastIpcDevice = targetDevice
-            if (targetDevice && targetDevice !== root.currentDevice) {
-                root.setCurrentDevice(targetDevice, false)
-            }
-            root.setBrightness(newLevel, targetDevice)
-
-            if (targetDevice) {
-                return "Brightness increased to " + newLevel + "% on " + targetDevice
-            } else {
-                return "Brightness increased to " + newLevel + "%"
-            }
-        }
-
-        function decrement(step: string, device: string): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            const targetDevice = device || ""
-            const actualDevice = targetDevice === "" ? root.getDefaultDevice() : targetDevice
-
-            // Ensure device exists
-            if (actualDevice && !root.devices.some(d => d.name === actualDevice)) {
-                return "Device not found: " + actualDevice
-            }
-
-            const currentLevel = actualDevice ? root.getDeviceBrightness(actualDevice) : root.brightnessLevel
-            const stepValue = parseInt(step || "10")
-            const newLevel = Math.max(1, Math.min(100, currentLevel - stepValue))
-
-            root.lastIpcDevice = targetDevice
-            if (targetDevice && targetDevice !== root.currentDevice) {
-                root.setCurrentDevice(targetDevice, false)
-            }
-            root.setBrightness(newLevel, targetDevice)
-
-            if (targetDevice) {
-                return "Brightness decreased to " + newLevel + "% on " + targetDevice
-            } else {
-                return "Brightness decreased to " + newLevel + "%"
-            }
-        }
-
-        function status(): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            return "Device: " + root.currentDevice + " - Brightness: " + root.brightnessLevel + "%"
-        }
-
-        function list(): string {
-            if (!root.brightnessAvailable) {
-                return "No brightness devices available"
-            }
-
-            let result = "Available devices:\\n"
-            for (const device of root.devices) {
-                result += device.name + " (" + device.class + ")\\n"
-            }
-            return result
-        }
-
-        target: "brightness"
-    }
-
-    // IPC Handler for night mode control
-    IpcHandler {
-        function toggle(): string {
-            root.toggleNightMode()
-            return root.nightModeEnabled ? "Night mode enabled" : "Night mode disabled"
-        }
-
-        function enable(): string {
-            root.enableNightMode()
-            return "Night mode enabled"
-        }
-
-        function disable(): string {
-            root.disableNightMode()
-            return "Night mode disabled"
-        }
-
-        function status(): string {
-            return root.nightModeEnabled ? "Night mode is enabled" : "Night mode is disabled"
-        }
-
-        function temperature(value: string): string {
-            if (!value) {
-                return "Current temperature: " + SessionData.nightModeTemperature + "K"
-            }
-
-            const temp = parseInt(value)
-            if (isNaN(temp)) {
-                return "Invalid temperature. Use a value between 2500 and 6000 (in steps of 500)"
-            }
-
-            // Validate temperature is in valid range and steps
-            if (temp < 2500 || temp > 6000) {
-                return "Temperature must be between 2500K and 6000K"
-            }
-
-            // Round to nearest 500
-            const rounded = Math.round(temp / 500) * 500
-
-            SessionData.setNightModeTemperature(rounded)
-
-            // Restart night mode with new temperature if active
-            if (root.nightModeEnabled) {
-                if (SessionData.nightModeAutoEnabled) {
-                    root.startAutomation()
-                } else {
-                    root.applyNightModeDirectly()
-                }
-            }
-
-            if (rounded !== temp) {
-                return "Night mode temperature set to " + rounded + "K (rounded from " + temp + "K)"
-            } else {
-                return "Night mode temperature set to " + rounded + "K"
-            }
-        }
-
-        target: "night"
-    }
-}

Services/MprisController.qml

@@ -1,60 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Services.Mpris
-
-Singleton {
-    id: root
-
-    readonly property list<MprisPlayer> availablePlayers: Mpris.players.values
-
-    property MprisPlayer activePlayer: availablePlayers.find(p => p.isPlaying) ?? availablePlayers.find(p => p.canControl && p.canPlay) ?? null
-
-    IpcHandler {
-        target: "mpris"
-
-        function list(): string {
-            return root.availablePlayers.map(p => p.identity).join("\n")
-        }
-
-        function play(): void {
-            if (root.activePlayer && root.activePlayer.canPlay) {
-                root.activePlayer.play()
-            }
-        }
-
-        function pause(): void {
-            if (root.activePlayer && root.activePlayer.canPause) {
-                root.activePlayer.pause()
-            }
-        }
-
-        function playPause(): void {
-            if (root.activePlayer && root.activePlayer.canTogglePlaying) {
-                root.activePlayer.togglePlaying()
-            }
-        }
-
-        function previous(): void {
-            if (root.activePlayer && root.activePlayer.canGoPrevious) {
-                root.activePlayer.previous()
-            }
-        }
-
-        function next(): void {
-            if (root.activePlayer && root.activePlayer.canGoNext) {
-                root.activePlayer.next()
-            }
-        }
-
-        function stop(): void {
-            if (root.activePlayer) {
-                root.activePlayer.stop()
-            }
-        }
-    }
-}

Services/NetworkManagerService.qml

@@ -1,543 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool networkAvailable: false
-
-    property string networkStatus: "disconnected"
-    property string primaryConnection: ""
-
-    property string ethernetIP: ""
-    property string ethernetInterface: ""
-    property bool ethernetConnected: false
-    property string ethernetConnectionUuid: ""
-
-    property string wifiIP: ""
-    property string wifiInterface: ""
-    property bool wifiConnected: false
-    property bool wifiEnabled: true
-    property string wifiConnectionUuid: ""
-    property string wifiDevicePath: ""
-    property string activeAccessPointPath: ""
-
-    property string currentWifiSSID: ""
-    property int wifiSignalStrength: 0
-    property var wifiNetworks: []
-    property var savedConnections: []
-    property var ssidToConnectionName: ({})
-    property var wifiSignalIcon: {
-        if (!wifiConnected || networkStatus !== "wifi") {
-            return "wifi_off"
-        }
-        if (wifiSignalStrength >= 50) {
-            return "wifi"
-        }
-        if (wifiSignalStrength >= 25) {
-            return "wifi_2_bar"
-        }
-        return "wifi_1_bar"
-    }
-
-    property string userPreference: "auto"
-    property bool isConnecting: false
-    property string connectingSSID: ""
-    property string connectionError: ""
-
-    property bool isScanning: false
-    property bool autoScan: false
-
-    property bool wifiAvailable: true
-    property bool wifiToggling: false
-    property bool changingPreference: false
-    property string targetPreference: ""
-    property var savedWifiNetworks: []
-    property string connectionStatus: ""
-    property string lastConnectionError: ""
-    property bool passwordDialogShouldReopen: false
-    property bool autoRefreshEnabled: false
-    property string wifiPassword: ""
-    property string forgetSSID: ""
-
-    property string networkInfoSSID: ""
-    property string networkInfoDetails: ""
-    property bool networkInfoLoading: false
-
-    property int refCount: 0
-    property bool stateInitialized: false
-
-    signal networksUpdated
-    signal connectionChanged
-
-    property bool subscriptionConnected: false
-
-    readonly property string socketPath: Quickshell.env("DMS_SOCKET")
-
-    Component.onCompleted: {
-        root.userPreference = SettingsData.networkPreference
-        if (socketPath && socketPath.length > 0) {
-            checkDMSCapabilities()
-        }
-    }
-
-    DankSocket {
-        id: subscriptionSocket
-        path: root.socketPath
-        connected: networkAvailable
-
-        onConnectionStateChanged: {
-            root.subscriptionConnected = connected
-            if (connected) {
-                console.log("NetworkManagerService: Subscription socket connected")
-            }
-        }
-
-        parser: SplitParser {
-            onRead: line => {
-                if (!line || line.length === 0) {
-                    return
-                }
-
-                try {
-                    const response = JSON.parse(line)
-
-                    if (response.capabilities) {
-                        console.log("NetworkManagerService: Subscription socket received capabilities")
-                        Qt.callLater(() => sendSubscribeRequest())
-                        return
-                    }
-
-                    if (response.result && response.result.type === "state_changed" && response.result.data) {
-                        const networksCount = response.result.data.wifiNetworks?.length ?? "null"
-                        console.log("NetworkManagerService: Subscription update received, networks:", networksCount)
-                        updateState(response.result.data)
-                    }
-                } catch (e) {
-                    console.warn("NetworkManagerService: Failed to parse subscription response:", line, e)
-                }
-            }
-        }
-    }
-
-    function sendSubscribeRequest() {
-        subscriptionSocket.send({
-            "id": 1,
-            "method": "network.subscribe"
-        })
-        console.log("NetworkManagerService: Sent network.subscribe request")
-    }
-
-    Connections {
-        target: DMSService
-
-        function onConnectionStateChanged() {
-            if (DMSService.isConnected) {
-                checkDMSCapabilities()
-            }
-        }
-    }
-
-    Connections {
-        target: DMSService
-        enabled: DMSService.isConnected
-
-        function onCapabilitiesChanged() {
-            checkDMSCapabilities()
-        }
-    }
-
-    function checkDMSCapabilities() {
-        if (!DMSService.isConnected) {
-            return
-        }
-
-        if (DMSService.capabilities.length === 0) {
-            return
-        }
-
-        console.log("NetworkManagerService: Capabilities:", JSON.stringify(DMSService.capabilities))
-        networkAvailable = DMSService.capabilities.includes("network")
-        console.log("NetworkManagerService: Network available:", networkAvailable)
-
-        if (networkAvailable && !stateInitialized) {
-            console.log("NetworkManagerService: Requesting network state and starting subscription socket...")
-            stateInitialized = true
-            getState()
-            subscriptionSocket.connected = true
-        }
-    }
-
-    function addRef() {
-        refCount++
-        if (refCount === 1 && networkAvailable) {
-            startAutoScan()
-        }
-    }
-
-    function removeRef() {
-        refCount = Math.max(0, refCount - 1)
-        if (refCount === 0) {
-            stopAutoScan()
-        }
-    }
-
-    property bool initialStateFetched: false
-
-    function getState() {
-        if (!networkAvailable) return
-
-        DMSService.sendRequest("network.getState", null, response => {
-            if (response.result) {
-                updateState(response.result)
-                if (!initialStateFetched && response.result.wifiEnabled && (!response.result.wifiNetworks || response.result.wifiNetworks.length === 0)) {
-                    console.log("NetworkManagerService: Initial state has no networks, triggering scan")
-                    initialStateFetched = true
-                    Qt.callLater(() => scanWifi())
-                }
-            }
-        })
-    }
-
-    function updateState(state) {
-        networkStatus = state.networkStatus || "disconnected"
-        primaryConnection = state.primaryConnection || ""
-
-        ethernetIP = state.ethernetIP || ""
-        ethernetInterface = state.ethernetDevice || ""
-        ethernetConnected = state.ethernetConnected || false
-        ethernetConnectionUuid = state.ethernetConnectionUuid || ""
-
-        wifiIP = state.wifiIP || ""
-        wifiInterface = state.wifiDevice || ""
-        wifiConnected = state.wifiConnected || false
-        wifiEnabled = state.wifiEnabled !== undefined ? state.wifiEnabled : true
-        wifiConnectionUuid = state.wifiConnectionUuid || ""
-        wifiDevicePath = state.wifiDevicePath || ""
-        activeAccessPointPath = state.activeAccessPointPath || ""
-
-        currentWifiSSID = state.wifiSSID || ""
-        wifiSignalStrength = state.wifiSignal || 0
-
-        if (state.wifiNetworks) {
-            wifiNetworks = state.wifiNetworks
-
-            const saved = []
-            const mapping = {}
-            for (const network of state.wifiNetworks) {
-                if (network.saved) {
-                    saved.push({
-                        ssid: network.ssid,
-                        saved: true
-                    })
-                    mapping[network.ssid] = network.ssid
-                }
-            }
-            savedConnections = saved
-            savedWifiNetworks = saved
-            ssidToConnectionName = mapping
-
-            networksUpdated()
-        }
-
-        userPreference = state.preference || "auto"
-        isConnecting = state.isConnecting || false
-        connectingSSID = state.connectingSSID || ""
-        connectionError = state.lastError || ""
-        lastConnectionError = state.lastError || ""
-
-        connectionChanged()
-    }
-
-    function scanWifi() {
-        if (!networkAvailable || isScanning || !wifiEnabled) return
-
-        console.log("NetworkManagerService: Starting WiFi scan...")
-        isScanning = true
-        DMSService.sendRequest("network.wifi.scan", null, response => {
-            isScanning = false
-            if (response.error) {
-                console.warn("NetworkManagerService: WiFi scan failed:", response.error)
-            } else {
-                console.log("NetworkManagerService: Scan completed, requesting fresh state...")
-                Qt.callLater(() => getState())
-            }
-        })
-    }
-
-    function scanWifiNetworks() {
-        scanWifi()
-    }
-
-    function connectToWifi(ssid, password = "", username = "") {
-        if (!networkAvailable || isConnecting) return
-
-        isConnecting = true
-        connectingSSID = ssid
-        connectionError = ""
-        connectionStatus = "connecting"
-
-        const params = { ssid: ssid }
-        if (password) params.password = password
-        if (username) params.username = username
-
-        DMSService.sendRequest("network.wifi.connect", params, response => {
-            if (response.error) {
-                connectionError = response.error
-                lastConnectionError = response.error
-                connectionStatus = response.error.includes("password") || response.error.includes("authentication")
-                    ? "invalid_password"
-                    : "failed"
-
-                if (connectionStatus === "invalid_password") {
-                    passwordDialogShouldReopen = true
-                    ToastService.showError(`Invalid password for ${ssid}`)
-                } else {
-                    ToastService.showError(`Failed to connect to ${ssid}`)
-                }
-            } else {
-                connectionError = ""
-                connectionStatus = "connected"
-                ToastService.showInfo(`Connected to ${ssid}`)
-
-                if (userPreference === "wifi" || userPreference === "auto") {
-                    setConnectionPriority("wifi")
-                }
-            }
-
-            isConnecting = false
-            connectingSSID = ""
-        })
-    }
-
-    function disconnectWifi() {
-        if (!networkAvailable || !wifiInterface) return
-
-        DMSService.sendRequest("network.wifi.disconnect", null, response => {
-            if (response.error) {
-                ToastService.showError("Failed to disconnect WiFi")
-            } else {
-                ToastService.showInfo("Disconnected from WiFi")
-                currentWifiSSID = ""
-                connectionStatus = ""
-            }
-        })
-    }
-
-    function forgetWifiNetwork(ssid) {
-        if (!networkAvailable) return
-
-        forgetSSID = ssid
-        DMSService.sendRequest("network.wifi.forget", { ssid: ssid }, response => {
-            if (response.error) {
-                console.warn("Failed to forget network:", response.error)
-            } else {
-                ToastService.showInfo(`Forgot network ${ssid}`)
-
-                savedConnections = savedConnections.filter(s => s.ssid !== ssid)
-                savedWifiNetworks = savedWifiNetworks.filter(s => s.ssid !== ssid)
-
-                const updated = [...wifiNetworks]
-                for (const network of updated) {
-                    if (network.ssid === ssid) {
-                        network.saved = false
-                        if (network.connected) {
-                            network.connected = false
-                            currentWifiSSID = ""
-                        }
-                    }
-                }
-                wifiNetworks = updated
-                networksUpdated()
-            }
-            forgetSSID = ""
-        })
-    }
-
-    function toggleWifiRadio() {
-        if (!networkAvailable || wifiToggling) return
-
-        wifiToggling = true
-        DMSService.sendRequest("network.wifi.toggle", null, response => {
-            wifiToggling = false
-
-            if (response.error) {
-                console.warn("Failed to toggle WiFi:", response.error)
-            } else if (response.result) {
-                wifiEnabled = response.result.enabled
-                ToastService.showInfo(wifiEnabled ? "WiFi enabled" : "WiFi disabled")
-            }
-        })
-    }
-
-    function enableWifiDevice() {
-        if (!networkAvailable) return
-
-        DMSService.sendRequest("network.wifi.enable", null, response => {
-            if (response.error) {
-                ToastService.showError("Failed to enable WiFi")
-            } else {
-                ToastService.showInfo("WiFi enabled")
-            }
-        })
-    }
-
-    function setNetworkPreference(preference) {
-        if (!networkAvailable) return
-
-        userPreference = preference
-        changingPreference = true
-        targetPreference = preference
-        SettingsData.setNetworkPreference(preference)
-
-        DMSService.sendRequest("network.preference.set", { preference: preference }, response => {
-            changingPreference = false
-            targetPreference = ""
-
-            if (response.error) {
-                console.warn("Failed to set network preference:", response.error)
-            }
-        })
-    }
-
-    function setConnectionPriority(type) {
-        if (type === "wifi") {
-            setNetworkPreference("wifi")
-        } else if (type === "ethernet") {
-            setNetworkPreference("ethernet")
-        }
-    }
-
-    function connectToWifiAndSetPreference(ssid, password, username = "") {
-        connectToWifi(ssid, password, username)
-        setNetworkPreference("wifi")
-    }
-
-    function toggleNetworkConnection(type) {
-        if (!networkAvailable) return
-
-        if (type === "ethernet") {
-            if (networkStatus === "ethernet") {
-                DMSService.sendRequest("network.ethernet.disconnect", null, null)
-            } else {
-                DMSService.sendRequest("network.ethernet.connect", null, null)
-            }
-        }
-    }
-
-    function startAutoScan() {
-        autoScan = true
-        autoRefreshEnabled = true
-        if (networkAvailable && wifiEnabled) {
-            scanWifi()
-        }
-    }
-
-    function stopAutoScan() {
-        autoScan = false
-        autoRefreshEnabled = false
-    }
-
-    function fetchNetworkInfo(ssid) {
-        if (!networkAvailable) return
-
-        networkInfoSSID = ssid
-        networkInfoLoading = true
-        networkInfoDetails = "Loading network information..."
-
-        DMSService.sendRequest("network.info", { ssid: ssid }, response => {
-            networkInfoLoading = false
-
-            if (response.error) {
-                networkInfoDetails = "Failed to fetch network information"
-            } else if (response.result) {
-                formatNetworkInfo(response.result)
-            }
-        })
-    }
-
-    function formatNetworkInfo(info) {
-        let details = ""
-
-        if (!info || !info.bands || info.bands.length === 0) {
-            details = "Network information not found or network not available."
-        } else {
-            for (const band of info.bands) {
-                const freqGHz = band.frequency / 1000
-                let bandName = "Unknown"
-                if (band.frequency >= 2400 && band.frequency <= 2500) {
-                    bandName = "2.4 GHz"
-                } else if (band.frequency >= 5000 && band.frequency <= 6000) {
-                    bandName = "5 GHz"
-                } else if (band.frequency >= 6000) {
-                    bandName = "6 GHz"
-                }
-
-                const statusPrefix = band.connected ? "● " : "  "
-                const statusSuffix = band.connected ? " (Connected)" : ""
-
-                details += statusPrefix + bandName + statusSuffix + " - " + band.signal + "%\\n"
-                details += "  Channel " + band.channel + " (" + freqGHz.toFixed(1) + " GHz) • " + band.rate + " Mbit/s\\n"
-                details += "  BSSID: " + band.bssid + "\\n"
-                details += "  Mode: " + band.mode + "\\n"
-                details += "  Security: " + (band.secured ? "Secured" : "Open") + "\\n"
-                if (band.saved) {
-                    details += "  Status: Saved network\\n"
-                }
-                details += "\\n"
-            }
-        }
-
-        networkInfoDetails = details
-    }
-
-    function getNetworkInfo(ssid) {
-        const network = wifiNetworks.find(n => n.ssid === ssid)
-        if (!network) {
-            return null
-        }
-
-        return {
-            "ssid": network.ssid,
-            "signal": network.signal,
-            "secured": network.secured,
-            "saved": network.saved,
-            "connected": network.connected,
-            "bssid": network.bssid
-        }
-    }
-
-    function refreshNetworkState() {
-        if (networkAvailable) {
-            getState()
-        }
-    }
-
-    function splitNmcliFields(line) {
-        const parts = []
-        let cur = ""
-        let escape = false
-        for (var i = 0; i < line.length; i++) {
-            const ch = line[i]
-            if (escape) {
-                cur += ch
-                escape = false
-            } else if (ch === '\\') {
-                escape = true
-            } else if (ch === ':') {
-                parts.push(cur)
-                cur = ""
-            } else {
-                cur += ch
-            }
-        }
-        parts.push(cur)
-        return parts
-    }
-}

Services/PluginService.qml

@@ -1,484 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtCore
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property var availablePlugins: ({})
-    property var loadedPlugins: ({})
-    property var pluginWidgetComponents: ({})
-    property var pluginDaemonComponents: ({})
-    property string pluginDirectory: {
-        var configDir = StandardPaths.writableLocation(StandardPaths.ConfigLocation)
-        var configDirStr = configDir.toString()
-        if (configDirStr.startsWith("file://")) {
-            configDirStr = configDirStr.substring(7)
-        }
-        return configDirStr + "/DankMaterialShell/plugins"
-    }
-    property string systemPluginDirectory: "/etc/xdg/quickshell/dms-plugins"
-    property var pluginDirectories: [pluginDirectory, systemPluginDirectory]
-
-    signal pluginLoaded(string pluginId)
-    signal pluginUnloaded(string pluginId)
-    signal pluginLoadFailed(string pluginId, string error)
-    signal pluginDataChanged(string pluginId)
-
-    Component.onCompleted: {
-        Qt.callLater(initializePlugins)
-    }
-
-    function initializePlugins() {
-        scanPlugins()
-    }
-
-    property int currentScanIndex: 0
-    property var scanResults: []
-    property var foundPlugins: ({})
-
-    property var lsProcess: Process {
-        id: dirScanner
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                var output = text.trim()
-                var currentDir = pluginDirectories[currentScanIndex]
-                if (output) {
-                    var directories = output.split('\n')
-                    for (var i = 0; i < directories.length; i++) {
-                        var dir = directories[i].trim()
-                        if (dir) {
-                            var manifestPath = currentDir + "/" + dir + "/plugin.json"
-                            loadPluginManifest(manifestPath)
-                        }
-                    }
-                }
-            }
-        }
-
-        onExited: function(exitCode) {
-            currentScanIndex++
-            if (currentScanIndex < pluginDirectories.length) {
-                scanNextDirectory()
-            } else {
-                currentScanIndex = 0
-                cleanupRemovedPlugins()
-            }
-        }
-    }
-
-    function scanPlugins() {
-        currentScanIndex = 0
-        foundPlugins = {}
-        scanNextDirectory()
-    }
-
-    function scanNextDirectory() {
-        var dir = pluginDirectories[currentScanIndex]
-        lsProcess.command = ["find", "-L", dir, "-maxdepth", "1", "-type", "d", "-not", "-path", dir, "-exec", "basename", "{}", ";"]
-        lsProcess.running = true
-    }
-
-    property var manifestReaders: ({})
-
-    function loadPluginManifest(manifestPath) {
-        var readerId = "reader_" + Date.now() + "_" + Math.random()
-
-        var checkProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { stdout: StdioCollector { } }")
-        if (checkProcess.status === Component.Ready) {
-            var checker = checkProcess.createObject(root)
-            checker.command = ["test", "-f", manifestPath]
-            checker.exited.connect(function(exitCode) {
-                if (exitCode !== 0) {
-                    checker.destroy()
-                    delete manifestReaders[readerId]
-                    return
-                }
-
-                var catProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { stdout: StdioCollector { } }")
-                if (catProcess.status === Component.Ready) {
-                    var process = catProcess.createObject(root)
-                    process.command = ["cat", manifestPath]
-                    process.stdout.streamFinished.connect(function() {
-                        try {
-                            var manifest = JSON.parse(process.stdout.text.trim())
-                            processManifest(manifest, manifestPath)
-                        } catch (e) {
-                            console.error("PluginService: Failed to parse manifest", manifestPath, ":", e.message)
-                        }
-                        process.destroy()
-                        delete manifestReaders[readerId]
-                    })
-                    process.exited.connect(function(exitCode) {
-                        if (exitCode !== 0) {
-                            console.error("PluginService: Failed to read manifest file:", manifestPath, "exit code:", exitCode)
-                            process.destroy()
-                            delete manifestReaders[readerId]
-                        }
-                    })
-                    manifestReaders[readerId] = process
-                    process.running = true
-                } else {
-                    console.error("PluginService: Failed to create manifest reader process")
-                }
-
-                checker.destroy()
-            })
-            manifestReaders[readerId] = checker
-            checker.running = true
-        } else {
-            console.error("PluginService: Failed to create file check process")
-        }
-    }
-
-    function processManifest(manifest, manifestPath) {
-        registerPlugin(manifest, manifestPath)
-
-        var enabled = SettingsData.getPluginSetting(manifest.id, "enabled", false)
-        if (enabled) {
-            loadPlugin(manifest.id)
-        }
-    }
-
-    function registerPlugin(manifest, manifestPath) {
-        if (!manifest.id || !manifest.name || !manifest.component) {
-            console.error("PluginService: Invalid manifest, missing required fields:", manifestPath)
-            return
-        }
-
-        var pluginDir = manifestPath.substring(0, manifestPath.lastIndexOf('/'))
-
-        // Clean up relative paths by removing './' prefix
-        var componentFile = manifest.component
-        if (componentFile.startsWith('./')) {
-            componentFile = componentFile.substring(2)
-        }
-
-        var settingsFile = manifest.settings
-        if (settingsFile && settingsFile.startsWith('./')) {
-            settingsFile = settingsFile.substring(2)
-        }
-
-        var pluginInfo = {}
-        for (var key in manifest) {
-            pluginInfo[key] = manifest[key]
-        }
-        pluginInfo.manifestPath = manifestPath
-        pluginInfo.pluginDirectory = pluginDir
-        pluginInfo.componentPath = pluginDir + '/' + componentFile
-        pluginInfo.settingsPath = settingsFile ? pluginDir + '/' + settingsFile : null
-        pluginInfo.loaded = false
-        pluginInfo.type = manifest.type || "widget"
-
-        var newPlugins = Object.assign({}, availablePlugins)
-        newPlugins[manifest.id] = pluginInfo
-        availablePlugins = newPlugins
-        foundPlugins[manifest.id] = true
-    }
-
-    function hasPermission(pluginId, permission) {
-        var plugin = availablePlugins[pluginId]
-        if (!plugin) {
-            return false
-        }
-        var permissions = plugin.permissions || []
-        return permissions.indexOf(permission) !== -1
-    }
-
-    function cleanupRemovedPlugins() {
-        var pluginsToRemove = []
-        for (var pluginId in availablePlugins) {
-            if (!foundPlugins[pluginId]) {
-                pluginsToRemove.push(pluginId)
-            }
-        }
-
-        if (pluginsToRemove.length > 0) {
-            var newPlugins = Object.assign({}, availablePlugins)
-            for (var i = 0; i < pluginsToRemove.length; i++) {
-                var pluginId = pluginsToRemove[i]
-                if (isPluginLoaded(pluginId)) {
-                    unloadPlugin(pluginId)
-                }
-                delete newPlugins[pluginId]
-            }
-            availablePlugins = newPlugins
-        }
-    }
-
-    function loadPlugin(pluginId) {
-        var plugin = availablePlugins[pluginId]
-        if (!plugin) {
-            console.error("PluginService: Plugin not found:", pluginId)
-            pluginLoadFailed(pluginId, "Plugin not found")
-            return false
-        }
-
-        if (plugin.loaded) {
-            return true
-        }
-
-        var isDaemon = plugin.type === "daemon"
-        var componentMap = isDaemon ? pluginDaemonComponents : pluginWidgetComponents
-
-        if (componentMap[pluginId]) {
-            componentMap[pluginId]?.destroy()
-            if (isDaemon) {
-                var newDaemons = Object.assign({}, pluginDaemonComponents)
-                delete newDaemons[pluginId]
-                pluginDaemonComponents = newDaemons
-            } else {
-                var newComponents = Object.assign({}, pluginWidgetComponents)
-                delete newComponents[pluginId]
-                pluginWidgetComponents = newComponents
-            }
-        }
-
-        try {
-            var componentUrl = "file://" + plugin.componentPath
-            var component = Qt.createComponent(componentUrl, Component.PreferSynchronous)
-
-            if (component.status === Component.Loading) {
-                component.statusChanged.connect(function() {
-                    if (component.status === Component.Error) {
-                        console.error("PluginService: Failed to create component for plugin:", pluginId, "Error:", component.errorString())
-                        pluginLoadFailed(pluginId, component.errorString())
-                    }
-                })
-            }
-
-            if (component.status === Component.Error) {
-                console.error("PluginService: Failed to create component for plugin:", pluginId, "Error:", component.errorString())
-                pluginLoadFailed(pluginId, component.errorString())
-                return false
-            }
-
-            if (isDaemon) {
-                var newDaemons = Object.assign({}, pluginDaemonComponents)
-                newDaemons[pluginId] = component
-                pluginDaemonComponents = newDaemons
-            } else {
-                var newComponents = Object.assign({}, pluginWidgetComponents)
-                newComponents[pluginId] = component
-                pluginWidgetComponents = newComponents
-            }
-
-            plugin.loaded = true
-            loadedPlugins[pluginId] = plugin
-
-            pluginLoaded(pluginId)
-            return true
-
-        } catch (error) {
-            console.error("PluginService: Error loading plugin:", pluginId, "Error:", error.message)
-            pluginLoadFailed(pluginId, error.message)
-            return false
-        }
-    }
-
-    function unloadPlugin(pluginId) {
-        var plugin = loadedPlugins[pluginId]
-        if (!plugin) {
-            console.warn("PluginService: Plugin not loaded:", pluginId)
-            return false
-        }
-
-        try {
-            var isDaemon = plugin.type === "daemon"
-
-            if (isDaemon && pluginDaemonComponents[pluginId]) {
-                pluginDaemonComponents[pluginId]?.destroy()
-                var newDaemons = Object.assign({}, pluginDaemonComponents)
-                delete newDaemons[pluginId]
-                pluginDaemonComponents = newDaemons
-            } else if (pluginWidgetComponents[pluginId]) {
-                pluginWidgetComponents[pluginId]?.destroy()
-                var newComponents = Object.assign({}, pluginWidgetComponents)
-                delete newComponents[pluginId]
-                pluginWidgetComponents = newComponents
-            }
-
-            plugin.loaded = false
-            delete loadedPlugins[pluginId]
-
-            pluginUnloaded(pluginId)
-            return true
-
-        } catch (error) {
-            console.error("PluginService: Error unloading plugin:", pluginId, "Error:", error.message)
-            return false
-        }
-    }
-
-    function getWidgetComponents() {
-        return pluginWidgetComponents
-    }
-
-    function getDaemonComponents() {
-        return pluginDaemonComponents
-    }
-
-    function getAvailablePlugins() {
-        var result = []
-        for (var key in availablePlugins) {
-            result.push(availablePlugins[key])
-        }
-        return result
-    }
-
-    function getPluginVariants(pluginId) {
-        var plugin = availablePlugins[pluginId]
-        if (!plugin) {
-            return []
-        }
-        var variants = SettingsData.getPluginSetting(pluginId, "variants", [])
-        return variants
-    }
-
-    function getAllPluginVariants() {
-        var result = []
-        for (var pluginId in availablePlugins) {
-            var plugin = availablePlugins[pluginId]
-            if (plugin.type !== "widget") {
-                continue
-            }
-            var variants = getPluginVariants(pluginId)
-            if (variants.length === 0) {
-                result.push({
-                    pluginId: pluginId,
-                    variantId: null,
-                    fullId: pluginId,
-                    name: plugin.name,
-                    icon: plugin.icon || "extension",
-                    description: plugin.description || "Plugin widget",
-                    loaded: plugin.loaded
-                })
-            } else {
-                for (var i = 0; i < variants.length; i++) {
-                    var variant = variants[i]
-                    result.push({
-                        pluginId: pluginId,
-                        variantId: variant.id,
-                        fullId: pluginId + ":" + variant.id,
-                        name: plugin.name + " - " + variant.name,
-                        icon: variant.icon || plugin.icon || "extension",
-                        description: variant.description || plugin.description || "Plugin widget variant",
-                        loaded: plugin.loaded
-                    })
-                }
-            }
-        }
-        return result
-    }
-
-    function createPluginVariant(pluginId, variantName, variantConfig) {
-        var variants = getPluginVariants(pluginId)
-        var variantId = "variant_" + Date.now()
-        var newVariant = Object.assign({}, variantConfig, {
-            id: variantId,
-            name: variantName
-        })
-        variants.push(newVariant)
-        SettingsData.setPluginSetting(pluginId, "variants", variants)
-        pluginDataChanged(pluginId)
-        return variantId
-    }
-
-    function removePluginVariant(pluginId, variantId) {
-        var variants = getPluginVariants(pluginId)
-        var newVariants = variants.filter(function(v) { return v.id !== variantId })
-        SettingsData.setPluginSetting(pluginId, "variants", newVariants)
-        pluginDataChanged(pluginId)
-    }
-
-    function updatePluginVariant(pluginId, variantId, variantConfig) {
-        var variants = getPluginVariants(pluginId)
-        for (var i = 0; i < variants.length; i++) {
-            if (variants[i].id === variantId) {
-                variants[i] = Object.assign({}, variants[i], variantConfig)
-                break
-            }
-        }
-        SettingsData.setPluginSetting(pluginId, "variants", variants)
-        pluginDataChanged(pluginId)
-    }
-
-    function getPluginVariantData(pluginId, variantId) {
-        var variants = getPluginVariants(pluginId)
-        for (var i = 0; i < variants.length; i++) {
-            if (variants[i].id === variantId) {
-                return variants[i]
-            }
-        }
-        return null
-    }
-
-    function getLoadedPlugins() {
-        var result = []
-        for (var key in loadedPlugins) {
-            result.push(loadedPlugins[key])
-        }
-        return result
-    }
-
-    function isPluginLoaded(pluginId) {
-        return loadedPlugins[pluginId] !== undefined
-    }
-
-    function enablePlugin(pluginId) {
-        SettingsData.setPluginSetting(pluginId, "enabled", true)
-        return loadPlugin(pluginId)
-    }
-
-    function disablePlugin(pluginId) {
-        SettingsData.setPluginSetting(pluginId, "enabled", false)
-        return unloadPlugin(pluginId)
-    }
-
-    function reloadPlugin(pluginId) {
-        if (isPluginLoaded(pluginId)) {
-            unloadPlugin(pluginId)
-        }
-        return loadPlugin(pluginId)
-    }
-
-    function savePluginData(pluginId, key, value) {
-        SettingsData.setPluginSetting(pluginId, key, value)
-        pluginDataChanged(pluginId)
-        return true
-    }
-
-    function loadPluginData(pluginId, key, defaultValue) {
-        return SettingsData.getPluginSetting(pluginId, key, defaultValue)
-    }
-
-    function saveAllPluginSettings() {
-        SettingsData.savePluginSettings()
-    }
-
-    function createPluginDirectory() {
-        var mkdirProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { }")
-        if (mkdirProcess.status === Component.Ready) {
-            var process = mkdirProcess.createObject(root)
-            process.command = ["mkdir", "-p", pluginDirectory]
-            process.exited.connect(function(exitCode) {
-                if (exitCode !== 0) {
-                    console.error("PluginService: Failed to create plugin directory, exit code:", exitCode)
-                }
-                process.destroy()
-            })
-            process.running = true
-            return true
-        } else {
-            console.error("PluginService: Failed to create mkdir process")
-            return false
-        }
-    }
-}

Services/PortalService.qml

@@ -1,390 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property bool accountsServiceAvailable: false
-    property string systemProfileImage: ""
-    property string profileImage: ""
-    property bool settingsPortalAvailable: false
-    property int systemColorScheme: 0
-
-    property bool freedeskAvailable: false
-
-    readonly property string socketPath: Quickshell.env("DMS_SOCKET")
-
-    function init() {}
-
-    function getSystemProfileImage() {
-        if (freedeskAvailable) {
-            const username = Quickshell.env("USER")
-            if (!username) return
-
-            DMSService.sendRequest("freedesktop.accounts.getUserIconFile", { username: username }, response => {
-                if (response.result && response.result.success) {
-                    const iconFile = response.result.value || ""
-                    if (iconFile && iconFile !== "" && iconFile !== "/var/lib/AccountsService/icons/") {
-                        systemProfileImage = iconFile
-                        if (!profileImage || profileImage === "") {
-                            profileImage = iconFile
-                        }
-                    }
-                }
-            })
-        } else {
-            systemProfileCheckProcess.running = true
-        }
-    }
-
-    function getUserProfileImage(username) {
-        if (!username) {
-            profileImage = ""
-            return
-        }
-        if (Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true") {
-            profileImage = ""
-            return
-        }
-
-        if (freedeskAvailable) {
-            DMSService.sendRequest("freedesktop.accounts.getUserIconFile", { username: username }, response => {
-                if (response.result && response.result.success) {
-                    const icon = response.result.value || ""
-                    if (icon && icon !== "" && icon !== "/var/lib/AccountsService/icons/") {
-                        profileImage = icon
-                    } else {
-                        profileImage = ""
-                    }
-                } else {
-                    profileImage = ""
-                }
-            })
-        } else {
-            userProfileCheckProcess.command = [
-                "bash", "-c",
-                `uid=$(id -u ${username} 2>/dev/null) && [ -n "$uid" ] && dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$uid org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:IconFile 2>/dev/null | grep -oP 'string "\\K[^"]+' || echo ""`
-            ]
-            userProfileCheckProcess.running = true
-        }
-    }
-
-    function setProfileImage(imagePath) {
-        profileImage = imagePath
-        if (accountsServiceAvailable) {
-            if (imagePath) {
-                setSystemProfileImage(imagePath)
-            } else {
-                setSystemProfileImage("")
-            }
-        }
-    }
-
-    function getSystemColorScheme() {
-        if (freedeskAvailable) {
-            DMSService.sendRequest("freedesktop.settings.getColorScheme", null, response => {
-                if (response.result) {
-                    systemColorScheme = response.result.value || 0
-
-                    if (typeof Theme !== "undefined") {
-                        const shouldBeLightMode = (systemColorScheme === 2)
-                        if (Theme.isLightMode !== shouldBeLightMode) {
-                            Theme.isLightMode = shouldBeLightMode
-                            if (typeof SessionData !== "undefined") {
-                                SessionData.setLightMode(shouldBeLightMode)
-                            }
-                        }
-                    }
-                }
-            })
-        } else {
-            systemColorSchemeCheckProcess.running = true
-        }
-    }
-
-    function setLightMode(isLightMode) {
-        if (settingsPortalAvailable) {
-            setSystemColorScheme(isLightMode)
-        }
-    }
-
-    function setSystemColorScheme(isLightMode) {
-        if (!settingsPortalAvailable) return
-
-        const colorScheme = isLightMode ? "default" : "prefer-dark"
-        colorSchemeSetProcess.command = ["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", colorScheme]
-        colorSchemeSetProcess.running = true
-    }
-
-    Process {
-        id: colorSchemeSetProcess
-        running: false
-
-        onExited: exitCode => {
-            if (exitCode === 0) {
-                Qt.callLater(() => getSystemColorScheme())
-            }
-        }
-    }
-
-    function setSystemProfileImage(imagePath) {
-        if (!accountsServiceAvailable) return
-
-        if (freedeskAvailable) {
-            DMSService.sendRequest("freedesktop.accounts.setIconFile", { path: imagePath || "" }, response => {
-                if (response.error) {
-                    console.warn("PortalService: Failed to set icon file:", response.error)
-                } else {
-                    Qt.callLater(() => getSystemProfileImage())
-                }
-            })
-        } else {
-            const path = imagePath || ""
-            systemProfileSetProcess.command = ["bash", "-c", `dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$(id -u) org.freedesktop.Accounts.User.SetIconFile string:'${path}'`]
-            systemProfileSetProcess.running = true
-        }
-    }
-
-    Component.onCompleted: {
-        if (socketPath && socketPath.length > 0) {
-            checkDMSCapabilities()
-        } else {
-            console.log("PortalService: DMS_SOCKET not set, using fallback methods")
-            checkAccountsServiceFallback()
-            checkSettingsPortalFallback()
-        }
-    }
-
-    Connections {
-        target: DMSService
-
-        function onConnectionStateChanged() {
-            if (DMSService.isConnected) {
-                checkDMSCapabilities()
-            }
-        }
-    }
-
-    Connections {
-        target: DMSService
-        enabled: DMSService.isConnected
-
-        function onCapabilitiesChanged() {
-            checkDMSCapabilities()
-        }
-    }
-
-    function checkDMSCapabilities() {
-        if (!DMSService.isConnected) {
-            return
-        }
-
-        if (DMSService.capabilities.length === 0) {
-            return
-        }
-
-        freedeskAvailable = DMSService.capabilities.includes("freedesktop")
-        if (freedeskAvailable) {
-            checkAccountsService()
-            checkSettingsPortal()
-        } else {
-            console.log("PortalService: freedesktop capability not available in DMS, using fallback methods")
-            checkAccountsServiceFallback()
-            checkSettingsPortalFallback()
-        }
-    }
-
-    function checkAccountsService() {
-        if (!freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.getState", null, response => {
-            if (response.result && response.result.accounts) {
-                accountsServiceAvailable = response.result.accounts.available || false
-                if (accountsServiceAvailable) {
-                    getSystemProfileImage()
-                }
-            }
-        })
-    }
-
-    function checkSettingsPortal() {
-        if (!freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.getState", null, response => {
-            if (response.result && response.result.settings) {
-                settingsPortalAvailable = response.result.settings.available || false
-                if (settingsPortalAvailable) {
-                    getSystemColorScheme()
-                }
-            }
-        })
-    }
-
-    function checkAccountsServiceFallback() {
-        accountsServiceCheckProcess.running = true
-    }
-
-    function checkSettingsPortalFallback() {
-        settingsPortalCheckProcess.running = true
-    }
-
-    function getGreeterUserProfileImage(username) {
-        if (!username) {
-            profileImage = ""
-            return
-        }
-        userProfileCheckProcess.command = [
-            "bash", "-c",
-            `uid=$(id -u ${username} 2>/dev/null) && [ -n "$uid" ] && dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$uid org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:IconFile 2>/dev/null | grep -oP 'string "\\K[^"]+' || echo ""`
-        ]
-        userProfileCheckProcess.running = true
-    }
-
-    Process {
-        id: accountsServiceCheckProcess
-        command: ["bash", "-c", "dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts.FindUserByName string:\"$USER\""]
-        running: false
-
-        onExited: exitCode => {
-            accountsServiceAvailable = (exitCode === 0)
-            if (accountsServiceAvailable) {
-                getSystemProfileImage()
-            }
-        }
-    }
-
-    Process {
-        id: systemProfileCheckProcess
-        command: ["bash", "-c", "dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$(id -u) org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:IconFile"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const match = text.match(/string\s+"([^"]+)"/)
-                if (match && match[1] && match[1] !== "" && match[1] !== "/var/lib/AccountsService/icons/") {
-                    systemProfileImage = match[1]
-                    if (!profileImage || profileImage === "") {
-                        profileImage = systemProfileImage
-                    }
-                }
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-                systemProfileImage = ""
-            }
-        }
-    }
-
-    Process {
-        id: systemProfileSetProcess
-        running: false
-
-        onExited: exitCode => {
-            if (exitCode === 0) {
-                getSystemProfileImage()
-            }
-        }
-    }
-
-    Process {
-        id: userProfileCheckProcess
-        command: []
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const trimmed = text.trim()
-                if (trimmed && trimmed !== "" && !trimmed.includes("Error") && trimmed !== "/var/lib/AccountsService/icons/") {
-                    root.profileImage = trimmed
-                } else {
-                    root.profileImage = ""
-                }
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-                root.profileImage = ""
-            }
-        }
-    }
-
-    Process {
-        id: settingsPortalCheckProcess
-        command: ["gdbus", "call", "--session", "--dest", "org.freedesktop.portal.Desktop", "--object-path", "/org/freedesktop/portal/desktop", "--method", "org.freedesktop.portal.Settings.ReadOne", "org.freedesktop.appearance", "color-scheme"]
-        running: false
-
-        onExited: exitCode => {
-            settingsPortalAvailable = (exitCode === 0)
-            if (settingsPortalAvailable) {
-                getSystemColorScheme()
-            }
-        }
-    }
-
-    Process {
-        id: systemColorSchemeCheckProcess
-        command: ["gdbus", "call", "--session", "--dest", "org.freedesktop.portal.Desktop", "--object-path", "/org/freedesktop/portal/desktop", "--method", "org.freedesktop.portal.Settings.ReadOne", "org.freedesktop.appearance", "color-scheme"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const match = text.match(/uint32 (\d+)/)
-                if (match && match[1]) {
-                    systemColorScheme = parseInt(match[1])
-
-                    if (typeof Theme !== "undefined") {
-                        const shouldBeLightMode = (systemColorScheme === 2)
-                        if (Theme.isLightMode !== shouldBeLightMode) {
-                            Theme.isLightMode = shouldBeLightMode
-                            if (typeof SessionData !== "undefined") {
-                                SessionData.setLightMode(shouldBeLightMode)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-                systemColorScheme = 0
-            }
-        }
-    }
-
-    IpcHandler {
-        target: "profile"
-
-        function getImage(): string {
-            return root.profileImage
-        }
-
-        function setImage(path: string): string {
-            if (!path) {
-                return "ERROR: No path provided"
-            }
-
-            const absolutePath = path.startsWith("/") ? path : `${StandardPaths.writableLocation(StandardPaths.HomeLocation)}/${path}`
-
-            try {
-                root.setProfileImage(absolutePath)
-                return "SUCCESS: Profile image set to " + absolutePath
-            } catch (e) {
-                return "ERROR: Failed to set profile image: " + e.toString()
-            }
-        }
-
-        function clearImage(): string {
-            root.setProfileImage("")
-            return "SUCCESS: Profile image cleared"
-        }
-    }
-}

Services/SystemUpdateService.qml

@@ -1,193 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property var availableUpdates: []
-    property bool isChecking: false
-    property bool hasError: false
-    property string errorMessage: ""
-    property string pkgManager: ""
-    property string distribution: ""
-    property bool distributionSupported: false
-    property string shellVersion: ""
-
-    readonly property var archBasedSettings: {
-        "listUpdatesParams": ["-Qu"],
-        "upgradeSettings": {
-            "params": ["-Syu"],
-            "requiresSudo": false
-        },
-        "parserSettings": {
-            "lineRegex": /^(\S+)\s+([^\s]+)\s+->\s+([^\s]+)$/,
-            "entryProducer": function (match) {
-                return {
-                    "name": match[1],
-                    "currentVersion": match[2],
-                    "newVersion": match[3],
-                    "description": `${match[1]} ${match[2]} → ${match[3]}`
-                }
-            }
-        }
-    }
-
-    readonly property var packageManagerParams: {
-        "yay": archBasedSettings,
-        "paru": archBasedSettings,
-        "dnf": {
-            "listUpdatesParams": ["list", "--upgrades", "--quiet", "--color=never"],
-            "upgradeSettings": {
-                "params": ["upgrade"],
-                "requiresSudo": true
-            },
-            "parserSettings": {
-                "lineRegex": /^([^\s]+)\s+([^\s]+)\s+.*$/,
-                "entryProducer": function (match) {
-                    return {
-                        "name": match[1],
-                        "currentVersion": "",
-                        "newVersion": match[2],
-                        "description": `${match[1]} → ${match[2]}`
-                    }
-                }
-            }
-        }
-    }
-    readonly property list<string> supportedDistributions: ["arch", "cachyos", "manjaro", "endeavouros", "fedora"]
-    readonly property int updateCount: availableUpdates.length
-    readonly property bool helperAvailable: pkgManager !== "" && distributionSupported
-
-    Process {
-        id: distributionDetection
-        command: ["sh", "-c", "cat /etc/os-release | grep '^ID=' | cut -d'=' -f2 | tr -d '\"'"]
-        running: true
-
-        onExited: (exitCode) => {
-            if (exitCode === 0) {
-                distribution = stdout.text.trim().toLowerCase()
-                distributionSupported = supportedDistributions.includes(distribution)
-
-                if (distributionSupported) {
-                    helperDetection.running = true
-                } else {
-                    console.warn("SystemUpdate: Unsupported distribution:", distribution)
-                }
-            } else {
-                console.warn("SystemUpdate: Failed to detect distribution")
-            }
-        }
-
-        stdout: StdioCollector {}
-
-        Component.onCompleted: {
-            versionDetection.running = true
-        }
-    }
-
-    Process {
-        id: versionDetection
-        command: ["sh", "-c", "if [ -d .git ]; then echo \"(git) $(git rev-parse --short HEAD)\"; elif [ -f VERSION ]; then cat VERSION; fi"]
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                shellVersion = text.trim()
-            }            
-        }
-    }
-
-    Process {
-        id: helperDetection
-        command: ["sh", "-c", "which paru || which yay || which dnf"]
-
-        onExited: (exitCode) => {
-            if (exitCode === 0) {
-                const helperPath = stdout.text.trim()
-                pkgManager = helperPath.split('/').pop()
-                checkForUpdates()
-            } else {
-                console.warn("SystemUpdate: No package manager found")
-            }
-        }
-
-        stdout: StdioCollector {}
-    }
-
-    Process {
-        id: updateChecker
-
-        onExited: (exitCode) => {
-            isChecking = false
-            if (exitCode === 0 || exitCode === 1) {
-                // Exit code 0 = updates available, 1 = no updates
-                parseUpdates(stdout.text)
-                hasError = false
-                errorMessage = ""
-            } else {
-                hasError = true
-                errorMessage = "Failed to check for updates"
-                console.warn("SystemUpdate: Update check failed with code:", exitCode)
-            }
-        }
-
-        stdout: StdioCollector {}
-    }
-
-    Process {
-        id: updater
-        onExited: (exitCode) => {
-            checkForUpdates()
-        }
-    }
-
-    function checkForUpdates() {
-        if (!distributionSupported || !pkgManager || isChecking) return
-
-        isChecking = true
-        hasError = false
-        updateChecker.command = [pkgManager].concat(packageManagerParams[pkgManager].listUpdatesParams)
-        updateChecker.running = true
-    }
-
-    function parseUpdates(output) {
-        const lines = output.trim().split('\n').filter(line => line.trim())
-        const updates = []
-
-        const regex = packageManagerParams[pkgManager].parserSettings.lineRegex
-        const entryProducer = packageManagerParams[pkgManager].parserSettings.entryProducer
-
-        for (const line of lines) {
-            const match = line.match(regex)
-            if (match) {
-                updates.push(entryProducer(match))
-            }
-        }
-
-        availableUpdates = updates
-    }
-
-    function runUpdates() {
-        if (!distributionSupported || !pkgManager || updateCount === 0) return
-
-        const terminal = Quickshell.env("TERMINAL") || "xterm"
-        const params = packageManagerParams[pkgManager].upgradeSettings.params.join(" ")
-        const sudo = packageManagerParams[pkgManager].upgradeSettings.requiresSudo ? "sudo" : ""
-        const updateCommand = `${sudo} ${pkgManager} ${params} && echo "Updates complete! Press Enter to close..." && read`
-
-        updater.command = [terminal, "-e", "sh", "-c", updateCommand]
-        updater.running = true
-    }
-
-    Timer {
-        interval: 30 * 60 * 1000
-        repeat: true
-        running: distributionSupported && pkgManager
-        onTriggered: checkForUpdates()
-    }
-}

Services/ToastService.qml

@@ -1,105 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-
-Singleton {
-    id: root
-
-    readonly property int levelInfo: 0
-    readonly property int levelWarn: 1
-    readonly property int levelError: 2
-    property string currentMessage: ""
-    property int currentLevel: levelInfo
-    property bool toastVisible: false
-    property var toastQueue: []
-    property string currentDetails: ""
-    property bool hasDetails: false
-    property string wallpaperErrorStatus: ""
-
-    function showToast(message, level = levelInfo, details = "") {
-        toastQueue.push({
-                            "message": message,
-                            "level": level,
-                            "details": details
-                        })
-        if (!toastVisible) {
-            processQueue()
-        }
-    }
-
-    function showInfo(message, details = "") {
-        showToast(message, levelInfo, details)
-    }
-
-    function showWarning(message, details = "") {
-        showToast(message, levelWarn, details)
-    }
-
-    function showError(message, details = "") {
-        showToast(message, levelError, details)
-    }
-
-    function hideToast() {
-        toastVisible = false
-        currentMessage = ""
-        currentDetails = ""
-        hasDetails = false
-        currentLevel = levelInfo
-        toastTimer.stop()
-        resetToastState()
-        if (toastQueue.length > 0) {
-            processQueue()
-        }
-    }
-
-    function processQueue() {
-        if (toastQueue.length === 0) {
-            return
-        }
-
-        const toast = toastQueue.shift()
-        currentMessage = toast.message
-        currentLevel = toast.level
-        currentDetails = toast.details || ""
-        hasDetails = currentDetails.length > 0
-        toastVisible = true
-        resetToastState()
-
-        if (toast.level === levelError && hasDetails) {
-            toastTimer.interval = 8000
-            toastTimer.start()
-        } else {
-            toastTimer.interval = toast.level === levelError ? 5000 : toast.level === levelWarn ? 3000 : 1500
-            toastTimer.start()
-        }
-    }
-
-    signal resetToastState
-
-    function stopTimer() {
-        toastTimer.stop()
-    }
-
-    function restartTimer() {
-        if (hasDetails && currentLevel === levelError) {
-            toastTimer.interval = 8000
-            toastTimer.restart()
-        }
-    }
-
-    function clearWallpaperError() {
-        wallpaperErrorStatus = ""
-    }
-
-    Timer {
-        id: toastTimer
-
-        interval: 5000
-        running: false
-        repeat: false
-        onTriggered: hideToast()
-    }
-}

Services/UserInfoService.qml

@@ -1,115 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property string username: ""
-    property string fullName: ""
-    property string profilePicture: ""
-    property string uptime: ""
-    property string shortUptime: ""
-    property string hostname: ""
-    property bool profileAvailable: false
-
-    function getUserInfo() {
-        userInfoProcess.running = true
-    }
-
-    function getUptime() {
-        uptimeProcess.running = true
-    }
-
-    function refreshUserInfo() {
-        getUserInfo()
-        getUptime()
-    }
-
-    Component.onCompleted: {
-        getUserInfo()
-        getUptime()
-    }
-
-    Process {
-        id: userInfoProcess
-
-        command: ["bash", "-c", "echo \"$USER|$(getent passwd $USER | cut -d: -f5 | cut -d, -f1)|$(hostname)\""]
-        running: false
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-
-                root.username = "User"
-                root.fullName = "User"
-                root.hostname = "System"
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const parts = text.trim().split("|")
-                if (parts.length >= 3) {
-                    root.username = parts[0] || ""
-                    root.fullName = parts[1] || parts[0] || ""
-                    root.hostname = parts[2] || ""
-                }
-            }
-        }
-    }
-
-    Process {
-        id: uptimeProcess
-
-        command: ["cat", "/proc/uptime"]
-        running: false
-
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-                root.uptime = "Unknown"
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const seconds = parseInt(text.split(" ")[0])
-                const days = Math.floor(seconds / 86400)
-                const hours = Math.floor((seconds % 86400) / 3600)
-                const minutes = Math.floor((seconds % 3600) / 60)
-
-                const parts = []
-                if (days > 0) {
-                    parts.push(`${days} day${days === 1 ? "" : "s"}`)
-                }
-                if (hours > 0) {
-                    parts.push(`${hours} hour${hours === 1 ? "" : "s"}`)
-                }
-                if (minutes > 0) {
-                    parts.push(`${minutes} minute${minutes === 1 ? "" : "s"}`)
-                }
-
-                if (parts.length > 0) {
-                    root.uptime = `up ${parts.join(", ")}`
-                } else {
-                    root.uptime = `up ${seconds} seconds`
-                }
-
-                // Create short uptime format
-                let shortUptime = "up"
-                if (days > 0) {
-                    shortUptime += ` ${days}d`
-                }
-                if (hours > 0) {
-                    shortUptime += ` ${hours}h`
-                }
-                if (minutes > 0) {
-                    shortUptime += ` ${minutes}m`
-                }
-                root.shortUptime = shortUptime
-            }
-        }
-    }
-}

Services/VpnService.qml

@@ -1,246 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-// Minimal VPN controller backed by NetworkManager (nmcli + D-Bus monitor)
-Singleton {
-    id: root
-
-    property int refCount: 0
-
-    onRefCountChanged: {
-        console.log("VpnService: refCount changed to", refCount)
-        if (refCount > 0 && !nmMonitor.running) {
-            console.log("VpnService: Starting nmMonitor")
-            nmMonitor.running = true
-            refreshAll()
-        } else if (refCount === 0 && nmMonitor.running) {
-            console.log("VpnService: Stopping nmMonitor")
-            nmMonitor.running = false
-        }
-    }
-
-    // State
-    property bool available: true
-    property bool isBusy: false
-    property string errorMessage: ""
-
-    // Profiles discovered on the system
-    // [{ name, uuid, type }]
-    property var profiles: []
-
-    // Allow multiple active VPNs (set true to allow concurrent connections)
-    // Default: allow multiple, to align with NetworkManager capability
-    property bool singleActive: false
-
-    // Active VPN connections (may be multiple)
-    // Full list and convenience projections
-    property var activeConnections: [] // [{ name, uuid, device, state }]
-    property var activeUuids: []
-    property var activeNames: []
-    // Back-compat single values (first active if present)
-    property string activeUuid: activeUuids.length > 0 ? activeUuids[0] : ""
-    property string activeName: activeNames.length > 0 ? activeNames[0] : ""
-    property string activeDevice: activeConnections.length > 0 ? (activeConnections[0].device || "") : ""
-    property string activeState: activeConnections.length > 0 ? (activeConnections[0].state || "") : ""
-    property bool connected: activeUuids.length > 0
-
-    // Use implicit property notify signals (profilesChanged, activeUuidChanged, etc.)
-
-    function refreshAll() {
-        listProfiles()
-        refreshActive()
-    }
-
-    // Monitor NetworkManager changes and refresh on activity
-    Process {
-        id: nmMonitor
-        command: ["gdbus", "monitor", "--system", "--dest", "org.freedesktop.NetworkManager"]
-        running: false
-
-        stdout: SplitParser {
-            splitMarker: "\n"
-            onRead: line => {
-                if (line.includes("ActiveConnection") || line.includes("PropertiesChanged") || line.includes("StateChanged")) {
-                    refreshAll()
-                }
-            }
-        }
-    }
-
-    // Query all VPN profiles
-    function listProfiles() {
-        getProfiles.running = true
-    }
-
-    Process {
-        id: getProfiles
-        command: ["bash", "-lc", "nmcli -t -f NAME,UUID,TYPE connection show | while IFS=: read -r name uuid type; do case \"$type\" in vpn) svc=$(nmcli -g vpn.service-type connection show uuid \"$uuid\" 2>/dev/null); echo \"$name:$uuid:$type:$svc\" ;; wireguard) echo \"$name:$uuid:$type:\" ;; *) : ;; esac; done"]
-        running: false
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const lines = text.trim().length ? text.trim().split('\n') : []
-                const out = []
-                for (const line of lines) {
-                    const parts = line.split(':')
-                    if (parts.length >= 3 && (parts[2] === "vpn" || parts[2] === "wireguard")) {
-                        const svc = parts.length >= 4 ? parts[3] : ""
-                        out.push({ name: parts[0], uuid: parts[1], type: parts[2], serviceType: svc })
-                    }
-                }
-                root.profiles = out
-            }
-        }
-    }
-
-    // Query active VPN connection
-    function refreshActive() {
-        getActive.running = true
-    }
-
-    Process {
-        id: getActive
-        command: ["nmcli", "-t", "-f", "NAME,UUID,TYPE,DEVICE,STATE", "connection", "show", "--active"]
-        running: false
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const lines = text.trim().length ? text.trim().split('\n') : []
-                let act = []
-                for (const line of lines) {
-                    const parts = line.split(':')
-                    if (parts.length >= 5 && (parts[2] === "vpn" || parts[2] === "wireguard")) {
-                        act.push({ name: parts[0], uuid: parts[1], device: parts[3], state: parts[4] })
-                    }
-                }
-                root.activeConnections = act
-                root.activeUuids = act.map(a => a.uuid).filter(u => !!u)
-                root.activeNames = act.map(a => a.name).filter(n => !!n)
-            }
-        }
-    }
-
-    function isActiveUuid(uuid) {
-        return root.activeUuids && root.activeUuids.indexOf(uuid) !== -1
-    }
-
-    function _looksLikeUuid(s) {
-        // Very loose check for UUID pattern
-        return s && s.indexOf('-') !== -1 && s.length >= 8
-    }
-
-    function connect(uuidOrName) {
-        if (root.isBusy) return
-        root.isBusy = true
-        root.errorMessage = ""
-        if (root.singleActive) {
-            // Bring down all active VPNs, then bring up the requested one
-            const isUuid = _looksLikeUuid(uuidOrName)
-            const escaped = ('' + uuidOrName).replace(/'/g, "'\\''")
-            const upCmd = isUuid ? `nmcli connection up uuid '${escaped}'` : `nmcli connection up id '${escaped}'`
-            const script = `set -e\n` +
-                           `nmcli -t -f UUID,TYPE connection show --active | awk -F: '$2 ~ /^(vpn|wireguard)$/ {print $1}' | while read u; do [ -n \"$u\" ] && nmcli connection down uuid \"$u\" || true; done\n` +
-                           upCmd + `\n`
-            vpnSwitch.command = ["bash", "-lc", script]
-            vpnSwitch.running = true
-        } else {
-            if (_looksLikeUuid(uuidOrName)) {
-                vpnUp.command = ["nmcli", "connection", "up", "uuid", uuidOrName]
-            } else {
-                vpnUp.command = ["nmcli", "connection", "up", "id", uuidOrName]
-            }
-            vpnUp.running = true
-        }
-    }
-
-    function disconnect(uuidOrName) {
-        if (root.isBusy) return
-        root.isBusy = true
-        root.errorMessage = ""
-        if (_looksLikeUuid(uuidOrName)) {
-            vpnDown.command = ["nmcli", "connection", "down", "uuid", uuidOrName]
-        } else {
-            vpnDown.command = ["nmcli", "connection", "down", "id", uuidOrName]
-        }
-        vpnDown.running = true
-    }
-
-    function toggle(uuid) {
-        if (uuid) {
-            if (isActiveUuid(uuid)) disconnect(uuid)
-            else connect(uuid)
-            return
-        }
-        if (root.profiles.length > 0) {
-            connect(root.profiles[0].uuid)
-        }
-    }
-
-    Process {
-        id: vpnUp
-        running: false
-        stdout: StdioCollector {
-            onStreamFinished: {
-                root.isBusy = false
-                if (!text.toLowerCase().includes("successfully")) {
-                    root.errorMessage = text.trim()
-                }
-                refreshAll()
-            }
-        }
-        onExited: exitCode => {
-            root.isBusy = false
-            if (exitCode !== 0 && root.errorMessage === "") {
-                root.errorMessage = "Failed to connect VPN"
-            }
-        }
-    }
-
-    Process {
-        id: vpnDown
-        running: false
-        stdout: StdioCollector {
-            onStreamFinished: {
-                root.isBusy = false
-                if (!text.toLowerCase().includes("deactivated") && !text.toLowerCase().includes("successfully")) {
-                    root.errorMessage = text.trim()
-                }
-                refreshAll()
-            }
-        }
-        onExited: exitCode => {
-            root.isBusy = false
-            if (exitCode !== 0 && root.errorMessage === "") {
-                root.errorMessage = "Failed to disconnect VPN"
-            }
-        }
-    }
-
-    function disconnectAllActive() {
-        if (root.isBusy) return
-        root.isBusy = true
-        const script = `nmcli -t -f UUID,TYPE connection show --active | awk -F: '$2 ~ /^(vpn|wireguard)$/ {print $1}' | while read u; do [ -n \"$u\" ] && nmcli connection down uuid \"$u\" || true; done`
-        vpnSwitch.command = ["bash", "-lc", script]
-        vpnSwitch.running = true
-    }
-
-    // Sequenced down/up using a single shell for exclusive switch
-    Process {
-        id: vpnSwitch
-        running: false
-        stdout: StdioCollector {
-            onStreamFinished: {
-                root.isBusy = false
-                refreshAll()
-            }
-        }
-        onExited: exitCode => {
-            root.isBusy = false
-            if (exitCode !== 0 && root.errorMessage === "") {
-                root.errorMessage = "Failed to switch VPN"
-            }
-        }
-    }
-}

Widgets/DankIcon.qml

@@ -1,56 +0,0 @@
-import QtQuick
-import qs.Common
-
-StyledText {
-    id: icon
-
-    property alias name: icon.text
-    property alias size: icon.font.pixelSize
-    property alias color: icon.color
-    property bool filled: false
-    property real fill: filled ? 1.0 : 0.0
-    property int grade: Theme.isLightMode ? 0 : -25
-    property int weight: filled ? 500 : 400
-
-    signal rotationCompleted()
-
-    font.family: "Material Symbols Rounded"
-    font.pixelSize: Theme.fontSizeMedium
-    font.weight: weight
-    color: Theme.surfaceText
-    verticalAlignment: Text.AlignVCenter
-    horizontalAlignment: Text.AlignHCenter
-    renderType: Text.NativeRendering
-    antialiasing: true
-    font.variableAxes: {
-        "FILL": fill.toFixed(1),
-        "GRAD": grade,
-        "opsz": 24,
-        "wght": weight
-    }
-
-    Behavior on fill {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-    Behavior on weight {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-    Timer {
-        id: rotationTimer
-        interval: 16
-        repeat: false
-        onTriggered: icon.rotationCompleted()
-    }
-
-    onRotationChanged: {
-        rotationTimer.restart()
-    }
-}

Widgets/DankOSD.qml

@@ -1,155 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-
-PanelWindow {
-    id: root
-
-    property alias content: contentLoader.sourceComponent
-    property alias contentLoader: contentLoader
-    property var modelData
-    property bool shouldBeVisible: false
-    property int autoHideInterval: 2000
-    property bool enableMouseInteraction: false
-    property real osdWidth: Theme.iconSize + Theme.spacingS * 2
-    property real osdHeight: Theme.iconSize + Theme.spacingS * 2
-    property int animationDuration: Theme.mediumDuration
-    property var animationEasing: Theme.emphasizedEasing
-
-    signal osdShown
-    signal osdHidden
-
-    function show() {
-        closeTimer.stop()
-        shouldBeVisible = true
-        visible = true
-        hideTimer.restart()
-        osdShown()
-    }
-
-    function hide() {
-        shouldBeVisible = false
-        closeTimer.restart()
-    }
-
-    function updateHoverState() {
-        let isHovered = (enableMouseInteraction && mouseArea.containsMouse) || osdContainer.childHovered
-        if (enableMouseInteraction) {
-            if (isHovered) {
-                hideTimer.stop()
-            } else if (shouldBeVisible) {
-                hideTimer.restart()
-            }
-        }
-    }
-
-    function setChildHovered(hovered) {
-        osdContainer.childHovered = hovered
-        updateHoverState()
-    }
-
-    screen: modelData
-    visible: shouldBeVisible
-    WlrLayershell.layer: WlrLayershell.Overlay
-    WlrLayershell.exclusiveZone: -1
-    WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-    color: "transparent"
-
-    anchors {
-        top: true
-        left: true
-        right: true
-        bottom: true
-    }
-
-    Timer {
-        id: hideTimer
-
-        interval: autoHideInterval
-        repeat: false
-        onTriggered: {
-            if (!enableMouseInteraction || !mouseArea.containsMouse) {
-                hide()
-            } else {
-                hideTimer.restart()
-            }
-        }
-    }
-
-    Timer {
-        id: closeTimer
-        interval: animationDuration + 50
-        onTriggered: {
-            if (!shouldBeVisible) {
-                visible = false
-                osdHidden()
-            }
-        }
-    }
-
-    Rectangle {
-        id: osdContainer
-
-        property bool childHovered: false
-
-        width: osdWidth
-        height: osdHeight
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: Theme.spacingM
-        color: Theme.popupBackground()
-        radius: Theme.cornerRadius
-        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-        border.width: 1
-        opacity: shouldBeVisible ? 1 : 0
-        scale: shouldBeVisible ? 1 : 0.9
-        layer.enabled: true
-
-        MouseArea {
-            id: mouseArea
-            anchors.fill: parent
-            hoverEnabled: enableMouseInteraction
-            acceptedButtons: Qt.NoButton
-            propagateComposedEvents: true
-            z: -1
-            onContainsMouseChanged: updateHoverState()
-        }
-
-        onChildHoveredChanged: updateHoverState()
-
-        Loader {
-            id: contentLoader
-            anchors.fill: parent
-            active: root.visible
-            asynchronous: false
-        }
-
-        layer.effect: MultiEffect {
-            shadowEnabled: true
-            shadowHorizontalOffset: 0
-            shadowVerticalOffset: 4
-            shadowBlur: 0.8
-            shadowColor: Qt.rgba(0, 0, 0, 0.3)
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: animationDuration
-                easing.type: animationEasing
-            }
-        }
-
-        Behavior on scale {
-            NumberAnimation {
-                duration: animationDuration
-                easing.type: animationEasing
-            }
-        }
-    }
-
-    mask: Region {
-        item: osdContainer
-    }
-}