hyprland: remove focus grab from dankpopout

- Retains ability to click items on the bar, while another is open

.github/workflows/copr-release.yml

@@ -1,4 +1,4 @@
-name: DMS Copr Stable Release
+name: DMS Copr Stable Release (Manual)
 
 on:
   workflow_dispatch:

.github/workflows/release.yml

@@ -386,68 +386,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  trigger-obs-update:
-    runs-on: ubuntu-latest
-    needs: release
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      
-      - name: Install OSC
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y osc
-          
-          mkdir -p ~/.config/osc
-          cat > ~/.config/osc/oscrc << EOF
-          [general]
-          apiurl = https://api.opensuse.org
-          
-          [https://api.opensuse.org]
-          user = ${{ secrets.OBS_USERNAME }}
-          pass = ${{ secrets.OBS_PASSWORD }}
-          EOF
-          chmod 600 ~/.config/osc/oscrc
-      
-      - name: Update OBS packages
-        run: |
-          VERSION="${{ github.ref_name }}"
-          cd distro
-          bash scripts/obs-upload.sh dms "Update to $VERSION"
-
-  trigger-ppa-update:
-    runs-on: ubuntu-latest
-    needs: release
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            debhelper \
-            devscripts \
-            dput \
-            lftp \
-            build-essential \
-            fakeroot \
-            dpkg-dev
-      
-      - name: Configure GPG
-        env:
-          GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        run: |
-          echo "$GPG_KEY" | gpg --import
-          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
-          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
-      
-      - name: Upload to PPA
-        run: |
-          VERSION="${{ github.ref_name }}"
-          cd distro/ubuntu/ppa
-          bash create-and-upload.sh ../dms dms questing
-
   copr-build:
     runs-on: ubuntu-latest
     needs: release

.github/workflows/run-obs.yml

@@ -1,226 +0,0 @@
-name: Update OBS Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      package:
-        description: 'Package to update (dms, dms-git, or all)'
-        required: false
-        default: 'all'
-      rebuild_release:
-        description: 'Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)'
-        required: false
-        default: ''
-  push:
-    tags:
-      - 'v*'
-  schedule:
-    - cron: '0 */3 * * *'  # Every 3 hours for dms-git builds
-
-jobs:
-  check-updates:
-    name: Check for updates
-    runs-on: ubuntu-latest
-    
-    outputs:
-      has_updates: ${{ steps.check.outputs.has_updates }}
-      packages: ${{ steps.check.outputs.packages }}
-      version: ${{ steps.check.outputs.version }}
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      
-      - name: Install OSC
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y osc
-          
-          mkdir -p ~/.config/osc
-          cat > ~/.config/osc/oscrc << EOF
-          [general]
-          apiurl = https://api.opensuse.org
-          
-          [https://api.opensuse.org]
-          user = ${{ secrets.OBS_USERNAME }}
-          pass = ${{ secrets.OBS_PASSWORD }}
-          EOF
-          chmod 600 ~/.config/osc/oscrc
-      
-      - name: Check for updates
-        id: check
-        run: |
-          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
-            echo "packages=dms" >> $GITHUB_OUTPUT
-            VERSION="${GITHUB_REF#refs/tags/}"
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
-            echo "has_updates=true" >> $GITHUB_OUTPUT
-            echo "Triggered by tag: $VERSION (always update)"
-          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            echo "packages=dms-git" >> $GITHUB_OUTPUT
-            echo "Checking if dms-git source has changed..."
-            
-            # Get latest commit hash from master branch
-            LATEST_COMMIT=$(git rev-parse origin/master 2>/dev/null || git rev-parse master 2>/dev/null || echo "")
-            
-            if [[ -z "$LATEST_COMMIT" ]]; then
-              echo "has_updates=true" >> $GITHUB_OUTPUT
-              echo "Could not determine git commit, proceeding with update"
-            else
-              # Check OBS for last uploaded commit
-              OBS_BASE="$HOME/.cache/osc-checkouts"
-              mkdir -p "$OBS_BASE"
-              OBS_PROJECT="home:AvengeMedia:dms-git"
-              
-              if [[ -d "$OBS_BASE/$OBS_PROJECT/dms-git" ]]; then
-                cd "$OBS_BASE/$OBS_PROJECT/dms-git"
-                osc up -q 2>/dev/null || true
-                
-                # Check tarball age - if older than 3 hours, update needed
-                if [[ -f "dms-git-source.tar.gz" ]]; then
-                  TARBALL_MTIME=$(stat -c%Y "dms-git-source.tar.gz" 2>/dev/null || echo "0")
-                  CURRENT_TIME=$(date +%s)
-                  AGE_SECONDS=$((CURRENT_TIME - TARBALL_MTIME))
-                  AGE_HOURS=$((AGE_SECONDS / 3600))
-                  
-                  # If tarball is older than 3 hours, check for new commits
-                  if [[ $AGE_HOURS -ge 3 ]]; then
-                    # Check if there are new commits in the last 3 hours
-                    cd "${{ github.workspace }}"
-                    NEW_COMMITS=$(git log --since="3 hours ago" --oneline origin/master 2>/dev/null | wc -l)
-                    
-                    if [[ $NEW_COMMITS -gt 0 ]]; then
-                      echo "has_updates=true" >> $GITHUB_OUTPUT
-                      echo "📋 New commits detected in last 3 hours, update needed"
-                    else
-                      echo "has_updates=false" >> $GITHUB_OUTPUT
-                      echo "📋 No new commits in last 3 hours, skipping update"
-                    fi
-                  else
-                    echo "has_updates=false" >> $GITHUB_OUTPUT
-                    echo "📋 Recent upload exists (< 3 hours), skipping update"
-                  fi
-                else
-                  echo "has_updates=true" >> $GITHUB_OUTPUT
-                  echo "📋 No existing tarball in OBS, update needed"
-                fi
-                cd "${{ github.workspace }}"
-              else
-                echo "has_updates=true" >> $GITHUB_OUTPUT
-                echo "📋 First upload to OBS, update needed"
-              fi
-            fi
-          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
-            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
-            echo "has_updates=true" >> $GITHUB_OUTPUT
-            echo "Manual trigger: ${{ github.event.inputs.package }}"
-          else
-            echo "packages=all" >> $GITHUB_OUTPUT
-            echo "has_updates=true" >> $GITHUB_OUTPUT
-          fi
-
-  update-obs:
-    name: Upload to OBS
-    needs: check-updates
-    runs-on: ubuntu-latest
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      needs.check-updates.outputs.has_updates == 'true'
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      
-      - name: Determine packages to update
-        id: packages
-        run: |
-          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
-            echo "packages=dms" >> $GITHUB_OUTPUT
-            VERSION="${GITHUB_REF#refs/tags/}"
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
-            echo "Triggered by tag: $VERSION"
-          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
-            echo "Triggered by schedule: updating git package"
-          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
-            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
-            echo "Manual trigger: ${{ github.event.inputs.package }}"
-          else
-            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
-          fi
-      
-      - name: Update version in packaging files
-        if: steps.packages.outputs.version != ''
-        run: |
-          VERSION="${{ steps.packages.outputs.version }}"
-          VERSION_NO_V="${VERSION#v}"
-          echo "Updating packaging to version $VERSION_NO_V"
-          
-          # Update openSUSE spec files
-          sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/*.spec
-          
-          # Update Debian _service files
-          for service in distro/debian/*/_service; do
-            if [[ -f "$service" ]]; then
-              sed -i "s|<param name=\"revision\">v[0-9.]*</param>|<param name=\"revision\">$VERSION</param>|" "$service"
-            fi
-          done
-          
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add distro/
-          git commit -m "chore: update packaging to $VERSION" || echo "No changes to commit"
-      
-      - name: Install OSC
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y osc
-          
-          mkdir -p ~/.config/osc
-          cat > ~/.config/osc/oscrc << EOF
-          [general]
-          apiurl = https://api.opensuse.org
-          
-          [https://api.opensuse.org]
-          user = ${{ secrets.OBS_USERNAME }}
-          pass = ${{ secrets.OBS_PASSWORD }}
-          EOF
-          chmod 600 ~/.config/osc/oscrc
-      
-      - name: Upload to OBS
-        env:
-          FORCE_REBUILD: ${{ github.event_name == 'workflow_dispatch' && 'true' || '' }}
-          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
-        run: |
-          PACKAGES="${{ steps.packages.outputs.packages }}"
-          MESSAGE="Automated update from GitHub Actions"
-          
-          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
-            MESSAGE="Update to ${{ steps.packages.outputs.version }}"
-          fi
-          
-          cd distro
-          
-          if [[ "$PACKAGES" == "all" ]]; then
-            bash scripts/obs-upload.sh dms "$MESSAGE"
-            bash scripts/obs-upload.sh dms-git "Automated git update"
-          else
-            bash scripts/obs-upload.sh "$PACKAGES" "$MESSAGE"
-          fi
-      
-      - name: Summary
-        run: |
-          echo "### OBS Package Update Complete" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
-          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
-            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-          fi
-          if [[ "${{ needs.check-updates.outputs.has_updates }}" == "false" ]]; then
-            echo "- **Status**: Skipped (no changes detected)" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "- **Project**: https://build.opensuse.org/project/show/home:AvengeMedia" >> $GITHUB_STEP_SUMMARY

.github/workflows/run-ppa.yml

@@ -1,110 +0,0 @@
-name: Update PPA Packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      package:
-        description: 'Package to upload (dms, dms-git, or all)'
-        required: false
-        default: 'dms-git'
-      rebuild_release:
-        description: 'Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)'
-        required: false
-        default: ''
-  schedule:
-    - cron: '0 */3 * * *'  # Every 3 hours for dms-git builds
-
-jobs:
-  upload-ppa:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            debhelper \
-            devscripts \
-            dput \
-            lftp \
-            build-essential \
-            fakeroot \
-            dpkg-dev
-      
-      - name: Configure GPG
-        env:
-          GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        run: |
-          echo "$GPG_KEY" | gpg --import
-          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
-          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
-      
-      - name: Determine packages to upload
-        id: packages
-        run: |
-          if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            echo "packages=dms-git" >> $GITHUB_OUTPUT
-            echo "Triggered by schedule: uploading git package"
-          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
-            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
-            echo "Manual trigger: ${{ github.event.inputs.package }}"
-          else
-            echo "packages=dms-git" >> $GITHUB_OUTPUT
-          fi
-      
-      - name: Upload to PPA
-        env:
-          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
-        run: |
-          PACKAGES="${{ steps.packages.outputs.packages }}"
-          
-          cd distro/ubuntu/ppa
-          
-          if [[ "$PACKAGES" == "all" ]]; then
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            echo "Uploading dms to PPA..."
-            if [ -n "$REBUILD_RELEASE" ]; then
-              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
-            fi
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash create-and-upload.sh "../dms" dms questing
-            
-            echo ""
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            echo "Uploading dms-git to PPA..."
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash create-and-upload.sh "../dms-git" dms-git questing
-          else
-            PPA_NAME="$PACKAGES"
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            echo "Uploading $PACKAGES to PPA..."
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            bash create-and-upload.sh "../$PACKAGES" "$PPA_NAME" questing
-          fi
-      
-      - name: Summary
-        run: |
-          echo "### PPA Package Upload Complete" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
-          
-          PACKAGES="${{ steps.packages.outputs.packages }}"
-          if [[ "$PACKAGES" == "all" ]]; then
-            echo "- **PPA dms**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
-            echo "- **PPA dms-git**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
-          elif [[ "$PACKAGES" == "dms" ]]; then
-            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
-          elif [[ "$PACKAGES" == "dms-git" ]]; then
-            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
-          fi
-          
-          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
-            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "Builds will appear once Launchpad processes the uploads." >> $GITHUB_STEP_SUMMARY

.gitignore

@@ -136,9 +136,3 @@ go.work.sum
 # .vscode/
 
 bin/
-
-# Extracted source trees in Ubuntu package directories  
-distro/ubuntu/*/dms-git-repo/
-distro/ubuntu/*/DankMaterialShell-*/
-distro/ubuntu/danklinux/*/dsearch-*/
-distro/ubuntu/danklinux/*/dgop-*/

CONTRIBUTING.md

@@ -2,42 +2,28 @@
 
 Contributions are welcome and encouraged.
 
-To contribute fork this repository, make your changes, and open a pull request.
+## Formatting
 
-## VSCode Setup
+The preferred tool for formatting files is [qmlfmt](https://github.com/jesperhh/qmlfmt) (also available on aur as qmlfmt-git). It actually kinda sucks, but `qmlformat` doesn't work with null safe operators and ternarys and pragma statements and a bunch of other things that are supported.
 
-This is a monorepo, the easiest thing to do is to open an editor in either `quickshell`, `core`, or both depending on which part of the project you are working on.
+We need some consistent style, so this at least gives the same formatter that Qt Creator uses.
 
-### QML (`quickshell` directory)
-
-1. Install the [QML Extension](https://doc.qt.io/vscodeext/)
-2. Configure `ctrl+shift+p` -> user preferences (json) with qmlls path
+You can configure it to format on save in vscode by configuring the "custom local formatters" extension then adding this to settings json.
 
 ```json
-{
-  "qt-qml.doNotAskForQmllsDownload": true,
-  "qt-qml.qmlls.customExePath": "/usr/lib/qt6/bin/qmlls"
-}
+  "customLocalFormatters.formatters": [
+    {
+      "command": "sh -c \"qmlfmt -t 4 -i 4 -b 250 | sed 's/pragma ComponentBehavior$/pragma ComponentBehavior: Bound/g'\"",
+      "languages": ["qml"]
+    }
+  ],
+  "[qml]": {
+    "editor.defaultFormatter": "jkillian.custom-local-formatters",
+    "editor.formatOnSave": true
+  },
 ```
 
-3. Create empty `.qmlls.ini` file in `quickshell/` directory
-
-```bash
-cd quickshell
-touch .qmlls.ini
-```
-
-4. Restart dms to generate the `.qmlls.ini` file
-
-5. Make your changes, test, and open a pull request.
-
-### GO (`core` directory)
-
-1. Install the [Go Extension](https://code.visualstudio.com/docs/languages/go)
-2. Ensure code is formatted with `make fmt`
-3. Add appropriate test coverage and ensure tests pass with `make test`
-4. Run `go mod tidy`
-5. Open pull request
+Sometimes it just breaks code though. Like turning `"_\""` into `"_""`, so you may not want to do formatOnSave.
 
 ## Pull request
 

README.md

@@ -19,7 +19,7 @@
 
 </div>
 
-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.
+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), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop.
 
 ## Repository Structure
 
@@ -105,7 +105,7 @@ Extend functionality with the [plugin registry](https://plugins.danklinux.com).
 
 ## Supported Compositors
 
-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.
+Works best with [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [Sway](https://swaywm.org/), and [MangoWC](https://github.com/DreamMaoMao/mangowc) with full workspace switching, overview integration, and monitor management. Other Wayland compositors work with reduced features.
 
 [Compositor configuration guide](https://danklinux.com/docs/dankmaterialshell/compositors)
 
@@ -183,10 +183,6 @@ For documentation contributions, see [DankLinux-Docs](https://github.com/AvengeM
 - [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.

core/.mockery.yml

@@ -28,7 +28,7 @@ packages:
       outpkg: mocks_brightness
     interfaces:
       DBusConn:
-  github.com/AvengeMedia/DankMaterialShell/core/internal/server/network:
+  github.com/AvengeMedia/danklinux/internal/server/network:
     config:
       dir: "internal/mocks/network"
       outpkg: mocks_network

core/cmd/dms/commands_common.go

@@ -368,7 +368,6 @@ func getCommonCommands() []*cobra.Command {
 		pluginsCmd,
 		dank16Cmd,
 		brightnessCmd,
-		dpmsCmd,
 		keybindsCmd,
 		greeterCmd,
 		setupCmd,

core/cmd/dms/commands_dpms.go

@@ -1,84 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/spf13/cobra"
-)
-
-var dpmsCmd = &cobra.Command{
-	Use:   "dpms",
-	Short: "Control display power management",
-}
-
-var dpmsOnCmd = &cobra.Command{
-	Use:   "on [output]",
-	Short: "Turn display(s) on",
-	Args:  cobra.MaximumNArgs(1),
-	Run:   runDPMSOn,
-}
-
-var dpmsOffCmd = &cobra.Command{
-	Use:   "off [output]",
-	Short: "Turn display(s) off",
-	Args:  cobra.MaximumNArgs(1),
-	Run:   runDPMSOff,
-}
-
-var dpmsListCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List outputs",
-	Args:  cobra.NoArgs,
-	Run:   runDPMSList,
-}
-
-func init() {
-	dpmsCmd.AddCommand(dpmsOnCmd, dpmsOffCmd, dpmsListCmd)
-}
-
-func runDPMSOn(cmd *cobra.Command, args []string) {
-	outputName := ""
-	if len(args) > 0 {
-		outputName = args[0]
-	}
-
-	client, err := newDPMSClient()
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
-	defer client.Close()
-
-	if err := client.SetDPMS(outputName, true); err != nil {
-		log.Fatalf("%v", err)
-	}
-}
-
-func runDPMSOff(cmd *cobra.Command, args []string) {
-	outputName := ""
-	if len(args) > 0 {
-		outputName = args[0]
-	}
-
-	client, err := newDPMSClient()
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
-	defer client.Close()
-
-	if err := client.SetDPMS(outputName, false); err != nil {
-		log.Fatalf("%v", err)
-	}
-}
-
-func runDPMSList(cmd *cobra.Command, args []string) {
-	client, err := newDPMSClient()
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
-	defer client.Close()
-
-	for _, output := range client.ListOutputs() {
-		fmt.Println(output)
-	}
-}

core/cmd/dms/dpms_client.go

@@ -1,345 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_power"
-	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-)
-
-type cmd struct {
-	fn   func()
-	done chan error
-}
-
-type dpmsClient struct {
-	display   *wlclient.Display
-	ctx       *wlclient.Context
-	powerMgr  *wlr_output_power.ZwlrOutputPowerManagerV1
-	outputs   map[string]*outputState
-	mu        sync.Mutex
-	syncRound int
-	done      bool
-	err       error
-	cmdq      chan cmd
-	stopChan  chan struct{}
-	wg        sync.WaitGroup
-}
-
-type outputState struct {
-	wlOutput  *wlclient.Output
-	powerCtrl *wlr_output_power.ZwlrOutputPowerV1
-	name      string
-	mode      uint32
-	failed    bool
-	waitCh    chan struct{}
-	wantMode  *uint32
-}
-
-func (c *dpmsClient) post(fn func()) {
-	done := make(chan error, 1)
-	select {
-	case c.cmdq <- cmd{fn: fn, done: done}:
-		<-done
-	case <-c.stopChan:
-	}
-}
-
-func (c *dpmsClient) waylandActor() {
-	defer c.wg.Done()
-	for {
-		select {
-		case <-c.stopChan:
-			return
-		case cmd := <-c.cmdq:
-			cmd.fn()
-			close(cmd.done)
-		}
-	}
-}
-
-func newDPMSClient() (*dpmsClient, error) {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect to Wayland: %w", err)
-	}
-
-	c := &dpmsClient{
-		display:  display,
-		ctx:      display.Context(),
-		outputs:  make(map[string]*outputState),
-		cmdq:     make(chan cmd, 128),
-		stopChan: make(chan struct{}),
-	}
-
-	c.wg.Add(1)
-	go c.waylandActor()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		display.Context().Close()
-		return nil, fmt.Errorf("failed to get registry: %w", err)
-	}
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case wlr_output_power.ZwlrOutputPowerManagerV1InterfaceName:
-			powerMgr := wlr_output_power.NewZwlrOutputPowerManagerV1(c.ctx)
-			version := e.Version
-			if version > 1 {
-				version = 1
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, powerMgr); err == nil {
-				c.powerMgr = powerMgr
-			}
-
-		case "wl_output":
-			output := wlclient.NewOutput(c.ctx)
-			version := e.Version
-			if version > 4 {
-				version = 4
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, output); err == nil {
-				outputID := fmt.Sprintf("output-%d", output.ID())
-				state := &outputState{
-					wlOutput: output,
-					name:     outputID,
-				}
-
-				c.mu.Lock()
-				c.outputs[outputID] = state
-				c.mu.Unlock()
-
-				output.SetNameHandler(func(ev wlclient.OutputNameEvent) {
-					c.mu.Lock()
-					delete(c.outputs, state.name)
-					state.name = ev.Name
-					c.outputs[ev.Name] = state
-					c.mu.Unlock()
-				})
-			}
-		}
-	})
-
-	syncCallback, err := display.Sync()
-	if err != nil {
-		c.Close()
-		return nil, fmt.Errorf("failed to sync display: %w", err)
-	}
-	syncCallback.SetDoneHandler(func(e wlclient.CallbackDoneEvent) {
-		c.handleSync()
-	})
-
-	for !c.done {
-		if err := c.ctx.Dispatch(); err != nil {
-			c.Close()
-			return nil, fmt.Errorf("dispatch error: %w", err)
-		}
-	}
-
-	if c.err != nil {
-		c.Close()
-		return nil, c.err
-	}
-
-	return c, nil
-}
-
-func (c *dpmsClient) handleSync() {
-	c.syncRound++
-
-	switch c.syncRound {
-	case 1:
-		if c.powerMgr == nil {
-			c.err = fmt.Errorf("wlr-output-power-management protocol not supported by compositor")
-			c.done = true
-			return
-		}
-
-		c.mu.Lock()
-		for _, state := range c.outputs {
-			powerCtrl, err := c.powerMgr.GetOutputPower(state.wlOutput)
-			if err != nil {
-				continue
-			}
-			state.powerCtrl = powerCtrl
-
-			powerCtrl.SetModeHandler(func(e wlr_output_power.ZwlrOutputPowerV1ModeEvent) {
-				c.mu.Lock()
-				defer c.mu.Unlock()
-				if state.powerCtrl == nil {
-					return
-				}
-				state.mode = e.Mode
-				if state.wantMode != nil && e.Mode == *state.wantMode && state.waitCh != nil {
-					close(state.waitCh)
-					state.wantMode = nil
-				}
-			})
-
-			powerCtrl.SetFailedHandler(func(e wlr_output_power.ZwlrOutputPowerV1FailedEvent) {
-				c.mu.Lock()
-				defer c.mu.Unlock()
-				if state.powerCtrl == nil {
-					return
-				}
-				state.failed = true
-				if state.waitCh != nil {
-					close(state.waitCh)
-					state.wantMode = nil
-				}
-			})
-		}
-		c.mu.Unlock()
-
-		syncCallback, err := c.display.Sync()
-		if err != nil {
-			c.err = fmt.Errorf("failed to sync display: %w", err)
-			c.done = true
-			return
-		}
-		syncCallback.SetDoneHandler(func(e wlclient.CallbackDoneEvent) {
-			c.handleSync()
-		})
-
-	default:
-		c.done = true
-	}
-}
-
-func (c *dpmsClient) ListOutputs() []string {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	names := make([]string, 0, len(c.outputs))
-	for name := range c.outputs {
-		names = append(names, name)
-	}
-	return names
-}
-
-func (c *dpmsClient) SetDPMS(outputName string, on bool) error {
-	var mode uint32
-	if on {
-		mode = uint32(wlr_output_power.ZwlrOutputPowerV1ModeOn)
-	} else {
-		mode = uint32(wlr_output_power.ZwlrOutputPowerV1ModeOff)
-	}
-
-	var setErr error
-	c.post(func() {
-		c.mu.Lock()
-		var waitStates []*outputState
-
-		if outputName == "" || outputName == "all" {
-			if len(c.outputs) == 0 {
-				c.mu.Unlock()
-				setErr = fmt.Errorf("no outputs found")
-				return
-			}
-
-			for _, state := range c.outputs {
-				if state.powerCtrl == nil {
-					continue
-				}
-				state.wantMode = &mode
-				state.waitCh = make(chan struct{})
-				state.failed = false
-				waitStates = append(waitStates, state)
-				state.powerCtrl.SetMode(mode)
-			}
-		} else {
-			state, ok := c.outputs[outputName]
-			if !ok {
-				c.mu.Unlock()
-				setErr = fmt.Errorf("output not found: %s", outputName)
-				return
-			}
-			if state.powerCtrl == nil {
-				c.mu.Unlock()
-				setErr = fmt.Errorf("output %s has nil powerCtrl", outputName)
-				return
-			}
-			state.wantMode = &mode
-			state.waitCh = make(chan struct{})
-			state.failed = false
-			waitStates = append(waitStates, state)
-			state.powerCtrl.SetMode(mode)
-		}
-		c.mu.Unlock()
-
-		deadline := time.Now().Add(10 * time.Second)
-
-		for _, state := range waitStates {
-			c.mu.Lock()
-			ch := state.waitCh
-			c.mu.Unlock()
-
-			done := false
-			for !done {
-				if err := c.ctx.Dispatch(); err != nil {
-					setErr = fmt.Errorf("dispatch error: %w", err)
-					return
-				}
-
-				select {
-				case <-ch:
-					c.mu.Lock()
-					if state.failed {
-						setErr = fmt.Errorf("compositor reported failed for %s", state.name)
-						c.mu.Unlock()
-						return
-					}
-					c.mu.Unlock()
-					done = true
-				default:
-					if time.Now().After(deadline) {
-						setErr = fmt.Errorf("timeout waiting for mode change on %s", state.name)
-						return
-					}
-					time.Sleep(10 * time.Millisecond)
-				}
-			}
-		}
-
-		c.mu.Lock()
-		for _, state := range waitStates {
-			if state.powerCtrl != nil {
-				state.powerCtrl.Destroy()
-				state.powerCtrl = nil
-			}
-		}
-		c.mu.Unlock()
-
-		c.display.Roundtrip()
-	})
-
-	return setErr
-}
-
-func (c *dpmsClient) Close() {
-	close(c.stopChan)
-	c.wg.Wait()
-
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	for _, state := range c.outputs {
-		if state.powerCtrl != nil {
-			state.powerCtrl.Destroy()
-		}
-	}
-	c.outputs = nil
-
-	if c.powerMgr != nil {
-		c.powerMgr.Destroy()
-		c.powerMgr = nil
-	}
-
-	if c.display != nil {
-		c.ctx.Close()
-		c.display = nil
-	}
-}

core/cmd/dms/shell.go

@@ -57,11 +57,6 @@ func getRuntimeDir() string {
 	return os.TempDir()
 }
 
-func hasSystemdRun() bool {
-	_, err := exec.LookPath("systemd-run")
-	return err == nil
-}
-
 func getPIDFilePath() string {
 	return filepath.Join(getRuntimeDir(), fmt.Sprintf("danklinux-%d.pid", os.Getpid()))
 }
@@ -170,10 +165,6 @@ func runShellInteractive(session bool) {
 		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
 	}
 
-	if isSessionManaged && hasSystemdRun() {
-		cmd.Env = append(cmd.Env, "DMS_DEFAULT_LAUNCH_PREFIX=systemd-run --user --scope")
-	}
-
 	homeDir, err := os.UserHomeDir()
 	if err == nil && os.Getenv("DMS_DISABLE_HOT_RELOAD") == "" {
 		if !strings.HasPrefix(configPath, homeDir) {
@@ -396,10 +387,6 @@ func runShellDaemon(session bool) {
 		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
 	}
 
-	if isSessionManaged && hasSystemdRun() {
-		cmd.Env = append(cmd.Env, "DMS_DEFAULT_LAUNCH_PREFIX=systemd-run --user --scope")
-	}
-
 	homeDir, err := os.UserHomeDir()
 	if err == nil && os.Getenv("DMS_DISABLE_HOT_RELOAD") == "" {
 		if !strings.HasPrefix(configPath, homeDir) {

core/internal/config/embedded/hyprland.conf

@@ -125,8 +125,6 @@ windowrulev2 = noborder, class:^(kitty)$
 windowrulev2 = float, class:^(firefox)$, title:^(Picture-in-Picture)$
 windowrulev2 = float, class:^(zoom)$
 
-# DMS windows floating by default
-windowrulev2 = float, class:^(org.quickshell)$
 windowrulev2 = opacity 0.9 0.9, floating:0, focus:0
 
 layerrule = noanim, ^(quickshell)$

core/internal/config/embedded/niri.kdl

@@ -218,11 +218,6 @@ window-rule {
     geometry-corner-radius 12
     clip-to-geometry true
 }
-// Open dms windows as floating by default
-window-rule {
-    match app-id=r#"org.quickshell$"#
-    open-floating true
-}
 binds {
     // === System & Overview ===
     Mod+D { spawn "niri" "msg" "action" "toggle-overview"; }

core/internal/distros/fedora.go

@@ -19,12 +19,10 @@ func init() {
 	Register("fedora-asahi-remix", "#0B57A4", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewFedoraDistribution(config, logChan)
 	})
+
 	Register("bluefin", "#0B57A4", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewFedoraDistribution(config, logChan)
 	})
-	Register("ultramarine", "#00078b", FamilyFedora, func(config DistroConfig, logChan chan<- string) Distribution {
-		return NewFedoraDistribution(config, logChan)
-	})
 }
 
 type FedoraDistribution struct {
@@ -508,14 +506,6 @@ func (f *FedoraDistribution) installDNFPackages(ctx context.Context, packages []
 	f.log(fmt.Sprintf("Installing DNF packages: %s", strings.Join(packages, ", ")))
 
 	args := []string{"dnf", "install", "-y"}
-
-	for _, pkg := range packages {
-		if pkg == "niri" || pkg == "niri-git" {
-			args = append(args, "--setopt=install_weak_deps=False")
-			break
-		}
-	}
-
 	args = append(args, packages...)
 
 	progressChan <- InstallProgressMsg{

core/internal/mocks/network/mock_Backend.go

@@ -509,52 +509,6 @@ func (_c *MockBackend_DisconnectWiFi_Call) RunAndReturn(run func() error) *MockB
 	return _c
 }
 
-// DisconnectWiFiDevice provides a mock function with given fields: device
-func (_m *MockBackend) DisconnectWiFiDevice(device string) error {
-	ret := _m.Called(device)
-
-	if len(ret) == 0 {
-		panic("no return value specified for DisconnectWiFiDevice")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(device)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// MockBackend_DisconnectWiFiDevice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DisconnectWiFiDevice'
-type MockBackend_DisconnectWiFiDevice_Call struct {
-	*mock.Call
-}
-
-// DisconnectWiFiDevice is a helper method to define mock.On call
-//   - device string
-func (_e *MockBackend_Expecter) DisconnectWiFiDevice(device interface{}) *MockBackend_DisconnectWiFiDevice_Call {
-	return &MockBackend_DisconnectWiFiDevice_Call{Call: _e.mock.On("DisconnectWiFiDevice", device)}
-}
-
-func (_c *MockBackend_DisconnectWiFiDevice_Call) Run(run func(device string)) *MockBackend_DisconnectWiFiDevice_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(string))
-	})
-	return _c
-}
-
-func (_c *MockBackend_DisconnectWiFiDevice_Call) Return(_a0 error) *MockBackend_DisconnectWiFiDevice_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockBackend_DisconnectWiFiDevice_Call) RunAndReturn(run func(string) error) *MockBackend_DisconnectWiFiDevice_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // ForgetWiFiNetwork provides a mock function with given fields: ssid
 func (_m *MockBackend) ForgetWiFiNetwork(ssid string) error {
 	ret := _m.Called(ssid)
@@ -705,53 +659,6 @@ func (_c *MockBackend_GetPromptBroker_Call) RunAndReturn(run func() network.Prom
 	return _c
 }
 
-// GetWiFiDevices provides a mock function with no fields
-func (_m *MockBackend) GetWiFiDevices() []network.WiFiDevice {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetWiFiDevices")
-	}
-
-	var r0 []network.WiFiDevice
-	if rf, ok := ret.Get(0).(func() []network.WiFiDevice); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]network.WiFiDevice)
-		}
-	}
-
-	return r0
-}
-
-// MockBackend_GetWiFiDevices_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWiFiDevices'
-type MockBackend_GetWiFiDevices_Call struct {
-	*mock.Call
-}
-
-// GetWiFiDevices is a helper method to define mock.On call
-func (_e *MockBackend_Expecter) GetWiFiDevices() *MockBackend_GetWiFiDevices_Call {
-	return &MockBackend_GetWiFiDevices_Call{Call: _e.mock.On("GetWiFiDevices")}
-}
-
-func (_c *MockBackend_GetWiFiDevices_Call) Run(run func()) *MockBackend_GetWiFiDevices_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockBackend_GetWiFiDevices_Call) Return(_a0 []network.WiFiDevice) *MockBackend_GetWiFiDevices_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockBackend_GetWiFiDevices_Call) RunAndReturn(run func() []network.WiFiDevice) *MockBackend_GetWiFiDevices_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // GetWiFiEnabled provides a mock function with no fields
 func (_m *MockBackend) GetWiFiEnabled() (bool, error) {
 	ret := _m.Called()
@@ -1184,52 +1091,6 @@ func (_c *MockBackend_ScanWiFi_Call) RunAndReturn(run func() error) *MockBackend
 	return _c
 }
 
-// ScanWiFiDevice provides a mock function with given fields: device
-func (_m *MockBackend) ScanWiFiDevice(device string) error {
-	ret := _m.Called(device)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ScanWiFiDevice")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(device)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// MockBackend_ScanWiFiDevice_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ScanWiFiDevice'
-type MockBackend_ScanWiFiDevice_Call struct {
-	*mock.Call
-}
-
-// ScanWiFiDevice is a helper method to define mock.On call
-//   - device string
-func (_e *MockBackend_Expecter) ScanWiFiDevice(device interface{}) *MockBackend_ScanWiFiDevice_Call {
-	return &MockBackend_ScanWiFiDevice_Call{Call: _e.mock.On("ScanWiFiDevice", device)}
-}
-
-func (_c *MockBackend_ScanWiFiDevice_Call) Run(run func(device string)) *MockBackend_ScanWiFiDevice_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(string))
-	})
-	return _c
-}
-
-func (_c *MockBackend_ScanWiFiDevice_Call) Return(_a0 error) *MockBackend_ScanWiFiDevice_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockBackend_ScanWiFiDevice_Call) RunAndReturn(run func(string) error) *MockBackend_ScanWiFiDevice_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // SetPromptBroker provides a mock function with given fields: broker
 func (_m *MockBackend) SetPromptBroker(broker network.PromptBroker) error {
 	ret := _m.Called(broker)

core/internal/proto/dwl_ipc/dwl_ipc.go

@@ -157,16 +157,6 @@ type ZdwlIpcOutputV2 struct {
 	appidHandler            ZdwlIpcOutputV2AppidHandlerFunc
 	layoutSymbolHandler     ZdwlIpcOutputV2LayoutSymbolHandlerFunc
 	frameHandler            ZdwlIpcOutputV2FrameHandlerFunc
-	fullscreenHandler       ZdwlIpcOutputV2FullscreenHandlerFunc
-	floatingHandler         ZdwlIpcOutputV2FloatingHandlerFunc
-	xHandler                ZdwlIpcOutputV2XHandlerFunc
-	yHandler                ZdwlIpcOutputV2YHandlerFunc
-	widthHandler            ZdwlIpcOutputV2WidthHandlerFunc
-	heightHandler           ZdwlIpcOutputV2HeightHandlerFunc
-	lastLayerHandler        ZdwlIpcOutputV2LastLayerHandlerFunc
-	kbLayoutHandler         ZdwlIpcOutputV2KbLayoutHandlerFunc
-	keymodeHandler          ZdwlIpcOutputV2KeymodeHandlerFunc
-	scalefactorHandler      ZdwlIpcOutputV2ScalefactorHandlerFunc
 }
 
 // NewZdwlIpcOutputV2 : control dwl output
@@ -261,60 +251,6 @@ func (i *ZdwlIpcOutputV2) SetLayout(index uint32) error {
 	return err
 }
 
-// Quit : Quit mango
-// This request allows clients to instruct the compositor to quit mango.
-func (i *ZdwlIpcOutputV2) Quit() error {
-	const opcode = 4
-	const _reqBufLen = 8
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// SendDispatch : Set the active tags of this output
-//
-//	dispatch: dispatch name.
-//	arg1: arg1.
-//	arg2: arg2.
-//	arg3: arg3.
-//	arg4: arg4.
-//	arg5: arg5.
-func (i *ZdwlIpcOutputV2) SendDispatch(dispatch, arg1, arg2, arg3, arg4, arg5 string) error {
-	const opcode = 5
-	dispatchLen := client.PaddedLen(len(dispatch) + 1)
-	arg1Len := client.PaddedLen(len(arg1) + 1)
-	arg2Len := client.PaddedLen(len(arg2) + 1)
-	arg3Len := client.PaddedLen(len(arg3) + 1)
-	arg4Len := client.PaddedLen(len(arg4) + 1)
-	arg5Len := client.PaddedLen(len(arg5) + 1)
-	_reqBufLen := 8 + (4 + dispatchLen) + (4 + arg1Len) + (4 + arg2Len) + (4 + arg3Len) + (4 + arg4Len) + (4 + arg5Len)
-	_reqBuf := make([]byte, _reqBufLen)
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutString(_reqBuf[l:l+(4+dispatchLen)], dispatch)
-	l += (4 + dispatchLen)
-	client.PutString(_reqBuf[l:l+(4+arg1Len)], arg1)
-	l += (4 + arg1Len)
-	client.PutString(_reqBuf[l:l+(4+arg2Len)], arg2)
-	l += (4 + arg2Len)
-	client.PutString(_reqBuf[l:l+(4+arg3Len)], arg3)
-	l += (4 + arg3Len)
-	client.PutString(_reqBuf[l:l+(4+arg4Len)], arg4)
-	l += (4 + arg4Len)
-	client.PutString(_reqBuf[l:l+(4+arg5Len)], arg5)
-	l += (4 + arg5Len)
-	err := i.Context().WriteMsg(_reqBuf, nil)
-	return err
-}
-
 type ZdwlIpcOutputV2TagState uint32
 
 // ZdwlIpcOutputV2TagState :
@@ -463,136 +399,6 @@ func (i *ZdwlIpcOutputV2) SetFrameHandler(f ZdwlIpcOutputV2FrameHandlerFunc) {
 	i.frameHandler = f
 }
 
-// ZdwlIpcOutputV2FullscreenEvent : Update fullscreen status
-//
-// Indicates if the selected client on this output is fullscreen.
-type ZdwlIpcOutputV2FullscreenEvent struct {
-	IsFullscreen uint32
-}
-type ZdwlIpcOutputV2FullscreenHandlerFunc func(ZdwlIpcOutputV2FullscreenEvent)
-
-// SetFullscreenHandler : sets handler for ZdwlIpcOutputV2FullscreenEvent
-func (i *ZdwlIpcOutputV2) SetFullscreenHandler(f ZdwlIpcOutputV2FullscreenHandlerFunc) {
-	i.fullscreenHandler = f
-}
-
-// ZdwlIpcOutputV2FloatingEvent : Update the floating status
-//
-// Indicates if the selected client on this output is floating.
-type ZdwlIpcOutputV2FloatingEvent struct {
-	IsFloating uint32
-}
-type ZdwlIpcOutputV2FloatingHandlerFunc func(ZdwlIpcOutputV2FloatingEvent)
-
-// SetFloatingHandler : sets handler for ZdwlIpcOutputV2FloatingEvent
-func (i *ZdwlIpcOutputV2) SetFloatingHandler(f ZdwlIpcOutputV2FloatingHandlerFunc) {
-	i.floatingHandler = f
-}
-
-// ZdwlIpcOutputV2XEvent : Update the x coordinates
-//
-// Indicates if x coordinates of the selected client.
-type ZdwlIpcOutputV2XEvent struct {
-	X int32
-}
-type ZdwlIpcOutputV2XHandlerFunc func(ZdwlIpcOutputV2XEvent)
-
-// SetXHandler : sets handler for ZdwlIpcOutputV2XEvent
-func (i *ZdwlIpcOutputV2) SetXHandler(f ZdwlIpcOutputV2XHandlerFunc) {
-	i.xHandler = f
-}
-
-// ZdwlIpcOutputV2YEvent : Update the y coordinates
-//
-// Indicates if y coordinates of the selected client.
-type ZdwlIpcOutputV2YEvent struct {
-	Y int32
-}
-type ZdwlIpcOutputV2YHandlerFunc func(ZdwlIpcOutputV2YEvent)
-
-// SetYHandler : sets handler for ZdwlIpcOutputV2YEvent
-func (i *ZdwlIpcOutputV2) SetYHandler(f ZdwlIpcOutputV2YHandlerFunc) {
-	i.yHandler = f
-}
-
-// ZdwlIpcOutputV2WidthEvent : Update the width
-//
-// Indicates if width of the selected client.
-type ZdwlIpcOutputV2WidthEvent struct {
-	Width int32
-}
-type ZdwlIpcOutputV2WidthHandlerFunc func(ZdwlIpcOutputV2WidthEvent)
-
-// SetWidthHandler : sets handler for ZdwlIpcOutputV2WidthEvent
-func (i *ZdwlIpcOutputV2) SetWidthHandler(f ZdwlIpcOutputV2WidthHandlerFunc) {
-	i.widthHandler = f
-}
-
-// ZdwlIpcOutputV2HeightEvent : Update the height
-//
-// Indicates if height of the selected client.
-type ZdwlIpcOutputV2HeightEvent struct {
-	Height int32
-}
-type ZdwlIpcOutputV2HeightHandlerFunc func(ZdwlIpcOutputV2HeightEvent)
-
-// SetHeightHandler : sets handler for ZdwlIpcOutputV2HeightEvent
-func (i *ZdwlIpcOutputV2) SetHeightHandler(f ZdwlIpcOutputV2HeightHandlerFunc) {
-	i.heightHandler = f
-}
-
-// ZdwlIpcOutputV2LastLayerEvent : last map layer.
-//
-// last map layer.
-type ZdwlIpcOutputV2LastLayerEvent struct {
-	LastLayer string
-}
-type ZdwlIpcOutputV2LastLayerHandlerFunc func(ZdwlIpcOutputV2LastLayerEvent)
-
-// SetLastLayerHandler : sets handler for ZdwlIpcOutputV2LastLayerEvent
-func (i *ZdwlIpcOutputV2) SetLastLayerHandler(f ZdwlIpcOutputV2LastLayerHandlerFunc) {
-	i.lastLayerHandler = f
-}
-
-// ZdwlIpcOutputV2KbLayoutEvent : current keyboard layout.
-//
-// current keyboard layout.
-type ZdwlIpcOutputV2KbLayoutEvent struct {
-	KbLayout string
-}
-type ZdwlIpcOutputV2KbLayoutHandlerFunc func(ZdwlIpcOutputV2KbLayoutEvent)
-
-// SetKbLayoutHandler : sets handler for ZdwlIpcOutputV2KbLayoutEvent
-func (i *ZdwlIpcOutputV2) SetKbLayoutHandler(f ZdwlIpcOutputV2KbLayoutHandlerFunc) {
-	i.kbLayoutHandler = f
-}
-
-// ZdwlIpcOutputV2KeymodeEvent : current keybind mode.
-//
-// current keybind mode.
-type ZdwlIpcOutputV2KeymodeEvent struct {
-	Keymode string
-}
-type ZdwlIpcOutputV2KeymodeHandlerFunc func(ZdwlIpcOutputV2KeymodeEvent)
-
-// SetKeymodeHandler : sets handler for ZdwlIpcOutputV2KeymodeEvent
-func (i *ZdwlIpcOutputV2) SetKeymodeHandler(f ZdwlIpcOutputV2KeymodeHandlerFunc) {
-	i.keymodeHandler = f
-}
-
-// ZdwlIpcOutputV2ScalefactorEvent : scale factor of monitor.
-//
-// scale factor of monitor.
-type ZdwlIpcOutputV2ScalefactorEvent struct {
-	Scalefactor uint32
-}
-type ZdwlIpcOutputV2ScalefactorHandlerFunc func(ZdwlIpcOutputV2ScalefactorEvent)
-
-// SetScalefactorHandler : sets handler for ZdwlIpcOutputV2ScalefactorEvent
-func (i *ZdwlIpcOutputV2) SetScalefactorHandler(f ZdwlIpcOutputV2ScalefactorHandlerFunc) {
-	i.scalefactorHandler = f
-}
-
 func (i *ZdwlIpcOutputV2) Dispatch(opcode uint32, fd int, data []byte) {
 	switch opcode {
 	case 0:
@@ -681,111 +487,5 @@ func (i *ZdwlIpcOutputV2) Dispatch(opcode uint32, fd int, data []byte) {
 		var e ZdwlIpcOutputV2FrameEvent
 
 		i.frameHandler(e)
-	case 8:
-		if i.fullscreenHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2FullscreenEvent
-		l := 0
-		e.IsFullscreen = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.fullscreenHandler(e)
-	case 9:
-		if i.floatingHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2FloatingEvent
-		l := 0
-		e.IsFloating = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.floatingHandler(e)
-	case 10:
-		if i.xHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2XEvent
-		l := 0
-		e.X = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.xHandler(e)
-	case 11:
-		if i.yHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2YEvent
-		l := 0
-		e.Y = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.yHandler(e)
-	case 12:
-		if i.widthHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2WidthEvent
-		l := 0
-		e.Width = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.widthHandler(e)
-	case 13:
-		if i.heightHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2HeightEvent
-		l := 0
-		e.Height = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.heightHandler(e)
-	case 14:
-		if i.lastLayerHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2LastLayerEvent
-		l := 0
-		lastLayerLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.LastLayer = client.String(data[l : l+lastLayerLen])
-		l += lastLayerLen
-
-		i.lastLayerHandler(e)
-	case 15:
-		if i.kbLayoutHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2KbLayoutEvent
-		l := 0
-		kbLayoutLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.KbLayout = client.String(data[l : l+kbLayoutLen])
-		l += kbLayoutLen
-
-		i.kbLayoutHandler(e)
-	case 16:
-		if i.keymodeHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2KeymodeEvent
-		l := 0
-		keymodeLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.Keymode = client.String(data[l : l+keymodeLen])
-		l += keymodeLen
-
-		i.keymodeHandler(e)
-	case 17:
-		if i.scalefactorHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2ScalefactorEvent
-		l := 0
-		e.Scalefactor = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.scalefactorHandler(e)
 	}
 }

core/internal/proto/wlr_output_power/output_power.go

@@ -1,283 +0,0 @@
-// Generated by go-wayland-scanner
-// https://github.com/yaslama/go-wayland/cmd/go-wayland-scanner
-// XML file : internal/proto/xml/wlr-output-power-management-unstable-v1.xml
-//
-// wlr_output_power_management_unstable_v1 Protocol Copyright:
-//
-// Copyright © 2019 Purism SPC
-//
-// 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 (including the next
-// paragraph) 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.
-
-package wlr_output_power
-
-import "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-
-// ZwlrOutputPowerManagerV1InterfaceName is the name of the interface as it appears in the [client.Registry].
-// It can be used to match the [client.RegistryGlobalEvent.Interface] in the
-// [Registry.SetGlobalHandler] and can be used in [Registry.Bind] if this applies.
-const ZwlrOutputPowerManagerV1InterfaceName = "zwlr_output_power_manager_v1"
-
-// ZwlrOutputPowerManagerV1 : manager to create per-output power management
-//
-// This interface is a manager that allows creating per-output power
-// management mode controls.
-type ZwlrOutputPowerManagerV1 struct {
-	client.BaseProxy
-}
-
-// NewZwlrOutputPowerManagerV1 : manager to create per-output power management
-//
-// This interface is a manager that allows creating per-output power
-// management mode controls.
-func NewZwlrOutputPowerManagerV1(ctx *client.Context) *ZwlrOutputPowerManagerV1 {
-	zwlrOutputPowerManagerV1 := &ZwlrOutputPowerManagerV1{}
-	ctx.Register(zwlrOutputPowerManagerV1)
-	return zwlrOutputPowerManagerV1
-}
-
-// GetOutputPower : get a power management for an output
-//
-// Create an output power management mode control that can be used to
-// adjust the power management mode for a given output.
-func (i *ZwlrOutputPowerManagerV1) GetOutputPower(output *client.Output) (*ZwlrOutputPowerV1, error) {
-	id := NewZwlrOutputPowerV1(i.Context())
-	const opcode = 0
-	const _reqBufLen = 8 + 4 + 4
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], id.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], output.ID())
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return id, err
-}
-
-// Destroy : destroy the manager
-//
-// All objects created by the manager will still remain valid, until their
-// appropriate destroy request has been called.
-func (i *ZwlrOutputPowerManagerV1) Destroy() error {
-	defer i.Context().Unregister(i)
-	const opcode = 1
-	const _reqBufLen = 8
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// ZwlrOutputPowerV1InterfaceName is the name of the interface as it appears in the [client.Registry].
-// It can be used to match the [client.RegistryGlobalEvent.Interface] in the
-// [Registry.SetGlobalHandler] and can be used in [Registry.Bind] if this applies.
-const ZwlrOutputPowerV1InterfaceName = "zwlr_output_power_v1"
-
-// ZwlrOutputPowerV1 : adjust power management mode for an output
-//
-// This object offers requests to set the power management mode of
-// an output.
-type ZwlrOutputPowerV1 struct {
-	client.BaseProxy
-	modeHandler   ZwlrOutputPowerV1ModeHandlerFunc
-	failedHandler ZwlrOutputPowerV1FailedHandlerFunc
-}
-
-// NewZwlrOutputPowerV1 : adjust power management mode for an output
-//
-// This object offers requests to set the power management mode of
-// an output.
-func NewZwlrOutputPowerV1(ctx *client.Context) *ZwlrOutputPowerV1 {
-	zwlrOutputPowerV1 := &ZwlrOutputPowerV1{}
-	ctx.Register(zwlrOutputPowerV1)
-	return zwlrOutputPowerV1
-}
-
-// SetMode : Set an outputs power save mode
-//
-// Set an output's power save mode to the given mode. The mode change
-// is effective immediately. If the output does not support the given
-// mode a failed event is sent.
-//
-//	mode: the power save mode to set
-func (i *ZwlrOutputPowerV1) SetMode(mode uint32) error {
-	const opcode = 0
-	const _reqBufLen = 8 + 4
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(mode))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// Destroy : destroy this power management
-//
-// Destroys the output power management mode control object.
-func (i *ZwlrOutputPowerV1) Destroy() error {
-	defer i.Context().Unregister(i)
-	const opcode = 1
-	const _reqBufLen = 8
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-type ZwlrOutputPowerV1Mode uint32
-
-// ZwlrOutputPowerV1Mode :
-const (
-	// ZwlrOutputPowerV1ModeOff : Output is turned off.
-	ZwlrOutputPowerV1ModeOff ZwlrOutputPowerV1Mode = 0
-	// ZwlrOutputPowerV1ModeOn : Output is turned on, no power saving
-	ZwlrOutputPowerV1ModeOn ZwlrOutputPowerV1Mode = 1
-)
-
-func (e ZwlrOutputPowerV1Mode) Name() string {
-	switch e {
-	case ZwlrOutputPowerV1ModeOff:
-		return "off"
-	case ZwlrOutputPowerV1ModeOn:
-		return "on"
-	default:
-		return ""
-	}
-}
-
-func (e ZwlrOutputPowerV1Mode) Value() string {
-	switch e {
-	case ZwlrOutputPowerV1ModeOff:
-		return "0"
-	case ZwlrOutputPowerV1ModeOn:
-		return "1"
-	default:
-		return ""
-	}
-}
-
-func (e ZwlrOutputPowerV1Mode) String() string {
-	return e.Name() + "=" + e.Value()
-}
-
-type ZwlrOutputPowerV1Error uint32
-
-// ZwlrOutputPowerV1Error :
-const (
-	// ZwlrOutputPowerV1ErrorInvalidMode : nonexistent power save mode
-	ZwlrOutputPowerV1ErrorInvalidMode ZwlrOutputPowerV1Error = 1
-)
-
-func (e ZwlrOutputPowerV1Error) Name() string {
-	switch e {
-	case ZwlrOutputPowerV1ErrorInvalidMode:
-		return "invalid_mode"
-	default:
-		return ""
-	}
-}
-
-func (e ZwlrOutputPowerV1Error) Value() string {
-	switch e {
-	case ZwlrOutputPowerV1ErrorInvalidMode:
-		return "1"
-	default:
-		return ""
-	}
-}
-
-func (e ZwlrOutputPowerV1Error) String() string {
-	return e.Name() + "=" + e.Value()
-}
-
-// ZwlrOutputPowerV1ModeEvent : Report a power management mode change
-//
-// Report the power management mode change of an output.
-//
-// The mode event is sent after an output changed its power
-// management mode. The reason can be a client using set_mode or the
-// compositor deciding to change an output's mode.
-// This event is also sent immediately when the object is created
-// so the client is informed about the current power management mode.
-type ZwlrOutputPowerV1ModeEvent struct {
-	Mode uint32
-}
-type ZwlrOutputPowerV1ModeHandlerFunc func(ZwlrOutputPowerV1ModeEvent)
-
-// SetModeHandler : sets handler for ZwlrOutputPowerV1ModeEvent
-func (i *ZwlrOutputPowerV1) SetModeHandler(f ZwlrOutputPowerV1ModeHandlerFunc) {
-	i.modeHandler = f
-}
-
-// ZwlrOutputPowerV1FailedEvent : object no longer valid
-//
-// This event indicates that the output power management mode control
-// is no longer valid. This can happen for a number of reasons,
-// including:
-// - The output doesn't support power management
-// - Another client already has exclusive power management mode control
-// for this output
-// - The output disappeared
-//
-// Upon receiving this event, the client should destroy this object.
-type ZwlrOutputPowerV1FailedEvent struct{}
-type ZwlrOutputPowerV1FailedHandlerFunc func(ZwlrOutputPowerV1FailedEvent)
-
-// SetFailedHandler : sets handler for ZwlrOutputPowerV1FailedEvent
-func (i *ZwlrOutputPowerV1) SetFailedHandler(f ZwlrOutputPowerV1FailedHandlerFunc) {
-	i.failedHandler = f
-}
-
-func (i *ZwlrOutputPowerV1) Dispatch(opcode uint32, fd int, data []byte) {
-	switch opcode {
-	case 0:
-		if i.modeHandler == nil {
-			return
-		}
-		var e ZwlrOutputPowerV1ModeEvent
-		l := 0
-		e.Mode = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.modeHandler(e)
-	case 1:
-		if i.failedHandler == nil {
-			return
-		}
-		var e ZwlrOutputPowerV1FailedEvent
-
-		i.failedHandler(e)
-	}
-}

core/internal/proto/xml/dwl-ipc-unstable-v2.xml

@@ -19,7 +19,7 @@ I would probably just submit raphi's patchset but I don't think that would be po
       reset.
   </description>
 
-  <interface name="zdwl_ipc_manager_v2" version="2">
+  <interface name="zdwl_ipc_manager_v2" version="1">
     <description summary="manage dwl state">
       This interface is exposed as a global in wl_registry.
 
@@ -60,7 +60,7 @@ I would probably just submit raphi's patchset but I don't think that would be po
     </event>
   </interface>
 
-  <interface name="zdwl_ipc_output_v2" version="2">
+  <interface name="zdwl_ipc_output_v2" version="1">
     <description summary="control dwl output">
       Observe and control a dwl output.
 
@@ -162,91 +162,5 @@ I would probably just submit raphi's patchset but I don't think that would be po
       <description summary="Set the layout of this output"/>
       <arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
     </request>
-
-    <request name="quit" since="2">
-      <description summary="Quit mango">This request allows clients to instruct the compositor to quit mango.</description>
-    </request>
-
-    <request name="dispatch" since="2">
-      <description summary="Set the active tags of this output"/>
-      <arg name="dispatch" type="string" summary="dispatch name."/>
-      <arg name="arg1" type="string" summary="arg1."/>
-      <arg name="arg2" type="string" summary="arg2."/>
-      <arg name="arg3" type="string" summary="arg3."/>
-      <arg name="arg4" type="string" summary="arg4."/>
-      <arg name="arg5" type="string" summary="arg5."/>
-    </request>
-
-    <!-- Version 2 -->
-    <event name="fullscreen" since="2">
-      <description summary="Update fullscreen status">
-          Indicates if the selected client on this output is fullscreen.
-      </description>
-      <arg name="is_fullscreen" type="uint" summary="If the selected client is fullscreen. Nonzero is valid, zero invalid"/>
-    </event>
-
-    <event name="floating" since="2">
-      <description summary="Update the floating status">
-          Indicates if the selected client on this output is floating.
-      </description>
-      <arg name="is_floating" type="uint" summary="If the selected client is floating. Nonzero is valid, zero invalid"/>
-    </event>
-
-    <event name="x" since="2">
-      <description summary="Update the x coordinates">
-          Indicates if x coordinates of the selected client.
-      </description>
-      <arg name="x" type="int" summary="x coordinate of the selected client"/>
-    </event>
-
-    <event name="y" since="2">
-      <description summary="Update the y coordinates">
-          Indicates if y coordinates of the selected client.
-      </description>
-      <arg name="y" type="int" summary="y coordinate of the selected client"/>
-    </event>
-
-    <event name="width" since="2">
-      <description summary="Update the width">
-          Indicates if width of the selected client.
-      </description>
-      <arg name="width" type="int" summary="width of the selected client"/>
-    </event>
-
-    <event name="height" since="2">
-      <description summary="Update the height">
-          Indicates if height of the selected client.
-      </description>
-      <arg name="height" type="int" summary="height of the selected client"/>
-    </event>
-
-    <event name="last_layer" since="2">
-      <description summary="last map layer.">
-        last map layer.
-      </description>
-      <arg name="last_layer" type="string" summary="last map layer."/>
-    </event>
-
-    <event name="kb_layout" since="2">
-      <description summary="current keyboard layout.">
-        current keyboard layout.
-      </description>
-      <arg name="kb_layout" type="string" summary="current keyboard layout."/>
-    </event>
-
-    <event name="keymode" since="2">
-      <description summary="current keybind mode.">
-        current keybind mode.
-      </description>
-      <arg name="keymode" type="string" summary="current keybind mode."/>
-    </event>
-
-    <event name="scalefactor" since="2">
-      <description summary="scale factor of monitor.">
-        scale factor of monitor.
-      </description>
-      <arg name="scalefactor" type="uint" summary="scale factor of monitor."/>
-    </event>
-
   </interface>
 </protocol>

core/internal/proto/xml/wlr-output-power-management-unstable-v1.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_output_power_management_unstable_v1">
-  <copyright>
-    Copyright © 2019 Purism SPC
-
-    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 (including the next
-    paragraph) 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.
-  </copyright>
-
-  <description summary="Control power management modes of outputs">
-    This protocol allows clients to control power management modes
-    of outputs that are currently part of the compositor space. The
-    intent is to allow special clients like desktop shells to power
-    down outputs when the system is idle.
-
-    To modify outputs not currently part of the compositor space see
-    wlr-output-management.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
-  </description>
-
-  <interface name="zwlr_output_power_manager_v1" version="1">
-    <description summary="manager to create per-output power management">
-      This interface is a manager that allows creating per-output power
-      management mode controls.
-    </description>
-
-    <request name="get_output_power">
-      <description summary="get a power management for an output">
-        Create an output power management mode control that can be used to
-        adjust the power management mode for a given output.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_output_power_v1"/>
-      <arg name="output" type="object" interface="wl_output"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the manager">
-        All objects created by the manager will still remain valid, until their
-        appropriate destroy request has been called.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwlr_output_power_v1" version="1">
-    <description summary="adjust power management mode for an output">
-      This object offers requests to set the power management mode of
-      an output.
-    </description>
-
-    <enum name="mode">
-      <entry name="off" value="0"
-             summary="Output is turned off."/>
-      <entry name="on" value="1"
-             summary="Output is turned on, no power saving"/>
-    </enum>
-
-    <enum name="error">
-      <entry name="invalid_mode" value="1" summary="nonexistent power save mode"/>
-    </enum>
-
-    <request name="set_mode">
-      <description summary="Set an outputs power save mode">
-        Set an output's power save mode to the given mode. The mode change
-        is effective immediately. If the output does not support the given
-        mode a failed event is sent.
-      </description>
-      <arg name="mode" type="uint" enum="mode" summary="the power save mode to set"/>
-    </request>
-
-    <event name="mode">
-      <description summary="Report a power management mode change">
-        Report the power management mode change of an output.
-
-        The mode event is sent after an output changed its power
-        management mode. The reason can be a client using set_mode or the
-        compositor deciding to change an output's mode.
-        This event is also sent immediately when the object is created
-        so the client is informed about the current power management mode.
-      </description>
-      <arg name="mode" type="uint" enum="mode"
-           summary="the output's new power management mode"/>
-    </event>
-
-    <event name="failed">
-      <description summary="object no longer valid">
-        This event indicates that the output power management mode control
-        is no longer valid. This can happen for a number of reasons,
-        including:
-        - The output doesn't support power management
-        - Another client already has exclusive power management mode control
-          for this output
-        - The output disappeared
-
-        Upon receiving this event, the client should destroy this object.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy this power management">
-        Destroys the output power management mode control object.
-      </description>
-    </request>
-  </interface>
-</protocol>

core/internal/server/bluez/agent.go

@@ -165,11 +165,12 @@ func (a *BluezAgent) DisplayPasskey(device dbus.ObjectPath, passkey uint32, ente
 	log.Infof("[BluezAgent] DisplayPasskey: device=%s, passkey=%06d, entered=%d", device, passkey, entered)
 
 	if entered == 0 {
-		passkeyStr := strconv.FormatUint(uint64(passkey), 10)
-		_, err := a.promptFor(device, "display-passkey", []string{}, &passkeyStr)
+		pk := passkey
+		_, err := a.promptFor(device, "display-passkey", []string{}, nil)
 		if err != nil {
 			log.Warnf("[BluezAgent] DisplayPasskey acknowledgment failed: %v", err)
 		}
+		_ = pk
 	}
 
 	return nil
@@ -178,8 +179,7 @@ func (a *BluezAgent) DisplayPasskey(device dbus.ObjectPath, passkey uint32, ente
 func (a *BluezAgent) RequestConfirmation(device dbus.ObjectPath, passkey uint32) *dbus.Error {
 	log.Infof("[BluezAgent] RequestConfirmation: device=%s, passkey=%06d", device, passkey)
 
-	passkeyStr := strconv.FormatUint(uint64(passkey), 10)
-	secrets, err := a.promptFor(device, "confirm", []string{"decision"}, &passkeyStr)
+	secrets, err := a.promptFor(device, "confirm", []string{"decision"}, nil)
 	if err != nil {
 		log.Warnf("[BluezAgent] RequestConfirmation failed: %v", err)
 		return a.errorFrom(err)

core/internal/server/bluez/manager.go

@@ -354,25 +354,21 @@ func (m *Manager) handleDevicePropertiesChanged(path dbus.ObjectPath, changed ma
 	_, hasTrusted := changed["Trusted"]
 
 	if hasPaired {
-		devicePath := string(path)
-		if paired, ok := pairedVar.Value().(bool); ok {
-			if paired {
-				_, wasPending := m.pendingPairings.LoadAndDelete(devicePath)
+		if paired, ok := pairedVar.Value().(bool); ok && paired {
+			devicePath := string(path)
+			_, wasPending := m.pendingPairings.LoadAndDelete(devicePath)
 
-				if wasPending {
-					select {
-					case m.eventQueue <- func() {
-						time.Sleep(300 * time.Millisecond)
-						log.Infof("[Bluetooth] Auto-connecting newly paired device: %s", devicePath)
-						if err := m.ConnectDevice(devicePath); err != nil {
-							log.Warnf("[Bluetooth] Auto-connect failed: %v", err)
-						}
-					}:
-					default:
+			if wasPending {
+				select {
+				case m.eventQueue <- func() {
+					time.Sleep(300 * time.Millisecond)
+					log.Infof("[Bluetooth] Auto-connecting newly paired device: %s", devicePath)
+					if err := m.ConnectDevice(devicePath); err != nil {
+						log.Warnf("[Bluetooth] Auto-connect failed: %v", err)
 					}
+				}:
+				default:
 				}
-			} else {
-				m.pendingPairings.Delete(devicePath)
 			}
 		}
 	}

core/internal/server/dwl/manager.go

@@ -100,8 +100,8 @@ func (m *Manager) setupRegistry() error {
 			log.Infof("DWL: found %s", dwl_ipc.ZdwlIpcManagerV2InterfaceName)
 			manager := dwl_ipc.NewZdwlIpcManagerV2(m.ctx)
 			version := e.Version
-			if version > 2 {
-				version = 2
+			if version > 1 {
+				version = 1
 			}
 			if err := registry.Bind(e.Name, e.Interface, version, manager); err == nil {
 				dwlMgr = manager
@@ -282,14 +282,6 @@ func (m *Manager) setupOutput(manager *dwl_ipc.ZdwlIpcManagerV2, output *wlclien
 		outState.layoutSymbol = e.Layout
 	})
 
-	ipcOutput.SetKbLayoutHandler(func(e dwl_ipc.ZdwlIpcOutputV2KbLayoutEvent) {
-		outState.kbLayout = e.KbLayout
-	})
-
-	ipcOutput.SetKeymodeHandler(func(e dwl_ipc.ZdwlIpcOutputV2KeymodeEvent) {
-		outState.keymode = e.Keymode
-	})
-
 	ipcOutput.SetFrameHandler(func(e dwl_ipc.ZdwlIpcOutputV2FrameEvent) {
 		m.updateState()
 	})
@@ -318,8 +310,6 @@ func (m *Manager) updateState() {
 			LayoutSymbol: out.layoutSymbol,
 			Title:        out.title,
 			AppID:        out.appID,
-			KbLayout:     out.kbLayout,
-			Keymode:      out.keymode,
 		}
 
 		if out.active != 0 {

core/internal/server/dwl/types.go

@@ -22,8 +22,6 @@ type OutputState struct {
 	LayoutSymbol string     `json:"layoutSymbol"`
 	Title        string     `json:"title"`
 	AppID        string     `json:"appId"`
-	KbLayout     string     `json:"kbLayout"`
-	Keymode      string     `json:"keymode"`
 }
 
 type State struct {
@@ -75,8 +73,6 @@ type outputState struct {
 	layoutSymbol string
 	title        string
 	appID        string
-	kbLayout     string
-	keymode      string
 }
 
 func (m *Manager) GetState() State {
@@ -151,12 +147,6 @@ func stateChanged(old, new *State) bool {
 		if oldOut.AppID != newOut.AppID {
 			return true
 		}
-		if oldOut.KbLayout != newOut.KbLayout {
-			return true
-		}
-		if oldOut.Keymode != newOut.Keymode {
-			return true
-		}
 		if len(oldOut.Tags) != len(newOut.Tags) {
 			return true
 		}

core/internal/server/extworkspace/manager.go

@@ -9,35 +9,6 @@ import (
 	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
 )
 
-func CheckCapability() bool {
-	display, err := wlclient.Connect("")
-	if err != nil {
-		return false
-	}
-	defer display.Destroy()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return false
-	}
-	defer registry.Destroy()
-
-	found := false
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		if e.Interface == ext_workspace.ExtWorkspaceManagerV1InterfaceName {
-			found = true
-		}
-	})
-
-	// Roundtrip to ensure all registry events are processed
-	if err := display.Roundtrip(); err != nil {
-		return false
-	}
-
-	return found
-}
-
 func NewManager(display *wlclient.Display) (*Manager, error) {
 	m := &Manager{
 		display:  display,
@@ -104,9 +75,6 @@ func (m *Manager) setupRegistry() error {
 				output.SetNameHandler(func(ev wlclient.OutputNameEvent) {
 					m.outputNames.Store(outputID, ev.Name)
 					log.Debugf("ExtWorkspace: Output %d (%s) name received", outputID, ev.Name)
-					m.post(func() {
-						m.updateState()
-					})
 				})
 			}
 			return
@@ -327,8 +295,14 @@ func (m *Manager) updateState() {
 
 		outputs := make([]string, 0)
 		for outputID := range group.outputIDs {
-			if name, ok := m.outputNames.Load(outputID); ok && name != "" {
-				outputs = append(outputs, name)
+			if name, ok := m.outputNames.Load(outputID); ok {
+				if name != "" {
+					outputs = append(outputs, name)
+				} else {
+					outputs = append(outputs, fmt.Sprintf("output-%d", outputID))
+				}
+			} else {
+				outputs = append(outputs, fmt.Sprintf("output-%d", outputID))
 			}
 		}
 

core/internal/server/network/agent_networkmanager.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strconv"
 	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
@@ -126,9 +125,8 @@ func (a *SecretAgent) GetSecrets(
 	connType, displayName, vpnSvc := readConnTypeAndName(conn)
 	ssid := readSSID(conn)
 	fields := fieldsNeeded(settingName, hints)
-	vpnPasswordFlags := readVPNPasswordFlags(conn, settingName)
 
-	log.Infof("[SecretAgent] connType=%s, name=%s, vpnSvc=%s, fields=%v, flags=%d, vpnPasswordFlags=%d", connType, displayName, vpnSvc, fields, flags, vpnPasswordFlags)
+	log.Infof("[SecretAgent] connType=%s, name=%s, vpnSvc=%s, fields=%v, flags=%d", connType, displayName, vpnSvc, fields, flags)
 
 	if a.backend != nil {
 		a.backend.stateMutex.RLock()
@@ -165,70 +163,57 @@ func (a *SecretAgent) GetSecrets(
 	}
 
 	if len(fields) == 0 {
+		// For VPN connections with no hints, we can't provide a proper UI.
+		// Defer to other agents (like nm-applet or VPN-specific auth dialogs)
+		// that can handle the VPN type properly (e.g., OpenConnect with SAML, etc.)
 		if settingName == "vpn" {
-			if a.backend != nil {
-				a.backend.stateMutex.RLock()
-				isConnectingVPN := a.backend.state.IsConnectingVPN
-				a.backend.stateMutex.RUnlock()
+			log.Infof("[SecretAgent] VPN with empty hints - deferring to other agents for %s", vpnSvc)
+			return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
+		}
 
-				if !isConnectingVPN {
-					log.Infof("[SecretAgent] VPN with empty hints - deferring to other agents for %s", vpnSvc)
-					return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
+		const (
+			NM_SETTING_SECRET_FLAG_NONE         = 0
+			NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 1
+			NM_SETTING_SECRET_FLAG_NOT_SAVED    = 2
+			NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 4
+		)
+
+		var passwordFlags uint32 = 0xFFFF
+		switch settingName {
+		case "802-11-wireless-security":
+			if wifiSecSettings, ok := conn["802-11-wireless-security"]; ok {
+				if flagsVariant, ok := wifiSecSettings["psk-flags"]; ok {
+					if pwdFlags, ok := flagsVariant.Value().(uint32); ok {
+						passwordFlags = pwdFlags
+					}
+				}
+			}
+		case "802-1x":
+			if dot1xSettings, ok := conn["802-1x"]; ok {
+				if flagsVariant, ok := dot1xSettings["password-flags"]; ok {
+					if pwdFlags, ok := flagsVariant.Value().(uint32); ok {
+						passwordFlags = pwdFlags
+					}
 				}
-
-				log.Infof("[SecretAgent] VPN with empty hints but we're connecting - prompting for password")
-				fields = []string{"password"}
-			} else {
-				log.Infof("[SecretAgent] VPN with empty hints - deferring to other agents for %s", vpnSvc)
-				return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
 			}
 		}
 
-		if len(fields) == 0 {
-			const (
-				NM_SETTING_SECRET_FLAG_NONE         = 0
-				NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 1
-				NM_SETTING_SECRET_FLAG_NOT_SAVED    = 2
-				NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 4
-			)
-
-			var passwordFlags uint32 = 0xFFFF
-			switch settingName {
-			case "802-11-wireless-security":
-				if wifiSecSettings, ok := conn["802-11-wireless-security"]; ok {
-					if flagsVariant, ok := wifiSecSettings["psk-flags"]; ok {
-						if pwdFlags, ok := flagsVariant.Value().(uint32); ok {
-							passwordFlags = pwdFlags
-						}
-					}
-				}
-			case "802-1x":
-				if dot1xSettings, ok := conn["802-1x"]; ok {
-					if flagsVariant, ok := dot1xSettings["password-flags"]; ok {
-						if pwdFlags, ok := flagsVariant.Value().(uint32); ok {
-							passwordFlags = pwdFlags
-						}
-					}
-				}
-			}
-
-			if passwordFlags == 0xFFFF {
-				log.Warnf("[SecretAgent] Could not determine password-flags for empty hints - returning NoSecrets error")
-				return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
-			} else if passwordFlags&NM_SETTING_SECRET_FLAG_NOT_REQUIRED != 0 {
-				log.Infof("[SecretAgent] Secrets not required (flags=%d)", passwordFlags)
-				out := nmSettingMap{}
-				out[settingName] = nmVariantMap{}
-				return out, nil
-			} else if passwordFlags&NM_SETTING_SECRET_FLAG_AGENT_OWNED != 0 {
-				log.Warnf("[SecretAgent] Secrets are agent-owned but we don't store secrets (flags=%d) - returning NoSecrets error", passwordFlags)
-				return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
-			} else {
-				log.Infof("[SecretAgent] No secrets needed, using system stored secrets (flags=%d)", passwordFlags)
-				out := nmSettingMap{}
-				out[settingName] = nmVariantMap{}
-				return out, nil
-			}
+		if passwordFlags == 0xFFFF {
+			log.Warnf("[SecretAgent] Could not determine password-flags for empty hints - returning NoSecrets error")
+			return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
+		} else if passwordFlags&NM_SETTING_SECRET_FLAG_NOT_REQUIRED != 0 {
+			log.Infof("[SecretAgent] Secrets not required (flags=%d)", passwordFlags)
+			out := nmSettingMap{}
+			out[settingName] = nmVariantMap{}
+			return out, nil
+		} else if passwordFlags&NM_SETTING_SECRET_FLAG_AGENT_OWNED != 0 {
+			log.Warnf("[SecretAgent] Secrets are agent-owned but we don't store secrets (flags=%d) - returning NoSecrets error", passwordFlags)
+			return nil, dbus.NewError("org.freedesktop.NetworkManager.SecretAgent.Error.NoSecrets", nil)
+		} else {
+			log.Infof("[SecretAgent] No secrets needed, using system stored secrets (flags=%d)", passwordFlags)
+			out := nmSettingMap{}
+			out[settingName] = nmVariantMap{}
+			return out, nil
 		}
 	}
 
@@ -358,11 +343,13 @@ func (a *SecretAgent) GetSecrets(
 			// Update settings based on type
 			switch settingName {
 			case "vpn":
+				// Set password-flags=0 and add secrets to vpn section
 				vpn, ok := existingSettings["vpn"]
 				if !ok {
 					vpn = make(map[string]dbus.Variant)
 				}
 
+				// Get existing data map (vpn.data is string->string)
 				var data map[string]string
 				if dataVariant, ok := vpn["data"]; ok {
 					if dm, ok := dataVariant.Value().(map[string]string); ok {
@@ -377,9 +364,11 @@ func (a *SecretAgent) GetSecrets(
 					data = make(map[string]string)
 				}
 
+				// Update password-flags to 0 (system-stored)
 				data["password-flags"] = "0"
 				vpn["data"] = dbus.MakeVariant(data)
 
+				// Add secrets (vpn.secrets is string->string)
 				secs := make(map[string]string)
 				for k, v := range reply.Secrets {
 					secs[k] = v
@@ -390,12 +379,14 @@ func (a *SecretAgent) GetSecrets(
 				log.Infof("[SecretAgent] Updated VPN settings: password-flags=0, secrets with %d fields", len(secs))
 
 			case "802-11-wireless-security":
+				// Set psk-flags=0 for WiFi
 				wifiSec, ok := existingSettings["802-11-wireless-security"]
 				if !ok {
 					wifiSec = make(map[string]dbus.Variant)
 				}
 				wifiSec["psk-flags"] = dbus.MakeVariant(uint32(0))
 
+				// Add PSK secret
 				if psk, ok := reply.Secrets["psk"]; ok {
 					wifiSec["psk"] = dbus.MakeVariant(psk)
 					log.Infof("[SecretAgent] Updated WiFi settings: psk-flags=0")
@@ -403,12 +394,14 @@ func (a *SecretAgent) GetSecrets(
 				settings["802-11-wireless-security"] = wifiSec
 
 			case "802-1x":
+				// Set password-flags=0 for 802.1x
 				dot1x, ok := existingSettings["802-1x"]
 				if !ok {
 					dot1x = make(map[string]dbus.Variant)
 				}
 				dot1x["password-flags"] = dbus.MakeVariant(uint32(0))
 
+				// Add password secret
 				if password, ok := reply.Secrets["password"]; ok {
 					dot1x["password"] = dbus.MakeVariant(password)
 					log.Infof("[SecretAgent] Updated 802.1x settings: password-flags=0")
@@ -514,39 +507,6 @@ func fieldsNeeded(setting string, hints []string) []string {
 	}
 }
 
-func readVPNPasswordFlags(conn map[string]nmVariantMap, settingName string) uint32 {
-	if settingName != "vpn" {
-		return 0xFFFF
-	}
-
-	vpnSettings, ok := conn["vpn"]
-	if !ok {
-		return 0xFFFF
-	}
-
-	dataVariant, ok := vpnSettings["data"]
-	if !ok {
-		return 0xFFFF
-	}
-
-	dataMap, ok := dataVariant.Value().(map[string]string)
-	if !ok {
-		return 0xFFFF
-	}
-
-	flagsStr, ok := dataMap["password-flags"]
-	if !ok {
-		return 0xFFFF
-	}
-
-	flags64, err := strconv.ParseUint(flagsStr, 10, 32)
-	if err != nil {
-		return 0xFFFF
-	}
-
-	return uint32(flags64)
-}
-
 func reasonFromFlags(flags uint32) string {
 	const (
 		NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE              = 0x0

core/internal/server/network/backend.go

@@ -8,13 +8,10 @@ type Backend interface {
 	SetWiFiEnabled(enabled bool) error
 
 	ScanWiFi() error
-	ScanWiFiDevice(device string) error
 	GetWiFiNetworkDetails(ssid string) (*NetworkInfoResponse, error)
-	GetWiFiDevices() []WiFiDevice
 
 	ConnectWiFi(req ConnectionRequest) error
 	DisconnectWiFi() error
-	DisconnectWiFiDevice(device string) error
 	ForgetWiFiNetwork(ssid string) error
 	SetWiFiAutoconnect(ssid string, autoconnect bool) error
 
@@ -57,13 +54,11 @@ type BackendState struct {
 	WiFiBSSID              string
 	WiFiSignal             uint8
 	WiFiNetworks           []WiFiNetwork
-	WiFiDevices            []WiFiDevice
 	WiredConnections       []WiredConnection
 	VPNProfiles            []VPNProfile
 	VPNActive              []VPNActive
 	IsConnecting           bool
 	ConnectingSSID         string
-	ConnectingDevice       string
 	IsConnectingVPN        bool
 	ConnectingVPNUUID      string
 	LastError              string

core/internal/server/network/backend_hybrid_iwd_networkd.go

@@ -196,15 +196,3 @@ func (b *HybridIwdNetworkdBackend) CancelCredentials(token string) error {
 func (b *HybridIwdNetworkdBackend) SetWiFiAutoconnect(ssid string, autoconnect bool) error {
 	return b.wifi.SetWiFiAutoconnect(ssid, autoconnect)
 }
-
-func (b *HybridIwdNetworkdBackend) ScanWiFiDevice(device string) error {
-	return b.wifi.ScanWiFiDevice(device)
-}
-
-func (b *HybridIwdNetworkdBackend) DisconnectWiFiDevice(device string) error {
-	return b.wifi.DisconnectWiFiDevice(device)
-}
-
-func (b *HybridIwdNetworkdBackend) GetWiFiDevices() []WiFiDevice {
-	return b.wifi.GetWiFiDevices()
-}

core/internal/server/network/backend_iwd.go

@@ -139,13 +139,9 @@ func (b *IWDBackend) discoverDevices() error {
 }
 
 func (b *IWDBackend) GetCurrentState() (*BackendState, error) {
-	b.stateMutex.RLock()
-	defer b.stateMutex.RUnlock()
-
 	state := *b.state
 	state.WiFiNetworks = append([]WiFiNetwork(nil), b.state.WiFiNetworks...)
 	state.WiredConnections = append([]WiredConnection(nil), b.state.WiredConnections...)
-	state.WiFiDevices = b.getWiFiDevicesLocked()
 
 	return &state, nil
 }

core/internal/server/network/backend_iwd_unimplemented.go

@@ -45,38 +45,3 @@ func (b *IWDBackend) DisconnectAllVPN() error {
 func (b *IWDBackend) ClearVPNCredentials(uuidOrName string) error {
 	return fmt.Errorf("VPN not supported by iwd backend")
 }
-
-func (b *IWDBackend) ScanWiFiDevice(device string) error {
-	return b.ScanWiFi()
-}
-
-func (b *IWDBackend) DisconnectWiFiDevice(device string) error {
-	return b.DisconnectWiFi()
-}
-
-func (b *IWDBackend) GetWiFiDevices() []WiFiDevice {
-	b.stateMutex.RLock()
-	defer b.stateMutex.RUnlock()
-	return b.getWiFiDevicesLocked()
-}
-
-func (b *IWDBackend) getWiFiDevicesLocked() []WiFiDevice {
-	if b.state.WiFiDevice == "" {
-		return nil
-	}
-
-	stateStr := "disconnected"
-	if b.state.WiFiConnected {
-		stateStr = "connected"
-	}
-
-	return []WiFiDevice{{
-		Name:      b.state.WiFiDevice,
-		State:     stateStr,
-		Connected: b.state.WiFiConnected,
-		SSID:      b.state.WiFiSSID,
-		Signal:    b.state.WiFiSignal,
-		IP:        b.state.WiFiIP,
-		Networks:  b.state.WiFiNetworks,
-	}}
-}

core/internal/server/network/backend_networkd_unimplemented.go

@@ -57,15 +57,3 @@ func (b *SystemdNetworkdBackend) ClearVPNCredentials(uuidOrName string) error {
 func (b *SystemdNetworkdBackend) SetWiFiAutoconnect(ssid string, autoconnect bool) error {
 	return fmt.Errorf("WiFi autoconnect not supported by networkd backend")
 }
-
-func (b *SystemdNetworkdBackend) ScanWiFiDevice(device string) error {
-	return fmt.Errorf("WiFi scan not supported by networkd backend")
-}
-
-func (b *SystemdNetworkdBackend) DisconnectWiFiDevice(device string) error {
-	return fmt.Errorf("WiFi disconnect not supported by networkd backend")
-}
-
-func (b *SystemdNetworkdBackend) GetWiFiDevices() []WiFiDevice {
-	return nil
-}

core/internal/server/network/backend_networkmanager.go

@@ -30,20 +30,12 @@ const (
 	NmDeviceStateReasonNewActivation        = 60
 )
 
-type wifiDeviceInfo struct {
-	device    gonetworkmanager.Device
-	wireless  gonetworkmanager.DeviceWireless
-	name      string
-	hwAddress string
-}
-
 type NetworkManagerBackend struct {
 	nmConn         interface{}
 	ethernetDevice interface{}
 	wifiDevice     interface{}
 	settings       interface{}
 	wifiDev        interface{}
-	wifiDevices    map[string]*wifiDeviceInfo
 
 	dbusConn *dbus.Conn
 	signals  chan *dbus.Signal
@@ -79,9 +71,8 @@ func NewNetworkManagerBackend(nmConn ...gonetworkmanager.NetworkManager) (*Netwo
 	}
 
 	backend := &NetworkManagerBackend{
-		nmConn:      nm,
-		stopChan:    make(chan struct{}),
-		wifiDevices: make(map[string]*wifiDeviceInfo),
+		nmConn:   nm,
+		stopChan: make(chan struct{}),
 		state: &BackendState{
 			Backend: "networkmanager",
 		},
@@ -123,48 +114,27 @@ func (b *NetworkManagerBackend) Initialize() error {
 			}
 
 		case gonetworkmanager.NmDeviceTypeWifi:
-			iface, err := dev.GetPropertyInterface()
-			if err != nil {
-				continue
-			}
-			w, err := gonetworkmanager.NewDeviceWireless(dev.GetPath())
-			if err != nil {
-				continue
-			}
-			hwAddr, _ := w.GetPropertyHwAddress()
-
-			b.wifiDevices[iface] = &wifiDeviceInfo{
-				device:    dev,
-				wireless:  w,
-				name:      iface,
-				hwAddress: hwAddr,
-			}
-
-			if b.wifiDevice == nil {
-				b.wifiDevice = dev
+			b.wifiDevice = dev
+			if w, err := gonetworkmanager.NewDeviceWireless(dev.GetPath()); err == nil {
 				b.wifiDev = w
 			}
+			wifiEnabled, err := nm.GetPropertyWirelessEnabled()
+			if err == nil {
+				b.stateMutex.Lock()
+				b.state.WiFiEnabled = wifiEnabled
+				b.stateMutex.Unlock()
+			}
+			if err := b.updateWiFiState(); err != nil {
+				continue
+			}
+			if wifiEnabled {
+				if _, err := b.updateWiFiNetworks(); err != nil {
+					log.Warnf("Failed to get initial networks: %v", err)
+				}
+			}
 		}
 	}
 
-	wifiEnabled, err := nm.GetPropertyWirelessEnabled()
-	if err == nil {
-		b.stateMutex.Lock()
-		b.state.WiFiEnabled = wifiEnabled
-		b.stateMutex.Unlock()
-	}
-
-	if err := b.updateWiFiState(); err != nil {
-		log.Warnf("Failed to update WiFi state: %v", err)
-	}
-
-	if wifiEnabled {
-		if _, err := b.updateWiFiNetworks(); err != nil {
-			log.Warnf("Failed to get initial networks: %v", err)
-		}
-		b.updateAllWiFiDevices()
-	}
-
 	if err := b.updatePrimaryConnection(); err != nil {
 		return err
 	}
@@ -195,7 +165,6 @@ func (b *NetworkManagerBackend) GetCurrentState() (*BackendState, error) {
 
 	state := *b.state
 	state.WiFiNetworks = append([]WiFiNetwork(nil), b.state.WiFiNetworks...)
-	state.WiFiDevices = append([]WiFiDevice(nil), b.state.WiFiDevices...)
 	state.WiredConnections = append([]WiredConnection(nil), b.state.WiredConnections...)
 	state.VPNProfiles = append([]VPNProfile(nil), b.state.VPNProfiles...)
 	state.VPNActive = append([]VPNActive(nil), b.state.VPNActive...)

core/internal/server/network/backend_networkmanager_vpn.go

@@ -235,7 +235,7 @@ func (b *NetworkManagerBackend) ConnectVPN(uuidOrName string, singleActive bool)
 	}
 
 	nm := b.nmConn.(gonetworkmanager.NetworkManager)
-	_, err = nm.ActivateConnection(targetConn, nil, nil)
+	activeConn, err := nm.ActivateConnection(targetConn, nil, nil)
 	if err != nil {
 		b.stateMutex.Lock()
 		b.state.IsConnectingVPN = false
@@ -249,6 +249,20 @@ func (b *NetworkManagerBackend) ConnectVPN(uuidOrName string, singleActive bool)
 		return fmt.Errorf("failed to activate VPN: %w", err)
 	}
 
+	if activeConn != nil {
+		state, _ := activeConn.GetPropertyState()
+		if state == 2 {
+			b.stateMutex.Lock()
+			b.state.IsConnectingVPN = false
+			b.state.ConnectingVPNUUID = ""
+			b.stateMutex.Unlock()
+			b.ListActiveVPN()
+			if b.onStateChange != nil {
+				b.onStateChange()
+			}
+		}
+	}
+
 	return nil
 }
 

core/internal/server/network/backend_networkmanager_wifi.go

@@ -197,23 +197,21 @@ func (b *NetworkManagerBackend) GetWiFiNetworkDetails(ssid string) (*NetworkInfo
 }
 
 func (b *NetworkManagerBackend) ConnectWiFi(req ConnectionRequest) error {
-	devInfo, err := b.getWifiDeviceForConnection(req.Device)
-	if err != nil {
-		return err
+	if b.wifiDevice == nil {
+		return fmt.Errorf("no WiFi device available")
 	}
 
 	b.stateMutex.RLock()
 	alreadyConnected := b.state.WiFiConnected && b.state.WiFiSSID == req.SSID
 	b.stateMutex.RUnlock()
 
-	if alreadyConnected && !req.Interactive && req.Device == "" {
+	if alreadyConnected && !req.Interactive {
 		return nil
 	}
 
 	b.stateMutex.Lock()
 	b.state.IsConnecting = true
 	b.state.ConnectingSSID = req.SSID
-	b.state.ConnectingDevice = req.Device
 	b.state.LastError = ""
 	b.stateMutex.Unlock()
 
@@ -225,13 +223,14 @@ func (b *NetworkManagerBackend) ConnectWiFi(req ConnectionRequest) error {
 
 	existingConn, err := b.findConnection(req.SSID)
 	if err == nil && existingConn != nil {
-		_, err := nm.ActivateConnection(existingConn, devInfo.device, nil)
+		dev := b.wifiDevice.(gonetworkmanager.Device)
+
+		_, err := nm.ActivateConnection(existingConn, dev, nil)
 		if err != nil {
 			log.Warnf("[ConnectWiFi] Failed to activate existing connection: %v", err)
 			b.stateMutex.Lock()
 			b.state.IsConnecting = false
 			b.state.ConnectingSSID = ""
-			b.state.ConnectingDevice = ""
 			b.state.LastError = fmt.Sprintf("failed to activate connection: %v", err)
 			b.stateMutex.Unlock()
 			if b.onStateChange != nil {
@@ -243,12 +242,11 @@ func (b *NetworkManagerBackend) ConnectWiFi(req ConnectionRequest) error {
 		return nil
 	}
 
-	if err := b.createAndConnectWiFiOnDevice(req, devInfo); err != nil {
+	if err := b.createAndConnectWiFi(req); err != nil {
 		log.Warnf("[ConnectWiFi] Failed to create and connect: %v", err)
 		b.stateMutex.Lock()
 		b.state.IsConnecting = false
 		b.state.ConnectingSSID = ""
-		b.state.ConnectingDevice = ""
 		b.state.LastError = err.Error()
 		b.stateMutex.Unlock()
 		if b.onStateChange != nil {
@@ -504,17 +502,19 @@ func (b *NetworkManagerBackend) findConnection(ssid string) (gonetworkmanager.Co
 }
 
 func (b *NetworkManagerBackend) createAndConnectWiFi(req ConnectionRequest) error {
-	devInfo, err := b.getWifiDeviceForConnection(req.Device)
-	if err != nil {
+	if b.wifiDevice == nil {
+		return fmt.Errorf("no WiFi device available")
+	}
+
+	nm := b.nmConn.(gonetworkmanager.NetworkManager)
+	dev := b.wifiDevice.(gonetworkmanager.Device)
+
+	if err := b.ensureWiFiDevice(); err != nil {
 		return err
 	}
-	return b.createAndConnectWiFiOnDevice(req, devInfo)
-}
+	wifiDev := b.wifiDev
 
-func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionRequest, devInfo *wifiDeviceInfo) error {
-	nm := b.nmConn.(gonetworkmanager.NetworkManager)
-	dev := devInfo.device
-	w := devInfo.wireless
+	w := wifiDev.(gonetworkmanager.DeviceWireless)
 	apPaths, err := w.GetAccessPoints()
 	if err != nil {
 		return fmt.Errorf("failed to get access points: %w", err)
@@ -716,254 +716,3 @@ func (b *NetworkManagerBackend) SetWiFiAutoconnect(ssid string, autoconnect bool
 
 	return nil
 }
-
-func (b *NetworkManagerBackend) ScanWiFiDevice(device string) error {
-	devInfo, ok := b.wifiDevices[device]
-	if !ok {
-		return fmt.Errorf("WiFi device not found: %s", device)
-	}
-
-	b.stateMutex.RLock()
-	enabled := b.state.WiFiEnabled
-	b.stateMutex.RUnlock()
-
-	if !enabled {
-		return fmt.Errorf("WiFi is disabled")
-	}
-
-	if err := devInfo.wireless.RequestScan(); err != nil {
-		return fmt.Errorf("scan request failed: %w", err)
-	}
-
-	b.updateAllWiFiDevices()
-	return nil
-}
-
-func (b *NetworkManagerBackend) DisconnectWiFiDevice(device string) error {
-	devInfo, ok := b.wifiDevices[device]
-	if !ok {
-		return fmt.Errorf("WiFi device not found: %s", device)
-	}
-
-	if err := devInfo.device.Disconnect(); err != nil {
-		return fmt.Errorf("failed to disconnect: %w", err)
-	}
-
-	b.updateWiFiState()
-	b.updateAllWiFiDevices()
-	b.updatePrimaryConnection()
-
-	if b.onStateChange != nil {
-		b.onStateChange()
-	}
-
-	return nil
-}
-
-func (b *NetworkManagerBackend) GetWiFiDevices() []WiFiDevice {
-	b.stateMutex.RLock()
-	defer b.stateMutex.RUnlock()
-	return append([]WiFiDevice(nil), b.state.WiFiDevices...)
-}
-
-func (b *NetworkManagerBackend) updateAllWiFiDevices() {
-	s := b.settings
-	if s == nil {
-		var err error
-		s, err = gonetworkmanager.NewSettings()
-		if err != nil {
-			return
-		}
-		b.settings = s
-	}
-
-	settingsMgr := s.(gonetworkmanager.Settings)
-	connections, err := settingsMgr.ListConnections()
-	if err != nil {
-		return
-	}
-
-	savedSSIDs := make(map[string]bool)
-	autoconnectMap := make(map[string]bool)
-	for _, conn := range connections {
-		connSettings, err := conn.GetSettings()
-		if err != nil {
-			continue
-		}
-
-		connMeta, ok := connSettings["connection"]
-		if !ok {
-			continue
-		}
-
-		connType, ok := connMeta["type"].(string)
-		if !ok || connType != "802-11-wireless" {
-			continue
-		}
-
-		wifiSettings, ok := connSettings["802-11-wireless"]
-		if !ok {
-			continue
-		}
-
-		ssidBytes, ok := wifiSettings["ssid"].([]byte)
-		if !ok {
-			continue
-		}
-
-		ssid := string(ssidBytes)
-		savedSSIDs[ssid] = true
-		autoconnect := true
-		if ac, ok := connMeta["autoconnect"].(bool); ok {
-			autoconnect = ac
-		}
-		autoconnectMap[ssid] = autoconnect
-	}
-
-	var devices []WiFiDevice
-
-	for name, devInfo := range b.wifiDevices {
-		state, _ := devInfo.device.GetPropertyState()
-		connected := state == gonetworkmanager.NmDeviceStateActivated
-
-		var ssid, bssid, ip string
-		var signal uint8
-
-		if connected {
-			if activeAP, err := devInfo.wireless.GetPropertyActiveAccessPoint(); err == nil && activeAP != nil && activeAP.GetPath() != "/" {
-				ssid, _ = activeAP.GetPropertySSID()
-				signal, _ = activeAP.GetPropertyStrength()
-				bssid, _ = activeAP.GetPropertyHWAddress()
-			}
-			ip = b.getDeviceIP(devInfo.device)
-		}
-
-		stateStr := "disconnected"
-		switch state {
-		case gonetworkmanager.NmDeviceStateActivated:
-			stateStr = "connected"
-		case gonetworkmanager.NmDeviceStateConfig, gonetworkmanager.NmDeviceStateIpConfig:
-			stateStr = "connecting"
-		case gonetworkmanager.NmDeviceStatePrepare:
-			stateStr = "preparing"
-		case gonetworkmanager.NmDeviceStateDeactivating:
-			stateStr = "disconnecting"
-		}
-
-		apPaths, err := devInfo.wireless.GetAccessPoints()
-		var networks []WiFiNetwork
-		if err == nil {
-			seenSSIDs := make(map[string]*WiFiNetwork)
-			for _, ap := range apPaths {
-				apSSID, err := ap.GetPropertySSID()
-				if err != nil || apSSID == "" {
-					continue
-				}
-
-				if existing, exists := seenSSIDs[apSSID]; exists {
-					strength, _ := ap.GetPropertyStrength()
-					if strength > existing.Signal {
-						existing.Signal = strength
-						freq, _ := ap.GetPropertyFrequency()
-						existing.Frequency = freq
-						apBSSID, _ := ap.GetPropertyHWAddress()
-						existing.BSSID = apBSSID
-					}
-					continue
-				}
-
-				strength, _ := ap.GetPropertyStrength()
-				flags, _ := ap.GetPropertyFlags()
-				wpaFlags, _ := ap.GetPropertyWPAFlags()
-				rsnFlags, _ := ap.GetPropertyRSNFlags()
-				freq, _ := ap.GetPropertyFrequency()
-				maxBitrate, _ := ap.GetPropertyMaxBitrate()
-				apBSSID, _ := ap.GetPropertyHWAddress()
-				mode, _ := ap.GetPropertyMode()
-
-				secured := flags != uint32(gonetworkmanager.Nm80211APFlagsNone) ||
-					wpaFlags != uint32(gonetworkmanager.Nm80211APSecNone) ||
-					rsnFlags != uint32(gonetworkmanager.Nm80211APSecNone)
-
-				enterprise := (rsnFlags&uint32(gonetworkmanager.Nm80211APSecKeyMgmt8021X) != 0) ||
-					(wpaFlags&uint32(gonetworkmanager.Nm80211APSecKeyMgmt8021X) != 0)
-
-				var modeStr string
-				switch mode {
-				case gonetworkmanager.Nm80211ModeAdhoc:
-					modeStr = "adhoc"
-				case gonetworkmanager.Nm80211ModeInfra:
-					modeStr = "infrastructure"
-				case gonetworkmanager.Nm80211ModeAp:
-					modeStr = "ap"
-				default:
-					modeStr = "unknown"
-				}
-
-				channel := frequencyToChannel(freq)
-
-				network := WiFiNetwork{
-					SSID:        apSSID,
-					BSSID:       apBSSID,
-					Signal:      strength,
-					Secured:     secured,
-					Enterprise:  enterprise,
-					Connected:   connected && apSSID == ssid,
-					Saved:       savedSSIDs[apSSID],
-					Autoconnect: autoconnectMap[apSSID],
-					Frequency:   freq,
-					Mode:        modeStr,
-					Rate:        maxBitrate / 1000,
-					Channel:     channel,
-					Device:      name,
-				}
-
-				seenSSIDs[apSSID] = &network
-				networks = append(networks, network)
-			}
-			sortWiFiNetworks(networks)
-		}
-
-		devices = append(devices, WiFiDevice{
-			Name:      name,
-			HwAddress: devInfo.hwAddress,
-			State:     stateStr,
-			Connected: connected,
-			SSID:      ssid,
-			BSSID:     bssid,
-			Signal:    signal,
-			IP:        ip,
-			Networks:  networks,
-		})
-	}
-
-	sort.Slice(devices, func(i, j int) bool {
-		return devices[i].Name < devices[j].Name
-	})
-
-	b.stateMutex.Lock()
-	b.state.WiFiDevices = devices
-	b.stateMutex.Unlock()
-}
-
-func (b *NetworkManagerBackend) getWifiDeviceForConnection(deviceName string) (*wifiDeviceInfo, error) {
-	if deviceName != "" {
-		devInfo, ok := b.wifiDevices[deviceName]
-		if !ok {
-			return nil, fmt.Errorf("WiFi device not found: %s", deviceName)
-		}
-		return devInfo, nil
-	}
-
-	if b.wifiDevice == nil {
-		return nil, fmt.Errorf("no WiFi device available")
-	}
-
-	dev := b.wifiDevice.(gonetworkmanager.Device)
-	iface, _ := dev.GetPropertyInterface()
-	if devInfo, ok := b.wifiDevices[iface]; ok {
-		return devInfo, nil
-	}
-
-	return nil, fmt.Errorf("no WiFi device available")
-}

core/internal/server/network/backend_networkmanager_wifi_test.go

@@ -101,21 +101,10 @@ func TestNetworkManagerBackend_ConnectWiFi_AlreadyConnected(t *testing.T) {
 
 	backend.wifiDevice = mockDeviceWireless
 	backend.wifiDev = mockDeviceWireless
-	backend.wifiDevices = map[string]*wifiDeviceInfo{
-		"wlan0": {
-			device:    nil,
-			wireless:  mockDeviceWireless,
-			name:      "wlan0",
-			hwAddress: "00:11:22:33:44:55",
-		},
-	}
-
-	mockDeviceWireless.EXPECT().GetPropertyInterface().Return("wlan0", nil)
 
 	backend.stateMutex.Lock()
 	backend.state.WiFiConnected = true
 	backend.state.WiFiSSID = "TestNetwork"
-	backend.state.WiFiDevice = "wlan0"
 	backend.stateMutex.Unlock()
 
 	req := ConnectionRequest{SSID: "TestNetwork", Password: "password"}

core/internal/server/network/handlers.go

@@ -135,14 +135,7 @@ func handleGetState(conn net.Conn, req Request, manager *Manager) {
 }
 
 func handleScanWiFi(conn net.Conn, req Request, manager *Manager) {
-	device, _ := req.Params["device"].(string)
-	var err error
-	if device != "" {
-		err = manager.ScanWiFiDevice(device)
-	} else {
-		err = manager.ScanWiFi()
-	}
-	if err != nil {
+	if err := manager.ScanWiFi(); err != nil {
 		models.RespondError(conn, req.ID, err.Error())
 		return
 	}
@@ -170,9 +163,6 @@ func handleConnectWiFi(conn net.Conn, req Request, manager *Manager) {
 	if username, ok := req.Params["username"].(string); ok {
 		connReq.Username = username
 	}
-	if device, ok := req.Params["device"].(string); ok {
-		connReq.Device = device
-	}
 
 	if interactive, ok := req.Params["interactive"].(bool); ok {
 		connReq.Interactive = interactive
@@ -180,7 +170,7 @@ func handleConnectWiFi(conn net.Conn, req Request, manager *Manager) {
 		state := manager.GetState()
 		alreadyConnected := state.WiFiConnected && state.WiFiSSID == ssid
 
-		if alreadyConnected && connReq.Device == "" {
+		if alreadyConnected {
 			connReq.Interactive = false
 		} else {
 			networkInfo, err := manager.GetNetworkInfo(ssid)
@@ -210,14 +200,7 @@ func handleConnectWiFi(conn net.Conn, req Request, manager *Manager) {
 }
 
 func handleDisconnectWiFi(conn net.Conn, req Request, manager *Manager) {
-	device, _ := req.Params["device"].(string)
-	var err error
-	if device != "" {
-		err = manager.DisconnectWiFiDevice(device)
-	} else {
-		err = manager.DisconnectWiFi()
-	}
-	if err != nil {
+	if err := manager.DisconnectWiFi(); err != nil {
 		models.RespondError(conn, req.ID, err.Error())
 		return
 	}

core/internal/server/network/manager.go

@@ -117,13 +117,11 @@ func (m *Manager) syncStateFromBackend() error {
 	m.state.WiFiBSSID = backendState.WiFiBSSID
 	m.state.WiFiSignal = backendState.WiFiSignal
 	m.state.WiFiNetworks = backendState.WiFiNetworks
-	m.state.WiFiDevices = backendState.WiFiDevices
 	m.state.WiredConnections = backendState.WiredConnections
 	m.state.VPNProfiles = backendState.VPNProfiles
 	m.state.VPNActive = backendState.VPNActive
 	m.state.IsConnecting = backendState.IsConnecting
 	m.state.ConnectingSSID = backendState.ConnectingSSID
-	m.state.ConnectingDevice = backendState.ConnectingDevice
 	m.state.LastError = backendState.LastError
 	m.stateMutex.Unlock()
 
@@ -153,7 +151,6 @@ func (m *Manager) snapshotState() NetworkState {
 	defer m.stateMutex.RUnlock()
 	s := *m.state
 	s.WiFiNetworks = append([]WiFiNetwork(nil), m.state.WiFiNetworks...)
-	s.WiFiDevices = append([]WiFiDevice(nil), m.state.WiFiDevices...)
 	s.WiredConnections = append([]WiredConnection(nil), m.state.WiredConnections...)
 	s.VPNProfiles = append([]VPNProfile(nil), m.state.VPNProfiles...)
 	s.VPNActive = append([]VPNActive(nil), m.state.VPNActive...)
@@ -207,9 +204,6 @@ func stateChangedMeaningfully(old, new *NetworkState) bool {
 	if len(old.WiFiNetworks) != len(new.WiFiNetworks) {
 		return true
 	}
-	if len(old.WiFiDevices) != len(new.WiFiDevices) {
-		return true
-	}
 	if len(old.WiredConnections) != len(new.WiredConnections) {
 		return true
 	}
@@ -511,19 +505,3 @@ func (m *Manager) ClearVPNCredentials(uuidOrName string) error {
 func (m *Manager) SetWiFiAutoconnect(ssid string, autoconnect bool) error {
 	return m.backend.SetWiFiAutoconnect(ssid, autoconnect)
 }
-
-func (m *Manager) GetWiFiDevices() []WiFiDevice {
-	m.stateMutex.RLock()
-	defer m.stateMutex.RUnlock()
-	devices := make([]WiFiDevice, len(m.state.WiFiDevices))
-	copy(devices, m.state.WiFiDevices)
-	return devices
-}
-
-func (m *Manager) ScanWiFiDevice(device string) error {
-	return m.backend.ScanWiFiDevice(device)
-}
-
-func (m *Manager) DisconnectWiFiDevice(device string) error {
-	return m.backend.DisconnectWiFiDevice(device)
-}

core/internal/server/network/types.go

@@ -37,19 +37,6 @@ type WiFiNetwork struct {
 	Mode        string `json:"mode"`
 	Rate        uint32 `json:"rate"`
 	Channel     uint32 `json:"channel"`
-	Device      string `json:"device,omitempty"`
-}
-
-type WiFiDevice struct {
-	Name      string        `json:"name"`
-	HwAddress string        `json:"hwAddress"`
-	State     string        `json:"state"`
-	Connected bool          `json:"connected"`
-	SSID      string        `json:"ssid,omitempty"`
-	BSSID     string        `json:"bssid,omitempty"`
-	Signal    uint8         `json:"signal,omitempty"`
-	IP        string        `json:"ip,omitempty"`
-	Networks  []WiFiNetwork `json:"networks"`
 }
 
 type VPNProfile struct {
@@ -89,13 +76,11 @@ type NetworkState struct {
 	WiFiBSSID              string               `json:"wifiBSSID"`
 	WiFiSignal             uint8                `json:"wifiSignal"`
 	WiFiNetworks           []WiFiNetwork        `json:"wifiNetworks"`
-	WiFiDevices            []WiFiDevice         `json:"wifiDevices"`
 	WiredConnections       []WiredConnection    `json:"wiredConnections"`
 	VPNProfiles            []VPNProfile         `json:"vpnProfiles"`
 	VPNActive              []VPNActive          `json:"vpnActive"`
 	IsConnecting           bool                 `json:"isConnecting"`
 	ConnectingSSID         string               `json:"connectingSSID"`
-	ConnectingDevice       string               `json:"connectingDevice,omitempty"`
 	LastError              string               `json:"lastError"`
 }
 
@@ -106,7 +91,6 @@ type ConnectionRequest struct {
 	AnonymousIdentity string `json:"anonymousIdentity,omitempty"`
 	DomainSuffixMatch string `json:"domainSuffixMatch,omitempty"`
 	Interactive       bool   `json:"interactive,omitempty"`
-	Device            string `json:"device,omitempty"`
 }
 
 type WiredConnection struct {

core/internal/server/router.go

@@ -140,20 +140,8 @@ func RouteRequest(conn net.Conn, req models.Request) {
 
 	if strings.HasPrefix(req.Method, "extworkspace.") {
 		if extWorkspaceManager == nil {
-			if extWorkspaceAvailable.Load() {
-				extWorkspaceInitMutex.Lock()
-				if extWorkspaceManager == nil {
-					if err := InitializeExtWorkspaceManager(); err != nil {
-						extWorkspaceInitMutex.Unlock()
-						models.RespondError(conn, req.ID, "extworkspace manager not available")
-						return
-					}
-				}
-				extWorkspaceInitMutex.Unlock()
-			} else {
-				models.RespondError(conn, req.ID, "extworkspace manager not initialized")
-				return
-			}
+			models.RespondError(conn, req.ID, "extworkspace manager not initialized")
+			return
 		}
 		extWorkspaceReq := extworkspace.Request{
 			ID:     req.ID,

core/internal/server/server.go

@@ -31,7 +31,7 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
 )
 
-const APIVersion = 20
+const APIVersion = 18
 
 type Capabilities struct {
 	Capabilities []string `json:"capabilities"`
@@ -63,8 +63,6 @@ var wlContext *wlcontext.SharedContext
 var capabilitySubscribers syncmap.Map[string, chan ServerInfo]
 var cupsSubscribers syncmap.Map[string, bool]
 var cupsSubscriberCount atomic.Int32
-var extWorkspaceAvailable atomic.Bool
-var extWorkspaceInitMutex sync.Mutex
 
 func getSocketDir() string {
 	if runtime := os.Getenv("XDG_RUNTIME_DIR"); runtime != "" {
@@ -363,7 +361,7 @@ func getCapabilities() Capabilities {
 		caps = append(caps, "dwl")
 	}
 
-	if extWorkspaceAvailable.Load() {
+	if extWorkspaceManager != nil {
 		caps = append(caps, "extworkspace")
 	}
 
@@ -413,7 +411,7 @@ func getServerInfo() ServerInfo {
 		caps = append(caps, "dwl")
 	}
 
-	if extWorkspaceAvailable.Load() {
+	if extWorkspaceManager != nil {
 		caps = append(caps, "extworkspace")
 	}
 
@@ -812,14 +810,12 @@ func handleSubscribe(conn net.Conn, req models.Request) {
 	}
 
 	if shouldSubscribe("extworkspace") {
-		if extWorkspaceManager == nil && extWorkspaceAvailable.Load() {
-			extWorkspaceInitMutex.Lock()
-			if extWorkspaceManager == nil {
-				if err := InitializeExtWorkspaceManager(); err != nil {
-					log.Warnf("Failed to initialize ExtWorkspace manager for subscription: %v", err)
-				}
+		if extWorkspaceManager == nil {
+			if err := InitializeExtWorkspaceManager(); err != nil {
+				log.Warnf("Failed to initialize ExtWorkspace manager for subscription: %v", err)
+			} else {
+				notifyCapabilityChange()
 			}
-			extWorkspaceInitMutex.Unlock()
 		}
 
 		if extWorkspaceManager != nil {
@@ -1071,10 +1067,10 @@ func Start(printDocs bool) error {
 		log.Info(" plugins.search              - Search plugins (params: query, category?, compositor?, capability?)")
 		log.Info("Network:")
 		log.Info(" network.getState            - Get current network state")
-		log.Info(" network.wifi.scan           - Scan for WiFi networks (params: device?)")
+		log.Info(" network.wifi.scan           - Scan for WiFi networks")
 		log.Info(" network.wifi.networks       - Get WiFi network list")
-		log.Info(" network.wifi.connect        - Connect to WiFi (params: ssid, password?, username?, device?)")
-		log.Info(" network.wifi.disconnect     - Disconnect WiFi (params: device?)")
+		log.Info(" network.wifi.connect        - Connect to WiFi (params: ssid, password?, username?)")
+		log.Info(" network.wifi.disconnect     - Disconnect WiFi")
 		log.Info(" network.wifi.forget         - Forget network (params: ssid)")
 		log.Info(" network.wifi.toggle         - Toggle WiFi radio")
 		log.Info(" network.wifi.enable         - Enable WiFi")
@@ -1145,18 +1141,11 @@ func Start(printDocs bool) error {
 		log.Info(" cups.cancelJob                        - Cancel job (params: printerName, jobID)")
 		log.Info(" cups.purgeJobs                        - Cancel all jobs (params: printerName)")
 		log.Info("DWL:")
-		log.Info(" dwl.getState                          - Get current dwl state (tags, windows, layouts, keyboard)")
+		log.Info(" dwl.getState                          - Get current dwl state (tags, windows, layouts)")
 		log.Info(" dwl.setTags                           - Set active tags (params: output, tagmask, toggleTagset)")
 		log.Info(" dwl.setClientTags                     - Set focused client tags (params: output, andTags, xorTags)")
 		log.Info(" dwl.setLayout                         - Set layout (params: output, index)")
 		log.Info(" dwl.subscribe                         - Subscribe to dwl state changes (streaming)")
-		log.Info("   Output state includes:")
-		log.Info("     - tags         : Tag states (active, clients, focused)")
-		log.Info("     - layoutSymbol : Current layout name")
-		log.Info("     - title        : Focused window title")
-		log.Info("     - appId        : Focused window app ID")
-		log.Info("     - kbLayout     : Current keyboard layout")
-		log.Info("     - keymode      : Current keybind mode")
 		log.Info("ExtWorkspace:")
 		log.Info(" extworkspace.getState                 - Get current workspace state (groups, workspaces)")
 		log.Info(" extworkspace.activateWorkspace        - Activate workspace (params: groupID, workspaceID)")
@@ -1252,14 +1241,6 @@ func Start(printDocs bool) error {
 		log.Debugf("DWL manager unavailable: %v", err)
 	}
 
-	if extworkspace.CheckCapability() {
-		extWorkspaceAvailable.Store(true)
-		log.Info("ExtWorkspace capability detected and will be available on subscription")
-	} else {
-		log.Debug("ExtWorkspace capability not available")
-		extWorkspaceAvailable.Store(false)
-	}
-
 	if err := InitializeWlrOutputManager(); err != nil {
 		log.Debugf("WlrOutput manager unavailable: %v", err)
 	}

core/internal/server/wayland/manager.go

@@ -607,6 +607,41 @@ func (m *Manager) transitionWorker() {
 
 			if finalTarget == targetTemp {
 				log.Debugf("Transition complete: now at %dK", targetTemp)
+
+				m.configMutex.RLock()
+				enabled := m.config.Enabled
+				identityTemp := m.config.HighTemp
+				m.configMutex.RUnlock()
+
+				if !enabled && targetTemp == identityTemp && m.controlsInitialized {
+					m.post(func() {
+						log.Info("Destroying gamma controls after transition to identity")
+						m.outputs.Range(func(id uint32, out *outputState) bool {
+							if out.gammaControl != nil {
+								control := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1)
+								control.Destroy()
+								log.Debugf("Destroyed gamma control for output %d", id)
+							}
+							return true
+						})
+						m.outputs.Range(func(key uint32, value *outputState) bool {
+							m.outputs.Delete(key)
+							return true
+						})
+						m.controlsInitialized = false
+
+						m.transitionMutex.Lock()
+						m.currentTemp = identityTemp
+						m.targetTemp = identityTemp
+						m.transitionMutex.Unlock()
+
+						if _, err := m.display.Sync(); err != nil {
+							log.Warnf("Failed to sync Wayland display after destroying controls: %v", err)
+						}
+
+						log.Info("All gamma controls destroyed")
+					})
+				}
 			}
 		}
 	}
@@ -1227,33 +1262,46 @@ func (m *Manager) SetEnabled(enabled bool) {
 		}
 	} else {
 		if m.controlsInitialized {
-			m.post(func() {
-				log.Info("Disabling gamma, destroying controls immediately")
-				m.outputs.Range(func(id uint32, out *outputState) bool {
-					if out.gammaControl != nil {
-						control := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1)
-						control.Destroy()
-						log.Debugf("Destroyed gamma control for output %d", id)
+			m.configMutex.RLock()
+			identityTemp := m.config.HighTemp
+			m.configMutex.RUnlock()
+
+			m.transitionMutex.RLock()
+			currentTemp := m.currentTemp
+			m.transitionMutex.RUnlock()
+
+			if currentTemp == identityTemp {
+				m.post(func() {
+					log.Infof("Already at %dK, destroying gamma controls immediately", identityTemp)
+					m.outputs.Range(func(id uint32, out *outputState) bool {
+						if out.gammaControl != nil {
+							control := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1)
+							control.Destroy()
+							log.Debugf("Destroyed gamma control for output %d", id)
+						}
+						return true
+					})
+					m.outputs.Range(func(key uint32, value *outputState) bool {
+						m.outputs.Delete(key)
+						return true
+					})
+					m.controlsInitialized = false
+
+					m.transitionMutex.Lock()
+					m.currentTemp = identityTemp
+					m.targetTemp = identityTemp
+					m.transitionMutex.Unlock()
+
+					if _, err := m.display.Sync(); err != nil {
+						log.Warnf("Failed to sync Wayland display after destroying controls: %v", err)
 					}
-					return true
+
+					log.Info("All gamma controls destroyed")
 				})
-				m.outputs.Range(func(key uint32, value *outputState) bool {
-					m.outputs.Delete(key)
-					return true
-				})
-				m.controlsInitialized = false
-
-				m.configMutex.RLock()
-				identityTemp := m.config.HighTemp
-				m.configMutex.RUnlock()
-
-				m.transitionMutex.Lock()
-				m.currentTemp = identityTemp
-				m.targetTemp = identityTemp
-				m.transitionMutex.Unlock()
-
-				log.Info("All gamma controls destroyed")
-			})
+			} else {
+				log.Infof("Disabling: transitioning to %dK before destroying controls", identityTemp)
+				m.startTransition(identityTemp)
+			}
 		}
 	}
 }

distro/debian/dms-git/_service

@@ -1,24 +0,0 @@
-<services>
-  <!-- Pull full git repository for master branch -->
-  <service name="tar_scm" mode="disabled">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/AvengeMedia/DankMaterialShell.git</param>
-    <param name="revision">master</param>
-    <param name="filename">dms-git-source</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <!-- Download pre-built binaries (fallback for Debian 13 with Go 1.22) -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-amd64.gz</param>
-  </service>
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-arm64.gz</param>
-  </service>
-</services>

distro/debian/dms-git/debian/changelog

@@ -1,8 +0,0 @@
-dms-git (0.6.2+git) nightly; urgency=medium
-
-  * Build dms binary from source for true git version strings
-  * Match Fedora COPR git build behavior
-  * Now shows proper git version (e.g., v0.6.2-11-g12e91534)
-  * Add golang-go and make as build dependencies
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Fri, 22 Nov 2025 00:00:00 -0500

distro/debian/dms-git/debian/control

@@ -1,50 +0,0 @@
-Source: dms-git
-Section: x11
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git
-
-Package: dms-git
-Architecture: amd64 arm64
-Depends: ${misc:Depends},
-         quickshell-git | quickshell,
-         accountsservice,
-         cava,
-         cliphist,
-         danksearch,
-         dgop,
-         matugen,
-         qml6-module-qtcore,
-         qml6-module-qtmultimedia,
-         qml6-module-qtqml,
-         qml6-module-qtquick,
-         qml6-module-qtquick-controls,
-         qml6-module-qtquick-dialogs,
-         qml6-module-qtquick-effects,
-         qml6-module-qtquick-layouts,
-         qml6-module-qtquick-templates,
-         qml6-module-qtquick-window,
-         qt6ct,
-         wl-clipboard
-Provides: dms
-Conflicts: dms
-Replaces: dms
-Description: DankMaterialShell - Modern Wayland Desktop Shell (git nightly)
- DMS (DankMaterialShell) is a feature-rich desktop shell built on
- Quickshell, providing a modern and customizable user interface for
- Wayland compositors like niri, hyprland, and sway.
- .
- This is the nightly/git version built from the latest master branch.
- .
- Features include:
-  - Material Design inspired UI
-  - Customizable themes and appearance
-  - Built-in application launcher
-  - System tray and notifications
-  - Network and Bluetooth management
-  - Audio controls
-  - Systemd integration

distro/debian/dms-git/debian/copyright

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

distro/debian/dms-git/debian/files

@@ -1 +0,0 @@
-dms-git_0.6.0+git2061.5ddea836ppa1_source.buildinfo x11 optional

distro/debian/dms-git/debian/rules

@@ -1,54 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \
-		if [ -f dms-distropkg-amd64.gz ]; then \
-			gunzip -c dms-distropkg-amd64.gz > dms; \
-		elif [ -f ../SOURCES/dms-distropkg-amd64.gz ]; then \
-			gunzip -c ../SOURCES/dms-distropkg-amd64.gz > dms; \
-		else \
-			echo "ERROR: dms-distropkg-amd64.gz not found!" && exit 1; \
-		fi \
-	elif [ "$(DEB_HOST_ARCH)" = "arm64" ]; then \
-		if [ -f dms-distropkg-arm64.gz ]; then \
-			gunzip -c dms-distropkg-arm64.gz > dms; \
-		elif [ -f ../SOURCES/dms-distropkg-arm64.gz ]; then \
-			gunzip -c ../SOURCES/dms-distropkg-arm64.gz > dms; \
-		else \
-			echo "ERROR: dms-distropkg-arm64.gz not found!" && exit 1; \
-		fi \
-	else \
-		echo "Unsupported architecture: $(DEB_HOST_ARCH)" && exit 1; \
-	fi
-	chmod +x dms
-
-override_dh_auto_install:
-	install -Dm755 dms debian/dms-git/usr/bin/dms
-
-	mkdir -p debian/dms-git/usr/share/quickshell/dms debian/dms-git/usr/lib/systemd/user
-	if [ -d quickshell ]; then \
-		cp -r quickshell/* debian/dms-git/usr/share/quickshell/dms/; \
-		install -Dm644 quickshell/assets/systemd/dms.service debian/dms-git/usr/lib/systemd/user/dms.service; \
-	elif [ -d dms-git-source/quickshell ]; then \
-		cp -r dms-git-source/quickshell/* debian/dms-git/usr/share/quickshell/dms/; \
-		install -Dm644 dms-git-source/quickshell/assets/systemd/dms.service debian/dms-git/usr/lib/systemd/user/dms.service; \
-	else \
-		echo "ERROR: quickshell directory not found (checked root and dms-git-source/)!" && \
-		echo "Contents of current directory:" && ls -la && \
-		exit 1; \
-	fi
-
-	rm -rf debian/dms-git/usr/share/quickshell/dms/core \
-		debian/dms-git/usr/share/quickshell/dms/distro
-
-override_dh_auto_clean:
-	rm -f dms
-	[ ! -d dms-git-source ] || rm -rf dms-git-source
-	dh_auto_clean

distro/debian/dms-git/debian/source/format

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

distro/debian/dms-git/debian/source/include-binaries

@@ -1 +0,0 @@
-dms-distropkg-amd64.gz

distro/debian/dms-git/debian/source/options

@@ -1,4 +0,0 @@
-# Include files that are normally excluded by .gitignore
-# These are needed for the build process on Launchpad
-tar-ignore = !dms-distropkg-amd64.gz
-tar-ignore = !dms-git-repo

distro/debian/dms/_service

@@ -1,21 +0,0 @@
-<services>
-  <!-- Download source tarball from GitHub releases -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/archive/refs/tags/v0.6.2.tar.gz</param>
-    <param name="filename">dms-source.tar.gz</param>
-  </service>
-  <!-- Download amd64 binary -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v0.6.2/dms-distropkg-amd64.gz</param>
-  </service>
-  <!-- Download arm64 binary -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v0.6.2/dms-distropkg-arm64.gz</param>
-  </service>
-</services>

distro/debian/dms/debian/changelog

@@ -1,7 +0,0 @@
-dms (0.6.2) stable; urgency=medium
-
-  * Update to v0.6.2 release
-  * Fix binary download paths for OBS builds
-  * Native format: removed revisions
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Tue, 19 Nov 2025 10:00:00 -0500

distro/debian/dms/debian/control

@@ -1,47 +0,0 @@
-Source: dms
-Section: x11
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git
-
-Package: dms
-Architecture: amd64
-Depends: ${misc:Depends},
-         quickshell-git | quickshell,
-         accountsservice,
-         cava,
-         cliphist,
-         danksearch,
-         dgop,
-         matugen,
-         qml6-module-qtcore,
-         qml6-module-qtmultimedia,
-         qml6-module-qtqml,
-         qml6-module-qtquick,
-         qml6-module-qtquick-controls,
-         qml6-module-qtquick-dialogs,
-         qml6-module-qtquick-effects,
-         qml6-module-qtquick-layouts,
-         qml6-module-qtquick-templates,
-         qml6-module-qtquick-window,
-         qt6ct,
-         wl-clipboard
-Conflicts: dms-git
-Replaces: dms-git
-Description: DankMaterialShell - Modern Wayland Desktop Shell
- DMS (DankMaterialShell) is a feature-rich desktop shell built on
- Quickshell, providing a modern and customizable user interface for
- Wayland compositors like niri, hyprland, and sway.
- .
- Features include:
-  - Material Design inspired UI
-  - Customizable themes and appearance
-  - Built-in application launcher
-  - System tray and notifications
-  - Network and Bluetooth management
-  - Audio controls
-  - Systemd integration

distro/debian/dms/debian/copyright

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

distro/debian/dms/debian/files

@@ -1 +0,0 @@
-dms_0.6.0ppa2_source.buildinfo x11 optional

distro/debian/dms/debian/rules

@@ -1,71 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \
-		if [ -f dms-distropkg-amd64.gz ]; then \
-			gunzip -c dms-distropkg-amd64.gz > dms; \
-		elif [ -f ../SOURCES/dms-distropkg-amd64.gz ]; then \
-			gunzip -c ../SOURCES/dms-distropkg-amd64.gz > dms; \
-		elif [ -f ../../SOURCES/dms-distropkg-amd64.gz ]; then \
-			gunzip -c ../../SOURCES/dms-distropkg-amd64.gz > dms; \
-		else \
-			echo "ERROR: dms-distropkg-amd64.gz not found!" && exit 1; \
-		fi \
-	elif [ "$(DEB_HOST_ARCH)" = "arm64" ]; then \
-		if [ -f dms-distropkg-arm64.gz ]; then \
-			gunzip -c dms-distropkg-arm64.gz > dms; \
-		elif [ -f ../SOURCES/dms-distropkg-arm64.gz ]; then \
-			gunzip -c ../SOURCES/dms-distropkg-arm64.gz > dms; \
-		elif [ -f ../../SOURCES/dms-distropkg-arm64.gz ]; then \
-			gunzip -c ../../SOURCES/dms-distropkg-arm64.gz > dms; \
-		else \
-			echo "ERROR: dms-distropkg-arm64.gz not found!" && exit 1; \
-		fi \
-	else \
-		echo "Unsupported architecture: $(DEB_HOST_ARCH)" && exit 1; \
-	fi
-	chmod +x dms
-
-	if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \
-		if [ -f ../SOURCES/dms-source.tar.gz ]; then \
-			tar -xzf ../SOURCES/dms-source.tar.gz; \
-		elif [ -f dms-source.tar.gz ]; then \
-			tar -xzf dms-source.tar.gz; \
-		fi; \
-		if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ] && [ -d DankMaterialShell-0.6.2 ]; then \
-			mv DankMaterialShell-0.6.2 DankMaterialShell-$(UPSTREAM_VERSION); \
-		fi; \
-	fi
-
-
-override_dh_auto_install:
-	install -Dm755 dms debian/dms/usr/bin/dms
-
-	mkdir -p debian/dms/usr/share/quickshell/dms debian/dms/usr/lib/systemd/user
-	# Handle directory name mismatch again for install step if needed
-	if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ] && [ -d DankMaterialShell-0.6.2 ]; then \
-		mv DankMaterialShell-0.6.2 DankMaterialShell-$(UPSTREAM_VERSION); \
-	fi
-	if [ -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \
-		cp -r DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \
-		install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/assets/systemd/dms.service debian/dms/usr/lib/systemd/user/dms.service; \
-	else \
-		echo "ERROR: DankMaterialShell-$(UPSTREAM_VERSION) directory not found!" && \
-		echo "Contents of current directory:" && ls -la && \
-		exit 1; \
-	fi
-
-	rm -rf debian/dms/usr/share/quickshell/dms/core \
-		debian/dms/usr/share/quickshell/dms/distro
-
-override_dh_auto_clean:
-	rm -f dms
-	rm -rf DankMaterialShell-$(UPSTREAM_VERSION)
-	dh_auto_clean

distro/debian/dms/debian/source/format

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

distro/debian/dms/debian/source/include-binaries

@@ -1,2 +0,0 @@
-dms-distropkg-amd64.gz
-dms-source.tar.gz

distro/debian/dms/debian/source/options

@@ -1,4 +0,0 @@
-# Include files that are normally excluded by .gitignore
-# These are needed for the build process on Launchpad 
-tar-ignore = !dms-distropkg-amd64.gz
-tar-ignore = !dms-source.tar.gz

distro/nix/common.nix

@@ -1,33 +0,0 @@
-{
-    config,
-    lib,
-    pkgs,
-    dmsPkgs,
-    ...
-}: let
-    cfg = config.programs.dankMaterialShell;
-in {
-    qmlPath = "${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms";
-
-    packages =
-        [
-            pkgs.material-symbols
-            pkgs.inter
-            pkgs.fira-code
-
-            pkgs.ddcutil
-            pkgs.libsForQt5.qt5ct
-            pkgs.kdePackages.qt6ct
-
-            dmsPkgs.dmsCli
-        ]
-        ++ lib.optional cfg.enableSystemMonitoring dmsPkgs.dgop
-        ++ lib.optionals cfg.enableClipboard [pkgs.cliphist pkgs.wl-clipboard]
-        ++ lib.optionals cfg.enableVPN [pkgs.glib pkgs.networkmanager]
-        ++ lib.optional cfg.enableBrightnessControl pkgs.brightnessctl
-        ++ lib.optional cfg.enableColorPicker pkgs.hyprpicker
-        ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
-        ++ lib.optional cfg.enableAudioWavelength pkgs.cava
-        ++ lib.optional cfg.enableCalendarEvents pkgs.khal
-        ++ lib.optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia;
-}

distro/nix/default.nix

@@ -0,0 +1,170 @@
+{
+    config,
+    pkgs,
+    lib,
+    dmsPkgs,
+    ...
+}: let
+    cfg = config.programs.dankMaterialShell;
+    jsonFormat = pkgs.formats.json { };
+in {
+    imports = [
+        (lib.mkRemovedOptionModule ["programs" "dankMaterialShell" "enableNightMode"] "Night mode is now always available.")
+        (lib.mkRenamedOptionModule ["programs" "dankMaterialShell" "enableSystemd"] ["programs" "dankMaterialShell" "systemd" "enable"])
+    ];
+    options.programs.dankMaterialShell = with lib.types; {
+        enable = lib.mkEnableOption "DankMaterialShell";
+
+        systemd = {
+            enable = lib.mkEnableOption "DankMaterialShell systemd startup";
+            restartIfChanged = lib.mkOption {
+                type = bool;
+                default = true;
+                description = "Auto-restart dms.service when dankMaterialShell changes";
+            };
+        };
+        enableSystemMonitoring = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to use system monitoring widgets";
+        };
+        enableClipboard = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to use the clipboard widget";
+        };
+        enableVPN = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to use the VPN widget";
+        };
+        enableBrightnessControl = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to have brightness/backlight support";
+        };
+        enableColorPicker = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to have color picking support";
+        };
+        enableDynamicTheming = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to have dynamic theming support";
+        };
+        enableAudioWavelength = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to have audio waveleng support";
+        };
+        enableCalendarEvents = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add calendar events support via khal";
+        };
+        enableSystemSound = lib.mkOption {
+            type = bool;
+            default = true;
+            description = "Add needed dependencies to have system sound support";
+        };
+        quickshell = {
+            package = lib.mkPackageOption pkgs "quickshell" {};
+        };
+
+        default = {
+            settings = lib.mkOption {
+                type = jsonFormat.type;
+                default = { };
+                description = "The default settings are only read if the settings.json file don't exist";
+            };
+            session = lib.mkOption {
+                type = jsonFormat.type;
+                default = { };
+                description = "The default session are only read if the session.json file don't exist";
+            };
+        };
+
+        plugins = lib.mkOption {
+            type = attrsOf (types.submodule ({ config, ... }: {
+                options = {
+                    enable = lib.mkOption {
+                        type = types.bool;
+                        default = true;
+                        description = "Whether to link this plugin";
+                    };
+                    src = lib.mkOption {
+                        type = types.path;
+                        description = "Source to link to DMS plugins directory";
+                    };
+                };
+            }));
+            default = {};
+            description = "DMS Plugins to install";
+        };
+    };
+
+    config = lib.mkIf cfg.enable
+    {
+        programs.quickshell = {
+            enable = true;
+            package = cfg.quickshell.package;
+
+            configs.dms = "${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms";
+        };
+
+        systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
+            Unit = {
+                Description = "DankMaterialShell";
+                PartOf = [ config.wayland.systemd.target ];
+                After = [ config.wayland.systemd.target ];
+                X-Restart-Triggers = lib.optional cfg.systemd.restartIfChanged config.programs.quickshell.configs.dms;
+            };
+
+            Service = {
+                ExecStart = lib.getExe dmsPkgs.dmsCli + " run --session";
+                Restart = "on-failure";
+            };
+
+            Install.WantedBy = [ config.wayland.systemd.target ];
+        };
+
+        xdg.stateFile."DankMaterialShell/default-session.json" = lib.mkIf (cfg.default.session != { }) {
+            source = jsonFormat.generate "default-session.json" cfg.default.session;
+        };
+
+        xdg.configFile = lib.mkMerge [
+            (lib.mapAttrs' (name: plugin: {
+                name = "DankMaterialShell/plugins/${name}";
+                value.source = plugin.src;
+            }) (lib.filterAttrs (n: v: v.enable) cfg.plugins))
+            {
+                "DankMaterialShell/default-settings.json" = lib.mkIf (cfg.default.settings != { }) {
+                    source = jsonFormat.generate "default-settings.json" cfg.default.settings;
+                };
+            }
+        ];
+
+        home.packages =
+            [
+                pkgs.material-symbols
+                pkgs.inter
+                pkgs.fira-code
+
+                pkgs.ddcutil
+                pkgs.libsForQt5.qt5ct
+                pkgs.kdePackages.qt6ct
+
+                dmsPkgs.dmsCli
+            ]
+            ++ lib.optional cfg.enableSystemMonitoring dmsPkgs.dgop
+            ++ lib.optionals cfg.enableClipboard [pkgs.cliphist pkgs.wl-clipboard]
+            ++ lib.optionals cfg.enableVPN [pkgs.glib pkgs.networkmanager]
+            ++ lib.optional cfg.enableBrightnessControl pkgs.brightnessctl
+            ++ lib.optional cfg.enableColorPicker pkgs.hyprpicker
+            ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
+            ++ lib.optional cfg.enableAudioWavelength pkgs.cava
+            ++ lib.optional cfg.enableCalendarEvents pkgs.khal
+            ++ lib.optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia;
+    };
+}

distro/nix/greeter.nix

@@ -11,7 +11,7 @@
     user = config.services.greetd.settings.default_session.user;
 
     greeterScript = pkgs.writeShellScriptBin "dms-greeter" ''
-        export PATH=$PATH:${lib.makeBinPath [cfg.quickshell.package config.programs.${cfg.compositor.name}.package]}
+        export PATH=$PATH:${lib.makeBinPath [ cfg.quickshell.package config.programs.${cfg.compositor.name}.package ]}
         ${lib.escapeShellArgs ([
             "sh"
             "${../../quickshell/Modules/Greetd/assets/dms-greeter}"
@@ -28,9 +28,11 @@
         ])} ${lib.optionalString cfg.logs.save "> ${cfg.logs.path} 2>&1"}
     '';
 in {
-    imports = let
-        msg = "The option 'programs.dankMaterialShell.greeter.compositor.extraConfig' is deprecated. Please use 'programs.dankMaterialShell.greeter.compositor.customConfig' instead.";
-    in [(lib.mkRemovedOptionModule ["programs" "dankMaterialShell" "greeter" "compositor" "extraConfig"] msg)];
+    imports =
+        let
+            msg = "The option 'programs.dankMaterialShell.greeter.compositor.extraConfig' is deprecated. Please use 'programs.dankMaterialShell.greeter.compositor.customConfig' instead.";
+        in
+        [ (lib.mkRemovedOptionModule [ "programs" "dankMaterialShell" "greeter" "compositor" "extraConfig" ] msg) ];
 
     options.programs.dankMaterialShell.greeter = {
         enable = lib.mkEnableOption "DankMaterialShell greeter";
@@ -75,7 +77,7 @@ in {
     config = lib.mkIf cfg.enable {
         assertions = [
             {
-                assertion = (config.users.users.${user} or {}) != {};
+                assertion = (config.users.users.${user} or { }) != { };
                 message = ''
                     dmsgreeter: user set for greetd default_session ${user} does not exist. Please create it before referencing it.
                 '';
@@ -93,10 +95,8 @@ in {
         systemd.tmpfiles.settings."10-dmsgreeter" = {
             "/var/lib/dmsgreeter".d = {
                 user = user;
-                group =
-                    if config.users.users.${user}.group != ""
-                    then config.users.users.${user}.group
-                    else "greeter";
+                group = if config.users.users.${user}.group != ""
+                    then config.users.users.${user}.group else "greeter";
                 mode = "0755";
             };
         };
@@ -106,8 +106,7 @@ in {
                 if [ -f "${f}" ]; then
                     cp "${f}" .
                 fi
-            '')
-            cfg.configFiles)}
+            '') cfg.configFiles)}
 
             if [ -f session.json ]; then
                 if cp "$(${lib.getExe pkgs.jq} -r '.wallpaperPath' session.json)" wallpaper.jpg; then

distro/nix/home.nix

@@ -1,94 +0,0 @@
-{
-    config,
-    pkgs,
-    lib,
-    dmsPkgs,
-    ...
-}: let
-    cfg = config.programs.dankMaterialShell;
-    jsonFormat = pkgs.formats.json {};
-    common = import ./common.nix {inherit config pkgs lib dmsPkgs;};
-in {
-    imports = [
-        ./options.nix
-        (lib.mkRemovedOptionModule ["programs" "dankMaterialShell" "enableNightMode"] "Night mode is now always available.")
-        (lib.mkRenamedOptionModule ["programs" "dankMaterialShell" "enableSystemd"] ["programs" "dankMaterialShell" "systemd" "enable"])
-    ];
-
-    options.programs.dankMaterialShell = with lib.types; {
-        default = {
-            settings = lib.mkOption {
-                type = jsonFormat.type;
-                default = {};
-                description = "The default settings are only read if the settings.json file don't exist";
-            };
-            session = lib.mkOption {
-                type = jsonFormat.type;
-                default = {};
-                description = "The default session are only read if the session.json file don't exist";
-            };
-        };
-
-        plugins = lib.mkOption {
-            type = attrsOf (types.submodule ({config, ...}: {
-                options = {
-                    enable = lib.mkOption {
-                        type = types.bool;
-                        default = true;
-                        description = "Whether to link this plugin";
-                    };
-                    src = lib.mkOption {
-                        type = types.path;
-                        description = "Source to link to DMS plugins directory";
-                    };
-                };
-            }));
-            default = {};
-            description = "DMS Plugins to install";
-        };
-    };
-
-    config = lib.mkIf cfg.enable
-    {
-        programs.quickshell = {
-            enable = true;
-            package = cfg.quickshell.package;
-
-            configs.dms = common.qmlPath;
-        };
-
-        systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
-            Unit = {
-                Description = "DankMaterialShell";
-                PartOf = [config.wayland.systemd.target];
-                After = [config.wayland.systemd.target];
-                X-Restart-Triggers = lib.optional cfg.systemd.restartIfChanged common.qmlPath;
-            };
-
-            Service = {
-                ExecStart = lib.getExe dmsPkgs.dmsCli + " run --session";
-                Restart = "on-failure";
-            };
-
-            Install.WantedBy = [config.wayland.systemd.target];
-        };
-
-        xdg.stateFile."DankMaterialShell/default-session.json" = lib.mkIf (cfg.default.session != {}) {
-            source = jsonFormat.generate "default-session.json" cfg.default.session;
-        };
-
-        xdg.configFile = lib.mkMerge [
-            (lib.mapAttrs' (name: plugin: {
-                name = "DankMaterialShell/plugins/${name}";
-                value.source = plugin.src;
-            }) (lib.filterAttrs (n: v: v.enable) cfg.plugins))
-            {
-                "DankMaterialShell/default-settings.json" = lib.mkIf (cfg.default.settings != {}) {
-                    source = jsonFormat.generate "default-settings.json" cfg.default.settings;
-                };
-            }
-        ];
-
-        home.packages = common.packages;
-    };
-}

distro/nix/nixos.nix

@@ -1,36 +0,0 @@
-{
-    config,
-    pkgs,
-    lib,
-    dmsPkgs,
-    ...
-}: let
-    cfg = config.programs.dankMaterialShell;
-    common = import ./common.nix {inherit config pkgs lib dmsPkgs;};
-in {
-    imports = [
-        ./options.nix
-    ];
-
-    config = lib.mkIf cfg.enable
-    {
-        environment.etc."xdg/quickshell/dms".source = "${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms";
-
-        systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
-            description = "DankMaterialShell";
-            path = [cfg.quickshell.package];
-
-            partOf = ["graphical-session.target"];
-            after = ["graphical-session.target"];
-            wantedBy = ["graphical-session.target"];
-            restartTriggers = lib.optional cfg.systemd.restartIfChanged common.qmlPath;
-
-            serviceConfig = {
-                ExecStart = lib.getExe dmsPkgs.dmsCli + " run --session";
-                Restart = "on-failure";
-            };
-        };
-
-        environment.systemPackages = [cfg.quickshell.package] ++ common.packages;
-    };
-}

distro/nix/options.nix

@@ -1,68 +0,0 @@
-{
-    pkgs,
-    lib,
-    ...
-}: let
-    inherit (lib) types;
-in {
-    options.programs.dankMaterialShell = {
-        enable = lib.mkEnableOption "DankMaterialShell";
-
-        systemd = {
-            enable = lib.mkEnableOption "DankMaterialShell systemd startup";
-            restartIfChanged = lib.mkOption {
-                type = types.bool;
-                default = true;
-                description = "Auto-restart dms.service when dankMaterialShell changes";
-            };
-        };
-        enableSystemMonitoring = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to use system monitoring widgets";
-        };
-        enableClipboard = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to use the clipboard widget";
-        };
-        enableVPN = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to use the VPN widget";
-        };
-        enableBrightnessControl = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to have brightness/backlight support";
-        };
-        enableColorPicker = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to have color picking support";
-        };
-        enableDynamicTheming = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to have dynamic theming support";
-        };
-        enableAudioWavelength = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to have audio wavelength support";
-        };
-        enableCalendarEvents = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add calendar events support via khal";
-        };
-        enableSystemSound = lib.mkOption {
-            type = types.bool;
-            default = true;
-            description = "Add needed dependencies to have system sound support";
-        };
-        quickshell = {
-            package = lib.mkPackageOption pkgs "quickshell" {};
-        };
-    };
-}

distro/opensuse/_service

@@ -1,24 +0,0 @@
-<services>
-  <!-- Pull full git repository for master branch (QML code) -->
-  <service name="tar_scm">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/AvengeMedia/DankMaterialShell.git</param>
-    <param name="revision">master</param>
-    <param name="filename">dms-git-source</param>
-  </service>
-  <service name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <!-- Download pre-built binaries -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-amd64.gz</param>
-  </service>
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-arm64.gz</param>
-  </service>
-</services>

distro/opensuse/dms-git.spec

@@ -1,107 +0,0 @@
-%global debug_package %{nil}
-
-Name:           dms-git
-Version:        0.6.2+git
-Release:        5%{?dist}
-Epoch:          1
-Summary:        DankMaterialShell - Material 3 inspired shell (git nightly)
-
-License:        MIT
-URL:            https://github.com/AvengeMedia/DankMaterialShell
-Source0:        dms-git-source.tar.gz
-Source1:        dms-distropkg-amd64.gz
-Source2:        dms-distropkg-arm64.gz
-
-BuildRequires:  gzip
-BuildRequires:  systemd-rpm-macros
-
-Requires:       (quickshell-git or quickshell)
-Requires:       accountsservice
-Requires:       dgop
-
-Recommends:     cava
-Recommends:     cliphist
-Recommends:     danksearch
-Recommends:     matugen
-Recommends:     quickshell-git
-Recommends:     wl-clipboard
-
-Recommends:     NetworkManager
-Recommends:     qt6-qtmultimedia
-Suggests:       qt6ct
-
-Provides:       dms
-Conflicts:      dms
-Obsoletes:      dms
-
-%description
-DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
-and optimized for niri, Hyprland, Sway, and other wlroots compositors.
-
-This git version tracks the master branch and includes the latest features
-and fixes. Includes pre-built dms CLI binary and QML shell files.
-
-%prep
-%setup -q -n dms-git-source
-
-%ifarch x86_64
-gunzip -c %{SOURCE1} > dms
-%endif
-%ifarch aarch64
-gunzip -c %{SOURCE2} > dms
-%endif
-chmod +x dms
-
-%build
-
-%install
-install -Dm755 dms %{buildroot}%{_bindir}/dms
-
-install -d %{buildroot}%{_datadir}/bash-completion/completions
-install -d %{buildroot}%{_datadir}/zsh/site-functions
-install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
-./dms completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
-./dms completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
-./dms completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
-
-install -Dm644 quickshell/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
-
-install -dm755 %{buildroot}%{_datadir}/quickshell/dms
-cp -r quickshell/* %{buildroot}%{_datadir}/quickshell/dms/
-
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
-rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/core
-
-%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
-fi
-
-if [ "$1" -ge 2 ]; then
-  pkill -USR1 -x dms >/dev/null 2>&1 || true
-fi
-
-%files
-%license LICENSE
-%doc CONTRIBUTING.md
-%doc quickshell/README.md
-%{_bindir}/dms
-%dir %{_datadir}/fish
-%dir %{_datadir}/fish/vendor_completions.d
-%{_datadir}/fish/vendor_completions.d/dms.fish
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_dms
-%{_datadir}/bash-completion/completions/dms
-%dir %{_datadir}/quickshell
-%{_datadir}/quickshell/dms/
-%{_userunitdir}/dms.service
-
-%changelog
-* Fri Nov 22 2025 AvengeMedia <maintainer@avengemedia.com> - 0.6.2+git-5
-- Git nightly build from master branch
-- Multi-arch support (x86_64, aarch64)

distro/opensuse/dms.spec

@@ -1,107 +0,0 @@
-# Spec for DMS for OpenSUSE/OBS
-
-%global debug_package %{nil}
-
-Name:           dms
-Version:        0.6.2
-Release:        1%{?dist}
-Summary:        DankMaterialShell - Material 3 inspired shell for Wayland compositors
-
-License:        MIT
-URL:            https://github.com/AvengeMedia/DankMaterialShell
-Source0:        dms-source.tar.gz
-Source1:        dms-distropkg-amd64.gz
-Source2:        dms-distropkg-arm64.gz
-
-BuildRequires:  gzip
-BuildRequires:  systemd-rpm-macros
-
-# Core requirements
-Requires:       (quickshell-git or quickshell)
-Requires:       accountsservice
-Requires:       dgop
-
-# Core utilities (Highly recommended for DMS functionality)
-Recommends:     cava
-Recommends:     cliphist
-Recommends:     danksearch
-Recommends:     matugen
-Recommends:     NetworkManager
-Recommends:     qt6-qtmultimedia
-Recommends:     wl-clipboard
-Suggests:       qt6ct
-
-%description
-DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
-and optimized for niri, Hyprland, Sway, and other wlroots compositors. Features
-notifications, app launcher, wallpaper customization, and plugin system.
-
-Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
-process monitoring, notification center, clipboard history, dock, control center,
-lock screen, and comprehensive plugin system.
-
-%prep
-%setup -q -n DankMaterialShell-%{version}
-
-%ifarch x86_64
-gunzip -c %{SOURCE1} > dms
-%endif
-%ifarch aarch64
-gunzip -c %{SOURCE2} > dms
-%endif
-chmod +x dms
-
-%build
-
-%install
-install -Dm755 dms %{buildroot}%{_bindir}/dms
-
-install -d %{buildroot}%{_datadir}/bash-completion/completions
-install -d %{buildroot}%{_datadir}/zsh/site-functions
-install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
-./dms completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
-./dms completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
-./dms completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
-
-install -Dm644 quickshell/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
-
-install -dm755 %{buildroot}%{_datadir}/quickshell/dms
-cp -r quickshell/* %{buildroot}%{_datadir}/quickshell/dms/
-
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
-rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/core
-
-%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 CONTRIBUTING.md
-%doc quickshell/README.md
-%{_bindir}/dms
-%dir %{_datadir}/fish
-%dir %{_datadir}/fish/vendor_completions.d
-%{_datadir}/fish/vendor_completions.d/dms.fish
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_dms
-%{_datadir}/bash-completion/completions/dms
-%dir %{_datadir}/quickshell
-%{_datadir}/quickshell/dms/
-%{_userunitdir}/dms.service
-
-%changelog
-* Fri Nov 22 2025 AvengeMedia <maintainer@avengemedia.com> - 0.6.2-1
-- Stable release build with pre-built binaries
-- Multi-arch support (x86_64, aarch64)

distro/scripts/obs-status.sh

@@ -1,106 +0,0 @@
-#!/bin/bash
-# Unified OBS status checker for dms packages
-# Checks all platforms (Debian, OpenSUSE) and architectures (x86_64, aarch64)
-# Only pulls logs if build failed
-# Usage: ./distro/scripts/obs-status.sh [package-name]
-#
-# Examples:
-#   ./distro/scripts/obs-status.sh              # Check all packages
-#   ./distro/scripts/obs-status.sh dms          # Check specific package
-
-OBS_BASE_PROJECT="home:AvengeMedia"
-OBS_BASE="$HOME/.cache/osc-checkouts"
-
-ALL_PACKAGES=(dms dms-git)
-
-REPOS=("Debian_13" "openSUSE_Tumbleweed" "16.0")
-ARCHES=("x86_64" "aarch64")
-
-if [[ -n "$1" ]]; then
-    PACKAGES=("$1")
-else
-    PACKAGES=("${ALL_PACKAGES[@]}")
-fi
-
-cd "$OBS_BASE"
-
-for pkg in "${PACKAGES[@]}"; do
-    case "$pkg" in
-        dms)
-            PROJECT="$OBS_BASE_PROJECT:dms"
-            ;;
-        dms-git)
-            PROJECT="$OBS_BASE_PROJECT:dms-git"
-            ;;
-        *)
-            echo "Error: Unknown package '$pkg'"
-            continue
-            ;;
-    esac
-    
-    echo "=========================================="
-    echo "=== $pkg ==="
-    echo "=========================================="
-    
-    # Checkout if needed
-    if [[ ! -d "$PROJECT/$pkg" ]]; then
-        osc co "$PROJECT/$pkg" 2>&1 | tail -1
-    fi
-    
-    cd "$PROJECT/$pkg"
-    
-    ALL_RESULTS=$(osc results 2>&1)
-    
-    # Check each repository and architecture
-    FAILED_BUILDS=()
-    for repo in "${REPOS[@]}"; do
-        for arch in "${ARCHES[@]}"; do
-            STATUS=$(echo "$ALL_RESULTS" | grep "$repo.*$arch" | awk '{print $NF}' | head -1)
-            
-            if [[ -n "$STATUS" ]]; then
-                # Color code status
-                case "$STATUS" in
-                    succeeded)
-                        COLOR="\033[0;32m"  # Green
-                        SYMBOL="✅"
-                        ;;
-                    failed)
-                        COLOR="\033[0;31m"  # Red
-                        SYMBOL="❌"
-                        FAILED_BUILDS+=("$repo $arch")
-                        ;;
-                    unresolvable)
-                        COLOR="\033[0;33m"  # Yellow
-                        SYMBOL="⚠️"
-                        ;;
-                    *)
-                        COLOR="\033[0;37m"  # White
-                        SYMBOL="⏳"
-                        ;;
-                esac
-                echo -e "  $SYMBOL $repo $arch: ${COLOR}$STATUS\033[0m"
-            fi
-        done
-    done
-    
-    # Pull logs for failed builds
-    if [[ ${#FAILED_BUILDS[@]} -gt 0 ]]; then
-        echo ""
-        echo "  📋 Fetching logs for failed builds..."
-        for build in "${FAILED_BUILDS[@]}"; do
-            read -r repo arch <<< "$build"
-            echo ""
-            echo "  ────────────────────────────────────────────"
-            echo "  Build log: $repo $arch"
-            echo "  ────────────────────────────────────────────"
-            osc remotebuildlog "$PROJECT" "$pkg" "$repo" "$arch" 2>&1 | tail -100
-        done
-    fi
-    
-    echo ""
-    cd - > /dev/null
-done
-
-echo "=========================================="
-echo "Status check complete!"
-

distro/scripts/obs-upload.sh

@@ -1,868 +0,0 @@
-#!/bin/bash
-# Unified OBS upload script for dms packages
-# Handles Debian and OpenSUSE builds for both x86_64 and aarch64
-# Usage: ./distro/scripts/obs-upload.sh [distro] <package-name> [commit-message]
-#
-# Examples:
-#   ./distro/scripts/obs-upload.sh dms "Update to v0.6.2"
-#   ./distro/scripts/obs-upload.sh debian dms
-#   ./distro/scripts/obs-upload.sh opensuse dms-git
-
-set -e
-
-UPLOAD_DEBIAN=true
-UPLOAD_OPENSUSE=true
-PACKAGE=""
-MESSAGE=""
-
-for arg in "$@"; do
-    case "$arg" in
-        debian)
-            UPLOAD_DEBIAN=true
-            UPLOAD_OPENSUSE=false
-            ;;
-        opensuse)
-            UPLOAD_DEBIAN=false
-            UPLOAD_OPENSUSE=true
-            ;;
-        *)
-            if [[ -z "$PACKAGE" ]]; then
-                PACKAGE="$arg"
-            elif [[ -z "$MESSAGE" ]]; then
-                MESSAGE="$arg"
-            fi
-            ;;
-    esac
-done
-
-OBS_BASE_PROJECT="home:AvengeMedia"
-OBS_BASE="$HOME/.cache/osc-checkouts"
-AVAILABLE_PACKAGES=(dms dms-git)
-
-if [[ -z "$PACKAGE" ]]; then
-    echo "Available packages:"
-    echo ""
-    echo "  1. dms         - Stable DMS"
-    echo "  2. dms-git     - Nightly DMS"
-    echo "  a. all"
-    echo ""
-    read -p "Select package (1-${#AVAILABLE_PACKAGES[@]}, a): " selection
-    
-    if [[ "$selection" == "a" ]] || [[ "$selection" == "all" ]]; then
-        PACKAGE="all"
-    elif [[ "$selection" =~ ^[0-9]+$ ]] && [[ "$selection" -ge 1 ]] && [[ "$selection" -le ${#AVAILABLE_PACKAGES[@]} ]]; then
-        PACKAGE="${AVAILABLE_PACKAGES[$((selection-1))]}"
-    else
-        echo "Error: Invalid selection"
-        exit 1
-    fi
-    
-fi
-
-if [[ -z "$MESSAGE" ]]; then
-    MESSAGE="Update packaging"
-fi
-
-REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-cd "$REPO_ROOT"
-
-if [[ ! -d "distro/debian" ]]; then
-    echo "Error: Run this script from the repository root"
-    exit 1
-fi
-
-# Handle "all" option
-if [[ "$PACKAGE" == "all" ]]; then
-    echo "==> Uploading all packages"
-    DISTRO_ARG=""
-    if [[ "$UPLOAD_DEBIAN" == true && "$UPLOAD_OPENSUSE" == false ]]; then
-        DISTRO_ARG="debian"
-    elif [[ "$UPLOAD_DEBIAN" == false && "$UPLOAD_OPENSUSE" == true ]]; then
-        DISTRO_ARG="opensuse"
-    fi
-    echo ""
-    FAILED=()
-    for pkg in "${AVAILABLE_PACKAGES[@]}"; do
-        if [[ -d "distro/debian/$pkg" ]]; then
-            echo "=========================================="
-            echo "Uploading $pkg..."
-            echo "=========================================="
-            if [[ -n "$DISTRO_ARG" ]]; then
-                if bash "$0" "$DISTRO_ARG" "$pkg" "$MESSAGE"; then
-                    echo "✅ $pkg uploaded successfully"
-                else
-                    echo "❌ $pkg failed to upload"
-                    FAILED+=("$pkg")
-                fi
-            else
-                if bash "$0" "$pkg" "$MESSAGE"; then
-                    echo "✅ $pkg uploaded successfully"
-                else
-                    echo "❌ $pkg failed to upload"
-                    FAILED+=("$pkg")
-                fi
-            fi
-            echo ""
-        else
-            echo "⚠️  Skipping $pkg (not found in distro/debian/)"
-        fi
-    done
-    
-    if [[ ${#FAILED[@]} -eq 0 ]]; then
-        echo "✅ All packages uploaded successfully!"
-        exit 0
-    else
-        echo "❌ Some packages failed: ${FAILED[*]}"
-        exit 1
-    fi
-fi
-
-# Check if package exists
-if [[ ! -d "distro/debian/$PACKAGE" ]]; then
-    echo "Error: Package '$PACKAGE' not found in distro/debian/"
-    exit 1
-fi
-
-case "$PACKAGE" in
-    dms)
-        PROJECT="dms"
-        ;;
-    dms-git)
-        PROJECT="dms-git"
-        ;;
-    *)
-        echo "Error: Unknown package '$PACKAGE'"
-        exit 1
-        ;;
-esac
-
-OBS_PROJECT="${OBS_BASE_PROJECT}:${PROJECT}"
-
-echo "==> Target: $OBS_PROJECT / $PACKAGE"
-if [[ "$UPLOAD_DEBIAN" == true && "$UPLOAD_OPENSUSE" == true ]]; then
-    echo "==> Distributions: Debian + OpenSUSE"
-elif [[ "$UPLOAD_DEBIAN" == true ]]; then
-    echo "==> Distribution: Debian only"
-elif [[ "$UPLOAD_OPENSUSE" == true ]]; then
-    echo "==> Distribution: OpenSUSE only"
-fi
-
-mkdir -p "$OBS_BASE"
-
-if [[ ! -d "$OBS_BASE/$OBS_PROJECT/$PACKAGE" ]]; then
-    echo "Checking out $OBS_PROJECT/$PACKAGE..."
-    cd "$OBS_BASE"
-    osc co "$OBS_PROJECT/$PACKAGE"
-    cd "$REPO_ROOT"
-fi
-
-WORK_DIR="$OBS_BASE/$OBS_PROJECT/$PACKAGE"
-
-echo "==> Preparing $PACKAGE for OBS upload"
-
-find "$WORK_DIR" -maxdepth 1 -type f \( -name "*.tar.gz" -o -name "*.tar.xz" -o -name "*.tar.bz2" -o -name "*.tar" -o -name "*.spec" -o -name "_service" -o -name "*.dsc" \) -delete 2>/dev/null || true
-
-if [[ -f "distro/debian/$PACKAGE/_service" ]]; then
-    echo "  - Copying _service (for binary downloads)"
-    cp "distro/debian/$PACKAGE/_service" "$WORK_DIR/"
-fi
-
-CHANGELOG_VERSION=""
-if [[ -d "distro/debian/$PACKAGE/debian" ]]; then
-    CHANGELOG_VERSION=$(grep -m1 "^$PACKAGE" "distro/debian/$PACKAGE/debian/changelog" 2>/dev/null | sed 's/.*(\([^)]*\)).*/\1/' || echo "")
-    if [[ -n "$CHANGELOG_VERSION" ]] && [[ "$CHANGELOG_VERSION" == *"-"* ]]; then
-        SOURCE_FORMAT_CHECK=$(cat "distro/debian/$PACKAGE/debian/source/format" 2>/dev/null || echo "3.0 (quilt)")
-        if [[ "$SOURCE_FORMAT_CHECK" == *"native"* ]]; then
-            CHANGELOG_VERSION=$(echo "$CHANGELOG_VERSION" | sed 's/-[0-9]*$//')
-        fi
-    fi
-fi
-
-if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]]; then
-    echo "  - Copying $PACKAGE.spec for OpenSUSE"
-    cp "distro/opensuse/$PACKAGE.spec" "$WORK_DIR/"
-
-    if [[ -f "$WORK_DIR/.osc/$PACKAGE.spec" ]]; then
-        NEW_VERSION=$(grep "^Version:" "$WORK_DIR/$PACKAGE.spec" | awk '{print $2}' | head -1)
-        NEW_RELEASE=$(grep "^Release:" "$WORK_DIR/$PACKAGE.spec" | sed 's/^Release:[[:space:]]*//' | sed 's/%{?dist}//' | head -1)
-        OLD_VERSION=$(grep "^Version:" "$WORK_DIR/.osc/$PACKAGE.spec" | awk '{print $2}' | head -1)
-        OLD_RELEASE=$(grep "^Release:" "$WORK_DIR/.osc/$PACKAGE.spec" | sed 's/^Release:[[:space:]]*//' | sed 's/%{?dist}//' | head -1)
-
-        if [[ "$NEW_VERSION" == "$OLD_VERSION" ]]; then
-            if [[ "$OLD_RELEASE" =~ ^([0-9]+) ]]; then
-                BASE_RELEASE="${BASH_REMATCH[1]}"
-                NEXT_RELEASE=$((BASE_RELEASE + 1))
-                echo "  - Detected rebuild of same version $NEW_VERSION (release $OLD_RELEASE -> $NEXT_RELEASE)"
-                sed -i "s/^Release:[[:space:]]*${NEW_RELEASE}%{?dist}/Release:        ${NEXT_RELEASE}%{?dist}/" "$WORK_DIR/$PACKAGE.spec"
-            fi
-        else
-            echo "  - New version detected: $OLD_VERSION -> $NEW_VERSION (keeping release $NEW_RELEASE)"
-        fi
-    else
-        echo "  - First upload to OBS (no previous spec found)"
-    fi
-elif [[ "$UPLOAD_OPENSUSE" == true ]]; then
-    echo "  - Warning: OpenSUSE spec file not found, skipping OpenSUSE upload"
-fi
-
-if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ "$UPLOAD_DEBIAN" == false ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]]; then
-    echo "  - OpenSUSE-only upload: creating source tarball"
-
-    TEMP_DIR=$(mktemp -d)
-    trap "rm -rf $TEMP_DIR" EXIT
-
-    if [[ -f "distro/debian/$PACKAGE/_service" ]] && grep -q "tar_scm" "distro/debian/$PACKAGE/_service"; then
-        GIT_URL=$(grep -A 5 'name="tar_scm"' "distro/debian/$PACKAGE/_service" | grep "url" | sed 's/.*<param name="url">\(.*\)<\/param>.*/\1/')
-        GIT_REVISION=$(grep -A 5 'name="tar_scm"' "distro/debian/$PACKAGE/_service" | grep "revision" | sed 's/.*<param name="revision">\(.*\)<\/param>.*/\1/')
-
-        if [[ -n "$GIT_URL" ]]; then
-            echo "    Cloning git source from: $GIT_URL (revision: ${GIT_REVISION:-master})"
-            SOURCE_DIR="$TEMP_DIR/dms-git-source"
-            if git clone --depth 1 --branch "${GIT_REVISION:-master}" "$GIT_URL" "$SOURCE_DIR" 2>/dev/null || \
-               git clone --depth 1 "$GIT_URL" "$SOURCE_DIR" 2>/dev/null; then
-                cd "$SOURCE_DIR"
-                if [[ -n "$GIT_REVISION" ]]; then
-                    git checkout "$GIT_REVISION" 2>/dev/null || true
-                fi
-                rm -rf .git
-                SOURCE_DIR=$(pwd)
-                cd "$REPO_ROOT"
-            fi
-        fi
-    fi
-
-    if [[ -n "$SOURCE_DIR" && -d "$SOURCE_DIR" ]]; then
-        SOURCE0=$(grep "^Source0:" "distro/opensuse/$PACKAGE.spec" | awk '{print $2}' | head -1)
-
-        if [[ -n "$SOURCE0" ]]; then
-            OBS_TARBALL_DIR=$(mktemp -d -t obs-tarball-XXXXXX)
-            cd "$OBS_TARBALL_DIR"
-
-            case "$PACKAGE" in
-                dms)
-                    DMS_VERSION=$(grep "^Version:" "$REPO_ROOT/distro/opensuse/$PACKAGE.spec" | sed 's/^Version:[[:space:]]*//' | head -1)
-                    EXPECTED_DIR="DankMaterialShell-${DMS_VERSION}"
-                    ;;
-                dms-git)
-                    EXPECTED_DIR="dms-git-source"
-                    ;;
-                *)
-                    EXPECTED_DIR=$(basename "$SOURCE_DIR")
-                    ;;
-            esac
-
-            echo "    Creating $SOURCE0 (directory: $EXPECTED_DIR)"
-            cp -r "$SOURCE_DIR" "$EXPECTED_DIR"
-            tar -czf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-            rm -rf "$EXPECTED_DIR"
-            echo "    Created $SOURCE0 ($(stat -c%s "$WORK_DIR/$SOURCE0" 2>/dev/null || echo 0) bytes)"
-
-            cd "$REPO_ROOT"
-            rm -rf "$OBS_TARBALL_DIR"
-        fi
-    else
-        echo "  - Warning: Could not obtain source for OpenSUSE tarball"
-    fi
-fi
-
-# Generate .dsc file and handle source format (for Debian only)
-if [[ "$UPLOAD_DEBIAN" == true ]] && [[ -d "distro/debian/$PACKAGE/debian" ]]; then
-    # Use CHANGELOG_VERSION already set above, or get it if not set
-    if [[ -z "$CHANGELOG_VERSION" ]]; then
-        CHANGELOG_VERSION=$(grep -m1 "^$PACKAGE" distro/debian/$PACKAGE/debian/changelog 2>/dev/null | sed 's/.*(\([^)]*\)).*/\1/' || echo "0.1.11")
-    fi
-    
-    # Determine source format
-    SOURCE_FORMAT=$(cat "distro/debian/$PACKAGE/debian/source/format" 2>/dev/null || echo "3.0 (quilt)")
-    
-    # For native format, remove any Debian revision (-N) from version
-    # Native format cannot have revisions, so strip them if present
-    if [[ "$SOURCE_FORMAT" == *"native"* ]] && [[ "$CHANGELOG_VERSION" == *"-"* ]]; then
-        # Remove Debian revision (everything from - onwards)
-        CHANGELOG_VERSION=$(echo "$CHANGELOG_VERSION" | sed 's/-[0-9]*$//')
-        echo "  Warning: Removed Debian revision from version for native format: $CHANGELOG_VERSION"
-    fi
-    
-    if [[ "$SOURCE_FORMAT" == *"native"* ]]; then
-        echo "  - Native format detected: creating combined tarball"
-
-        VERSION="$CHANGELOG_VERSION"
-        TEMP_DIR=$(mktemp -d)
-        trap "rm -rf $TEMP_DIR" EXIT
-        COMBINED_TARBALL="${PACKAGE}_${VERSION}.tar.gz"
-        SOURCE_DIR=""
-        
-        if [[ -f "distro/debian/$PACKAGE/_service" ]]; then
-            if grep -q "tar_scm" "distro/debian/$PACKAGE/_service"; then
-                GIT_URL=$(grep -A 5 'name="tar_scm"' "distro/debian/$PACKAGE/_service" | grep "url" | sed 's/.*<param name="url">\(.*\)<\/param>.*/\1/')
-                GIT_REVISION=$(grep -A 5 'name="tar_scm"' "distro/debian/$PACKAGE/_service" | grep "revision" | sed 's/.*<param name="revision">\(.*\)<\/param>.*/\1/')
-                
-                if [[ -n "$GIT_URL" ]]; then
-                    echo "    Cloning git source from: $GIT_URL (revision: ${GIT_REVISION:-master})"
-                    SOURCE_DIR="$TEMP_DIR/dms-git-source"
-                    if git clone --depth 1 --branch "${GIT_REVISION:-master}" "$GIT_URL" "$SOURCE_DIR" 2>/dev/null || \
-                       git clone --depth 1 "$GIT_URL" "$SOURCE_DIR" 2>/dev/null; then
-                        cd "$SOURCE_DIR"
-                        if [[ -n "$GIT_REVISION" ]]; then
-                            git checkout "$GIT_REVISION" 2>/dev/null || true
-                        fi
-                        rm -rf .git
-                        SOURCE_DIR=$(pwd)
-                        cd "$REPO_ROOT"
-                    else
-                        echo "Error: Failed to clone git repository"
-                        exit 1
-                    fi
-                fi
-            elif grep -q "download_url" "distro/debian/$PACKAGE/_service" && [[ "$PACKAGE" != "dms-git" ]]; then
-                ALL_PATHS=$(grep -A 5 '<service name="download_url">' "distro/debian/$PACKAGE/_service" | \
-                    grep '<param name="path">' | \
-                    sed 's/.*<param name="path">\(.*\)<\/param>.*/\1/')
-                
-                SOURCE_PATH=""
-                for path in $ALL_PATHS; do
-                    if echo "$path" | grep -qE "(source|archive|\.tar\.(gz|xz|bz2))" && \
-                       ! echo "$path" | grep -qE "(distropkg|binary)"; then
-                        SOURCE_PATH="$path"
-                        break
-                    fi
-                done
-                
-                if [[ -z "$SOURCE_PATH" ]]; then
-                    for path in $ALL_PATHS; do
-                        if echo "$path" | grep -qE "\.tar\.(gz|xz|bz2)$"; then
-                            SOURCE_PATH="$path"
-                            break
-                        fi
-                    done
-                fi
-                
-                if [[ -n "$SOURCE_PATH" ]]; then
-                    SOURCE_BLOCK=$(awk -v target="$SOURCE_PATH" '
-                        /<service name="download_url">/ { in_block=1; block="" }
-                        in_block { block=block"\n"$0 }
-                        /<\/service>/ { 
-                            if (in_block && block ~ target) {
-                                print block
-                                exit
-                            }
-                            in_block=0
-                        }
-                    ' "distro/debian/$PACKAGE/_service")
-                    
-                    URL_PROTOCOL=$(echo "$SOURCE_BLOCK" | grep "protocol" | sed 's/.*<param name="protocol">\(.*\)<\/param>.*/\1/' | head -1)
-                    URL_HOST=$(echo "$SOURCE_BLOCK" | grep "host" | sed 's/.*<param name="host">\(.*\)<\/param>.*/\1/' | head -1)
-                    URL_PATH="$SOURCE_PATH"
-                fi
-                
-                if [[ -n "$URL_PROTOCOL" && -n "$URL_HOST" && -n "$URL_PATH" ]]; then
-                    SOURCE_URL="${URL_PROTOCOL}://${URL_HOST}${URL_PATH}"
-                    echo "    Downloading source from: $SOURCE_URL"
-                    
-                    if wget -q -O "$TEMP_DIR/source-archive" "$SOURCE_URL" 2>/dev/null || \
-                       curl -L -f -s -o "$TEMP_DIR/source-archive" "$SOURCE_URL" 2>/dev/null; then
-                        cd "$TEMP_DIR"
-                        if [[ "$SOURCE_URL" == *.tar.xz ]]; then
-                            tar -xJf source-archive
-                        elif [[ "$SOURCE_URL" == *.tar.gz ]] || [[ "$SOURCE_URL" == *.tgz ]]; then
-                            tar -xzf source-archive
-                        fi
-                        SOURCE_DIR=$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" | head -1)
-                        if [[ -z "$SOURCE_DIR" ]]; then
-                            SOURCE_DIR=$(find . -maxdepth 1 -type d ! -name "." | head -1)
-                        fi
-                        if [[ -z "$SOURCE_DIR" || ! -d "$SOURCE_DIR" ]]; then
-                            echo "Error: Failed to extract source archive or find source directory"
-                            echo "Contents of $TEMP_DIR:"
-                            ls -la "$TEMP_DIR"
-                            cd "$REPO_ROOT"
-                            exit 1
-                        fi
-                        SOURCE_DIR=$(cd "$SOURCE_DIR" && pwd)
-                        cd "$REPO_ROOT"
-                    else
-                        echo "Error: Failed to download source from $SOURCE_URL"
-                        echo "Tried both wget and curl. Please check the URL and network connectivity."
-                        exit 1
-                    fi
-                fi
-            fi
-        fi
-        
-        if [[ -z "$SOURCE_DIR" || ! -d "$SOURCE_DIR" ]]; then
-            echo "Error: Could not determine or obtain source for $PACKAGE"
-            echo "SOURCE_DIR: $SOURCE_DIR"
-            if [[ -d "$TEMP_DIR" ]]; then
-                echo "Contents of temp directory:"
-                ls -la "$TEMP_DIR"
-            fi
-            exit 1
-        fi
-        
-        echo "    Found source directory: $SOURCE_DIR"
-        
-        # Create OpenSUSE-compatible source tarballs BEFORE adding debian/ directory
-        # (OpenSUSE doesn't need debian/ directory)
-        if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]]; then
-            echo "  - Creating OpenSUSE-compatible source tarballs"
-            
-            SOURCE0=$(grep "^Source0:" "distro/opensuse/$PACKAGE.spec" | awk '{print $2}' | head -1)
-            if [[ -z "$SOURCE0" && "$PACKAGE" == "dms-git" ]]; then
-                SOURCE0="dms-git-source.tar.gz"
-            fi
-
-            if [[ -n "$SOURCE0" ]]; then
-                OBS_TARBALL_DIR=$(mktemp -d -t obs-tarball-XXXXXX)
-                cd "$OBS_TARBALL_DIR"
-                
-                case "$PACKAGE" in
-                    dms)
-                        if [[ -n "$CHANGELOG_VERSION" ]]; then
-                            DMS_VERSION="$CHANGELOG_VERSION"
-                        else
-                            DMS_VERSION=$(grep "^Version:" "$REPO_ROOT/distro/opensuse/$PACKAGE.spec" | sed 's/^Version:[[:space:]]*//' | head -1)
-                        fi
-                        EXPECTED_DIR="DankMaterialShell-${DMS_VERSION}"
-                        echo "    Creating $SOURCE0 (directory: $EXPECTED_DIR)"
-                        cp -r "$SOURCE_DIR" "$EXPECTED_DIR"
-                        if [[ "$SOURCE0" == *.tar.xz ]]; then
-                            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -cJf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                        elif [[ "$SOURCE0" == *.tar.bz2 ]]; then
-                            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -cjf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                        else
-                            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                        fi
-                        rm -rf "$EXPECTED_DIR"
-                        echo "    Created $SOURCE0 ($(stat -c%s "$WORK_DIR/$SOURCE0" 2>/dev/null || echo 0) bytes)"
-                        ;;
-                    dms-git)
-                        EXPECTED_DIR="dms-git-source"
-                        echo "    Creating $SOURCE0 (directory: $EXPECTED_DIR)"
-                        cp -r "$SOURCE_DIR" "$EXPECTED_DIR"
-                        if [[ "$SOURCE0" == *.tar.xz ]]; then
-                            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -cJf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                        elif [[ "$SOURCE0" == *.tar.bz2 ]]; then
-                            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -cjf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                        else
-                            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$SOURCE0" "$EXPECTED_DIR"
-                        fi
-                        rm -rf "$EXPECTED_DIR"
-                        echo "    Created $SOURCE0 ($(stat -c%s "$WORK_DIR/$SOURCE0" 2>/dev/null || echo 0) bytes)"
-                        ;;
-                    *)
-                        DIR_NAME=$(basename "$SOURCE_DIR")
-                        echo "    Creating $SOURCE0 (directory: $DIR_NAME)"
-                        cp -r "$SOURCE_DIR" "$DIR_NAME"
-                        if [[ "$SOURCE0" == *.tar.xz ]]; then
-                            tar --sort=name --mtime='2000-01-01 00:00:00' -cJf "$WORK_DIR/$SOURCE0" "$DIR_NAME"
-                        elif [[ "$SOURCE0" == *.tar.bz2 ]]; then
-                            tar --sort=name --mtime='2000-01-01 00:00:00' -cjf "$WORK_DIR/$SOURCE0" "$DIR_NAME"
-                        else
-                            tar --sort=name --mtime='2000-01-01 00:00:00' -czf "$WORK_DIR/$SOURCE0" "$DIR_NAME"
-                        fi
-                        rm -rf "$DIR_NAME"
-                        echo "    Created $SOURCE0 ($(stat -c%s "$WORK_DIR/$SOURCE0" 2>/dev/null || echo 0) bytes)"
-                        ;;
-                esac
-                cd "$REPO_ROOT"
-                rm -rf "$OBS_TARBALL_DIR"
-                echo "  - OpenSUSE source tarballs created"
-            fi
-            
-            cp "distro/opensuse/$PACKAGE.spec" "$WORK_DIR/"
-        fi
-        
-        if [[ "$UPLOAD_DEBIAN" == true ]]; then
-            echo "    Copying debian/ directory into source"
-            cp -r "distro/debian/$PACKAGE/debian" "$SOURCE_DIR/"
-            
-            # For dms, rename directory to match what debian/rules expects
-            # debian/rules uses UPSTREAM_VERSION which is the full version from changelog
-            if [[ "$PACKAGE" == "dms" ]]; then
-                CHANGELOG_IN_SOURCE="$SOURCE_DIR/debian/changelog"
-                if [[ -f "$CHANGELOG_IN_SOURCE" ]]; then
-                    ACTUAL_VERSION=$(grep -m1 "^$PACKAGE" "$CHANGELOG_IN_SOURCE" 2>/dev/null | sed 's/.*(\([^)]*\)).*/\1/' || echo "$VERSION")
-                    CURRENT_DIR=$(basename "$SOURCE_DIR")
-                    EXPECTED_DIR="DankMaterialShell-${ACTUAL_VERSION}"
-                    if [[ "$CURRENT_DIR" != "$EXPECTED_DIR" ]]; then
-                        echo "    Renaming directory from $CURRENT_DIR to $EXPECTED_DIR to match debian/rules"
-                        cd "$(dirname "$SOURCE_DIR")"
-                        mv "$CURRENT_DIR" "$EXPECTED_DIR"
-                        SOURCE_DIR="$(pwd)/$EXPECTED_DIR"
-                        cd "$REPO_ROOT"
-                    fi
-                fi
-            fi
-            
-            rm -f "$WORK_DIR/$COMBINED_TARBALL"
-            
-            echo "    Creating combined tarball: $COMBINED_TARBALL"
-            cd "$(dirname "$SOURCE_DIR")"
-            TARBALL_BASE=$(basename "$SOURCE_DIR")
-            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$COMBINED_TARBALL" "$TARBALL_BASE"
-            cd "$REPO_ROOT"
-            
-            if [[ "$PACKAGE" == "dms" ]]; then
-                TARBALL_DIR=$(tar -tzf "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null | head -1 | cut -d'/' -f1)
-                EXPECTED_TARBALL_DIR="DankMaterialShell-${VERSION}"
-                if [[ "$TARBALL_DIR" != "$EXPECTED_TARBALL_DIR" ]]; then
-                    echo "    Warning: Tarball directory name mismatch: $TARBALL_DIR != $EXPECTED_TARBALL_DIR"
-                    echo "    This may cause build failures. Recreating tarball..."
-                    cd "$(dirname "$SOURCE_DIR")"
-                    rm -f "$WORK_DIR/$COMBINED_TARBALL"
-                    tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$COMBINED_TARBALL" "$TARBALL_BASE"
-                    cd "$REPO_ROOT"
-                fi
-            fi
-            
-            TARBALL_SIZE=$(stat -c%s "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null || stat -f%z "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null)
-            TARBALL_MD5=$(md5sum "$WORK_DIR/$COMBINED_TARBALL" | cut -d' ' -f1)
-            
-            BUILD_DEPS="debhelper-compat (= 13)"
-            if [[ -f "distro/debian/$PACKAGE/debian/control" ]]; then
-                CONTROL_DEPS=$(sed -n '/^Build-Depends:/,/^[A-Z]/p' "distro/debian/$PACKAGE/debian/control" | \
-                    sed '/^Build-Depends:/s/^Build-Depends: *//' | \
-                    sed '/^[A-Z]/d' | \
-                    tr '\n' ' ' | \
-                    sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/[[:space:]]\+/ /g')
-                if [[ -n "$CONTROL_DEPS" && "$CONTROL_DEPS" != "" ]]; then
-                    BUILD_DEPS="$CONTROL_DEPS"
-                fi
-            fi
-            
-            cat > "$WORK_DIR/$PACKAGE.dsc" << EOF
-Format: 3.0 (native)
-Source: $PACKAGE
-Binary: $PACKAGE
-Architecture: any
-Version: $VERSION
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: $BUILD_DEPS
-Files:
- $TARBALL_MD5 $TARBALL_SIZE $COMBINED_TARBALL
-EOF
-            
-            echo "  - Generated $PACKAGE.dsc for native format"
-        fi
-    else
-        if [[ "$UPLOAD_DEBIAN" == true ]]; then
-            if [[ "$CHANGELOG_VERSION" == *"-"* ]]; then
-                VERSION="$CHANGELOG_VERSION"
-            else
-                VERSION="${CHANGELOG_VERSION}-1"
-            fi
-            
-            echo "  - Quilt format detected: creating debian.tar.gz"
-            tar -czf "$WORK_DIR/debian.tar.gz" -C "distro/debian/$PACKAGE" debian/
-            
-            echo "  - Generating $PACKAGE.dsc for quilt format"
-            cat > "$WORK_DIR/$PACKAGE.dsc" << EOF
-Format: 3.0 (quilt)
-Source: $PACKAGE
-Binary: $PACKAGE
-Architecture: any
-Version: $VERSION
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13), wget, gzip
-DEBTRANSFORM-TAR: debian.tar.gz
-Files:
- 00000000000000000000000000000000 1 debian.tar.gz
-EOF
-        fi
-    fi
-fi
-
-cd "$WORK_DIR"
-
-echo "==> Updating working copy"
-if ! osc up; then
-    echo "Error: Failed to update working copy"
-    exit 1
-fi
-
-# Only auto-increment on manual runs (REBUILD_RELEASE set or not in CI), not automated workflows
-OLD_DSC_FILE=""
-if [[ -f "$WORK_DIR/$PACKAGE.dsc" ]]; then
-    OLD_DSC_FILE="$WORK_DIR/$PACKAGE.dsc"
-elif [[ -f "$WORK_DIR/.osc/sources/$PACKAGE.dsc" ]]; then
-    OLD_DSC_FILE="$WORK_DIR/.osc/sources/$PACKAGE.dsc"
-fi
-
-if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[ -n "$OLD_DSC_FILE" ]]; then
-    OLD_DSC_VERSION=$(grep "^Version:" "$OLD_DSC_FILE" 2>/dev/null | awk '{print $2}' | head -1)
-    
-    IS_MANUAL=false
-    if [[ -n "${REBUILD_RELEASE:-}" ]]; then
-        IS_MANUAL=true
-        echo "==> Manual rebuild detected (REBUILD_RELEASE=$REBUILD_RELEASE)"
-    elif [[ -n "${FORCE_REBUILD:-}" ]] && [[ "${FORCE_REBUILD}" == "true" ]]; then
-        IS_MANUAL=true
-        echo "==> Manual workflow trigger detected (FORCE_REBUILD=true)"
-    elif [[ -z "${GITHUB_ACTIONS:-}" ]] && [[ -z "${CI:-}" ]]; then
-        IS_MANUAL=true
-        echo "==> Local/manual run detected (not in CI)"
-    fi
-    
-    if [[ -n "$OLD_DSC_VERSION" ]] && [[ "$OLD_DSC_VERSION" == "$CHANGELOG_VERSION" ]] && [[ "$IS_MANUAL" == true ]]; then
-        echo "==> Detected rebuild of same version $CHANGELOG_VERSION, incrementing version"
-        
-        if [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git$ ]]; then
-            BASE_VERSION="${BASH_REMATCH[1]}"
-            NEW_VERSION="${BASE_VERSION}+git1"
-            echo "  Incrementing git number: $CHANGELOG_VERSION -> $NEW_VERSION"
-        elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git([0-9]+)$ ]]; then
-            BASE_VERSION="${BASH_REMATCH[1]}"
-            GIT_NUM="${BASH_REMATCH[2]}"
-            NEW_GIT_NUM=$((GIT_NUM + 1))
-            NEW_VERSION="${BASE_VERSION}+git${NEW_GIT_NUM}"
-            echo "  Incrementing git number: $CHANGELOG_VERSION -> $NEW_VERSION"
-        elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)ppa([0-9]+)$ ]]; then
-            BASE_VERSION="${BASH_REMATCH[1]}"
-            PPA_NUM="${BASH_REMATCH[2]}"
-            NEW_PPA_NUM=$((PPA_NUM + 1))
-            NEW_VERSION="${BASE_VERSION}ppa${NEW_PPA_NUM}"
-            echo "  Incrementing PPA number: $CHANGELOG_VERSION -> $NEW_VERSION"
-        elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)\+git([0-9]+)(\.[a-f0-9]+)?(ppa([0-9]+))?$ ]]; then
-            BASE_VERSION="${BASH_REMATCH[1]}"
-            GIT_NUM="${BASH_REMATCH[2]}"
-            GIT_HASH="${BASH_REMATCH[3]}"
-            PPA_NUM="${BASH_REMATCH[5]}"
-            if [[ -n "$PPA_NUM" ]]; then
-                NEW_PPA_NUM=$((PPA_NUM + 1))
-                NEW_VERSION="${BASE_VERSION}+git${GIT_NUM}${GIT_HASH}ppa${NEW_PPA_NUM}"
-                echo "  Incrementing PPA number: $CHANGELOG_VERSION -> $NEW_VERSION"
-            else
-                NEW_VERSION="${BASE_VERSION}+git${GIT_NUM}${GIT_HASH}ppa1"
-                echo "  Adding PPA number: $CHANGELOG_VERSION -> $NEW_VERSION"
-            fi
-        elif [[ "$CHANGELOG_VERSION" =~ ^([0-9.]+)(-([0-9]+))?$ ]]; then
-            BASE_VERSION="${BASH_REMATCH[1]}"
-            NEW_VERSION="${BASE_VERSION}ppa1"
-            echo "  Warning: Native format cannot have Debian revision, converting to PPA format: $CHANGELOG_VERSION -> $NEW_VERSION"
-        else
-            NEW_VERSION="${CHANGELOG_VERSION}ppa1"
-            echo "  Warning: Could not parse version format, appending ppa1: $CHANGELOG_VERSION -> $NEW_VERSION"
-        fi
-        
-        if [[ -z "$SOURCE_DIR" ]] || [[ ! -d "$SOURCE_DIR" ]] || [[ ! -d "$SOURCE_DIR/debian" ]]; then
-            echo "  Error: Source directory with debian/ not found for version increment"
-            exit 1
-        fi
-        
-        SOURCE_CHANGELOG="$SOURCE_DIR/debian/changelog"
-        if [[ ! -f "$SOURCE_CHANGELOG" ]]; then
-            echo "  Error: Changelog not found in source directory: $SOURCE_CHANGELOG"
-            exit 1
-        fi
-        
-        REPO_CHANGELOG="$REPO_ROOT/distro/debian/$PACKAGE/debian/changelog"
-        TEMP_CHANGELOG=$(mktemp)
-        {
-            echo "$PACKAGE ($NEW_VERSION) unstable; urgency=medium"
-            echo ""
-            echo "  * Rebuild to fix repository metadata issues"
-            echo ""
-            echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $(date -R)"
-            echo ""
-            if [[ -f "$REPO_CHANGELOG" ]]; then
-                OLD_ENTRY_START=$(grep -n "^$PACKAGE (" "$REPO_CHANGELOG" | sed -n '2p' | cut -d: -f1)
-                if [[ -n "$OLD_ENTRY_START" ]]; then
-                    tail -n +$OLD_ENTRY_START "$REPO_CHANGELOG"
-                fi
-            fi
-        } > "$TEMP_CHANGELOG"
-        cp "$TEMP_CHANGELOG" "$SOURCE_CHANGELOG"
-        rm -f "$TEMP_CHANGELOG"
-        
-        CHANGELOG_VERSION="$NEW_VERSION"
-        VERSION="$NEW_VERSION"
-        COMBINED_TARBALL="${PACKAGE}_${VERSION}.tar.gz"
-        
-        for old_tarball in "${PACKAGE}"_*.tar.gz; do
-            if [[ -f "$old_tarball" ]] && [[ "$old_tarball" != "${PACKAGE}_${NEW_VERSION}.tar.gz" ]]; then
-                echo "  Removing old tarball from OBS: $old_tarball"
-                osc rm -f "$old_tarball" 2>/dev/null || rm -f "$old_tarball"
-            fi
-        done
-        
-        if [[ "$PACKAGE" == "dms" ]] && [[ -f "$WORK_DIR/dms-source.tar.gz" ]]; then
-            echo "  Recreating dms-source.tar.gz with new directory name for incremented version"
-            EXPECTED_SOURCE_DIR="DankMaterialShell-${NEW_VERSION}"
-            TEMP_SOURCE_DIR=$(mktemp -d)
-            cd "$TEMP_SOURCE_DIR"
-            tar -xzf "$WORK_DIR/dms-source.tar.gz" 2>/dev/null || tar -xJf "$WORK_DIR/dms-source.tar.gz" 2>/dev/null || tar -xjf "$WORK_DIR/dms-source.tar.gz" 2>/dev/null
-            EXTRACTED=$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" | head -1)
-            if [[ -n "$EXTRACTED" ]] && [[ "$EXTRACTED" != "./$EXPECTED_SOURCE_DIR" ]]; then
-                echo "    Renaming $EXTRACTED to $EXPECTED_SOURCE_DIR"
-                mv "$EXTRACTED" "$EXPECTED_SOURCE_DIR"
-                rm -f "$WORK_DIR/dms-source.tar.gz"
-                tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/dms-source.tar.gz" "$EXPECTED_SOURCE_DIR"
-                ROOT_DIR=$(tar -tf "$WORK_DIR/dms-source.tar.gz" | head -1 | cut -d/ -f1)
-                if [[ "$ROOT_DIR" != "$EXPECTED_SOURCE_DIR" ]]; then
-                    echo "    Error: Recreated tarball has wrong root directory: $ROOT_DIR (expected $EXPECTED_SOURCE_DIR)"
-                    exit 1
-                fi
-            fi
-            cd "$REPO_ROOT"
-            rm -rf "$TEMP_SOURCE_DIR"
-        fi
-        
-        echo "  Recreating tarball with new version: $COMBINED_TARBALL"
-        if [[ -n "$SOURCE_DIR" ]] && [[ -d "$SOURCE_DIR" ]] && [[ -d "$SOURCE_DIR/debian" ]]; then
-            if [[ "$PACKAGE" == "dms" ]]; then
-                cd "$(dirname "$SOURCE_DIR")"
-                CURRENT_DIR=$(basename "$SOURCE_DIR")
-                EXPECTED_DIR="DankMaterialShell-${NEW_VERSION}"
-                if [[ "$CURRENT_DIR" != "$EXPECTED_DIR" ]]; then
-                    echo "  Renaming directory from $CURRENT_DIR to $EXPECTED_DIR to match debian/rules"
-                    if [[ -d "$CURRENT_DIR" ]]; then
-                        mv "$CURRENT_DIR" "$EXPECTED_DIR"
-                        SOURCE_DIR="$(pwd)/$EXPECTED_DIR"
-                    else
-                        echo "  Warning: Source directory $CURRENT_DIR not found, extracting from existing tarball"
-                        OLD_TARBALL=$(ls "${PACKAGE}"_*.tar.gz 2>/dev/null | head -1)
-                        if [[ -f "$OLD_TARBALL" ]]; then
-                            EXTRACT_DIR=$(mktemp -d)
-                            cd "$EXTRACT_DIR"
-                            tar -xzf "$WORK_DIR/$OLD_TARBALL"
-                            EXTRACTED_DIR=$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" | head -1)
-                            if [[ -n "$EXTRACTED_DIR" ]] && [[ "$EXTRACTED_DIR" != "./$EXPECTED_DIR" ]]; then
-                                mv "$EXTRACTED_DIR" "$EXPECTED_DIR"
-                                if [[ -f "$EXPECTED_DIR/debian/changelog" ]]; then
-                                    ACTUAL_VER=$(grep -m1 "^$PACKAGE" "$EXPECTED_DIR/debian/changelog" 2>/dev/null | sed 's/.*(\([^)]*\)).*/\1/')
-                                    if [[ "$ACTUAL_VER" != "$NEW_VERSION" ]]; then
-                                        echo "  Updating changelog version in extracted directory"
-                                        REPO_CHANGELOG="$REPO_ROOT/distro/debian/$PACKAGE/debian/changelog"
-                                        TEMP_CHANGELOG=$(mktemp)
-                                        {
-                                            echo "$PACKAGE ($NEW_VERSION) unstable; urgency=medium"
-                                            echo ""
-                                            echo "  * Rebuild to fix repository metadata issues"
-                                            echo ""
-                                            echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $(date -R)"
-                                            echo ""
-                                            if [[ -f "$REPO_CHANGELOG" ]]; then
-                                                OLD_ENTRY_START=$(grep -n "^$PACKAGE (" "$REPO_CHANGELOG" | sed -n '2p' | cut -d: -f1)
-                                                if [[ -n "$OLD_ENTRY_START" ]]; then
-                                                    tail -n +$OLD_ENTRY_START "$REPO_CHANGELOG"
-                                                fi
-                                            fi
-                                        } > "$TEMP_CHANGELOG"
-                                        cp "$TEMP_CHANGELOG" "$EXPECTED_DIR/debian/changelog"
-                                        rm -f "$TEMP_CHANGELOG"
-                                    fi
-                                fi
-                                SOURCE_DIR="$(pwd)/$EXPECTED_DIR"
-                                cd "$REPO_ROOT"
-                            else
-                                echo "  Error: Could not extract or find source directory"
-                                rm -rf "$EXTRACT_DIR"
-                                exit 1
-                            fi
-                        else
-                            echo "  Error: No existing tarball found to extract"
-                            exit 1
-                        fi
-                    fi
-                fi
-            fi
-            cd "$(dirname "$SOURCE_DIR")"
-            TARBALL_BASE=$(basename "$SOURCE_DIR")
-            tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/$COMBINED_TARBALL" "$TARBALL_BASE"
-            cd "$WORK_DIR"
-            
-            TARBALL_SIZE=$(stat -c%s "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null || stat -f%z "$WORK_DIR/$COMBINED_TARBALL" 2>/dev/null)
-            TARBALL_MD5=$(md5sum "$WORK_DIR/$COMBINED_TARBALL" | cut -d' ' -f1)
-            
-            BUILD_DEPS="debhelper-compat (= 13)"
-            if [[ -f "distro/debian/$PACKAGE/debian/control" ]]; then
-                CONTROL_DEPS=$(sed -n '/^Build-Depends:/,/^[A-Z]/p' "distro/debian/$PACKAGE/debian/control" | \
-                    sed '/^Build-Depends:/s/^Build-Depends: *//' | \
-                    sed '/^[A-Z]/d' | \
-                    tr '\n' ' ' | \
-                    sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/[[:space:]]\+/ /g')
-                if [[ -n "$CONTROL_DEPS" && "$CONTROL_DEPS" != "" ]]; then
-                    BUILD_DEPS="$CONTROL_DEPS"
-                fi
-            fi
-            
-            cat > "$WORK_DIR/$PACKAGE.dsc" << EOF
-Format: 3.0 (native)
-Source: $PACKAGE
-Binary: $PACKAGE
-Architecture: any
-Version: $VERSION
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: $BUILD_DEPS
-Files:
- $TARBALL_MD5 $TARBALL_SIZE $COMBINED_TARBALL
-EOF
-            echo "  - Updated changelog and recreated tarball with version $NEW_VERSION"
-        else
-            echo "  Error: Source directory not found, cannot recreate tarball"
-            exit 1
-        fi
-    fi
-fi
-
-find . -maxdepth 1 -type f \( -name "*.dsc" -o -name "*.spec" \) -exec grep -l "^<<<<<<< " {} \; 2>/dev/null | while read -r conflicted_file; do
-    echo "  Removing conflicted text file: $conflicted_file"
-    rm -f "$conflicted_file"
-done
-
-echo "==> Staging changes"
-echo "Files to upload:"
-if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$UPLOAD_OPENSUSE" == true ]]; then
-    ls -lh *.tar.gz *.tar.xz *.tar *.spec *.dsc _service 2>/dev/null | awk '{print "  " $9 " (" $5 ")"}'
-elif [[ "$UPLOAD_DEBIAN" == true ]]; then
-    ls -lh *.tar.gz *.dsc _service 2>/dev/null | awk '{print "  " $9 " (" $5 ")"}'
-elif [[ "$UPLOAD_OPENSUSE" == true ]]; then
-    ls -lh *.tar.gz *.tar.xz *.tar *.spec _service 2>/dev/null | awk '{print "  " $9 " (" $5 ")"}'
-fi
-echo ""
-
-osc addremove 2>&1 | grep -v "Git SCM package" || true
-
-SOURCE_TARBALL="${PACKAGE}-source.tar.gz"
-if [[ -f "$SOURCE_TARBALL" ]]; then
-    echo "==> Ensuring $SOURCE_TARBALL is tracked by OBS"
-    osc add "$SOURCE_TARBALL" 2>&1 | grep -v "already added\|already tracked\|Git SCM package" || true
-elif [[ -f "$WORK_DIR/$SOURCE_TARBALL" ]]; then
-    echo "==> Copying $SOURCE_TARBALL from WORK_DIR and adding to OBS"
-    cp "$WORK_DIR/$SOURCE_TARBALL" "$SOURCE_TARBALL"
-    osc add "$SOURCE_TARBALL" 2>&1 | grep -v "already added\|already tracked\|Git SCM package" || true
-fi
-ADDREMOVE_EXIT=${PIPESTATUS[0]}
-if [[ $ADDREMOVE_EXIT -ne 0 ]] && [[ $ADDREMOVE_EXIT -ne 1 ]]; then
-    echo "Warning: osc addremove returned exit code $ADDREMOVE_EXIT"
-fi
-
-if osc status | grep -q '^C'; then
-    echo "==> Resolving conflicts"
-    osc status | grep '^C' | awk '{print $2}' | xargs -r osc resolved
-fi
-
-if ! osc status 2>/dev/null | grep -qE '^[MAD]|^[?]'; then
-    echo "==> No changes to commit (package already up to date)"
-else
-    echo "==> Committing to OBS"
-    set +e
-    osc commit -m "$MESSAGE" 2>&1 | grep -v "Git SCM package" | grep -v "apiurl\|project\|_ObsPrj\|_manifest\|git-obs"
-    COMMIT_EXIT=${PIPESTATUS[0]}
-    set -e
-    if [[ $COMMIT_EXIT -ne 0 ]]; then
-        echo "Error: Upload failed with exit code $COMMIT_EXIT"
-        exit 1
-    fi
-fi
-
-osc results
-
-echo ""
-echo "✅ Upload complete!"
-cd "$WORK_DIR"
-osc results 2>&1 | head -10
-cd "$REPO_ROOT"
-echo ""
-echo "Check build status with:"
-echo "  ./distro/scripts/obs-status.sh $PACKAGE"

distro/scripts/test-packaging.sh

@@ -1,169 +0,0 @@
-#!/bin/bash
-# Manual testing script for DMS packaging
-# Tests OBS (Debian/openSUSE) and PPA (Ubuntu) workflows
-# Usage: ./distro/test-packaging.sh [obs|ppa|all]
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-DISTRO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-REPO_ROOT="$(cd "$DISTRO_DIR/.." && pwd)"
-
-# Colors
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m'
-
-info() { echo -e "${BLUE}[INFO]${NC} $1"; }
-success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; }
-error() { echo -e "${RED}[ERROR]${NC} $1"; }
-warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
-
-TEST_MODE="${1:-all}"
-
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "DMS Packaging Test Suite"
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo ""
-
-# Test 1: OBS Upload (Debian + openSUSE)
-if [[ "$TEST_MODE" == "obs" ]] || [[ "$TEST_MODE" == "all" ]]; then
-    echo "═══════════════════════════════════════════════════════════════════"
-    echo "TEST 1: OBS Upload (Debian + openSUSE)"
-    echo "═══════════════════════════════════════════════════════════════════"
-    echo ""
-    
-    OBS_SCRIPT="$SCRIPT_DIR/obs-upload.sh"
-    
-    if [[ ! -f "$OBS_SCRIPT" ]]; then
-        error "OBS script not found: $OBS_SCRIPT"
-        exit 1
-    fi
-    
-    info "OBS script location: $OBS_SCRIPT"
-    info "Available packages: dms, dms-git"
-    echo ""
-    
-    warn "This will upload to OBS (home:AvengeMedia)"
-    read -p "Continue with OBS test? [y/N] " -n 1 -r
-    echo
-    
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        info "Select package to test:"
-        echo "  1. dms (stable)"
-        echo "  2. dms-git (nightly)"
-        echo "  3. all (both packages)"
-        read -p "Choice [1]: " -n 1 -r PKG_CHOICE
-        echo
-        echo ""
-        
-        PKG_CHOICE="${PKG_CHOICE:-1}"
-        
-        cd "$REPO_ROOT"
-        
-        case "$PKG_CHOICE" in
-            1)
-                info "Testing OBS upload for 'dms' package..."
-                bash "$OBS_SCRIPT" dms "Test packaging update"
-                ;;
-            2)
-                info "Testing OBS upload for 'dms-git' package..."
-                bash "$OBS_SCRIPT" dms-git "Test packaging update"
-                ;;
-            3)
-                info "Testing OBS upload for all packages..."
-                bash "$OBS_SCRIPT" all "Test packaging update"
-                ;;
-            *)
-                error "Invalid choice"
-                exit 1
-                ;;
-        esac
-        
-        echo ""
-        success "OBS test completed"
-        echo ""
-        info "Check build status: https://build.opensuse.org/project/monitor/home:AvengeMedia"
-    else
-        warn "OBS test skipped"
-    fi
-    
-    echo ""
-fi
-
-# Test 2: PPA Upload (Ubuntu)
-if [[ "$TEST_MODE" == "ppa" ]] || [[ "$TEST_MODE" == "all" ]]; then
-    echo "═══════════════════════════════════════════════════════════════════"
-    echo "TEST 2: PPA Upload (Ubuntu)"
-    echo "═══════════════════════════════════════════════════════════════════"
-    echo ""
-    
-    PPA_SCRIPT="$DISTRO_DIR/ubuntu/ppa/create-and-upload.sh"
-    
-    if [[ ! -f "$PPA_SCRIPT" ]]; then
-        error "PPA script not found: $PPA_SCRIPT"
-        exit 1
-    fi
-    
-    info "PPA script location: $PPA_SCRIPT"
-    info "Available PPAs: dms, dms-git"
-    info "Ubuntu series: questing (25.10)"
-    echo ""
-    
-    warn "This will upload to Launchpad PPA (ppa:avengemedia/dms)"
-    read -p "Continue with PPA test? [y/N] " -n 1 -r
-    echo
-    
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        info "Select package to test:"
-        echo "  1. dms (stable)"
-        echo "  2. dms-git (nightly)"
-        read -p "Choice [1]: " -n 1 -r PKG_CHOICE
-        echo
-        echo ""
-        
-        PKG_CHOICE="${PKG_CHOICE:-1}"
-        
-        case "$PKG_CHOICE" in
-            1)
-                info "Testing PPA upload for 'dms' package..."
-                DMS_PKG="$DISTRO_DIR/ubuntu/dms"
-                PPA_NAME="dms"
-                ;;
-            2)
-                info "Testing PPA upload for 'dms-git' package..."
-                DMS_PKG="$DISTRO_DIR/ubuntu/dms-git"
-                PPA_NAME="dms-git"
-                ;;
-            *)
-                error "Invalid choice"
-                exit 1
-                ;;
-        esac
-        
-        echo ""
-        
-        if [[ ! -d "$DMS_PKG" ]]; then
-            error "DMS package directory not found: $DMS_PKG"
-            exit 1
-        fi
-        
-        bash "$PPA_SCRIPT" "$DMS_PKG" "$PPA_NAME" questing
-        
-        echo ""
-        success "PPA test completed"
-        echo ""
-        info "Check build status: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages"
-    else
-        warn "PPA test skipped"
-    fi
-    
-    echo ""
-fi
-
-# Summary
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "Testing Summary"
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"

distro/ubuntu/danklinux/danksearch/debian/changelog

@@ -1,5 +0,0 @@
-danksearch (0.0.7ppa3) questing; urgency=medium
-
-  * Rebuild for packaging fixes (ppa3)
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Fri, 21 Nov 2025 14:19:58 -0500

distro/ubuntu/danklinux/danksearch/debian/control

@@ -1,24 +0,0 @@
-Source: danksearch
-Section: utils
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/danksearch
-Vcs-Browser: https://github.com/AvengeMedia/danksearch
-Vcs-Git: https://github.com/AvengeMedia/danksearch.git
-
-Package: danksearch
-Architecture: amd64 arm64
-Depends: ${misc:Depends}
-Description: Fast file search utility for DMS
- DankSearch is a fast file search utility designed for DankMaterialShell.
- It provides efficient file and content search capabilities with minimal
- dependencies. This package contains the pre-built binary from the official
- GitHub release.
- .
- Features include:
-  - Fast file searching
-  - Lightweight and efficient
-  - Designed for DMS integration
-  - Minimal resource usage

distro/ubuntu/danklinux/danksearch/debian/copyright

@@ -1,24 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: danksearch
-Upstream-Contact: Avenge Media LLC <AvengeMedia.US@gmail.com>
-Source: https://github.com/AvengeMedia/danksearch
-
-Files: *
-Copyright: 2025 Avenge Media LLC
-License: GPL-3.0-only
-
-License: GPL-3.0-only
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 3 as
- published by the Free Software Foundation.
- .
- This package 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/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

distro/ubuntu/danklinux/danksearch/debian/files

@@ -1 +0,0 @@
-danksearch_0.0.7ppa3_source.buildinfo utils optional

distro/ubuntu/danklinux/danksearch/debian/rules

@@ -1,33 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-# Detect architecture for selecting correct binary
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-# Map Debian arch to binary filename
-ifeq ($(DEB_HOST_ARCH),amd64)
-    BINARY_FILE := dsearch-amd64
-else ifeq ($(DEB_HOST_ARCH),arm64)
-    BINARY_FILE := dsearch-arm64
-else
-    $(error Unsupported architecture: $(DEB_HOST_ARCH))
-endif
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	# Binary is already included in source package (native format)
-	# Downloaded by build-source.sh before upload
-	# Just verify it exists and is executable
-	test -f $(BINARY_FILE) || (echo "ERROR: $(BINARY_FILE) not found!" && exit 1)
-	chmod +x $(BINARY_FILE)
-
-override_dh_auto_install:
-	# Install binary as danksearch
-	install -Dm755 $(BINARY_FILE) debian/danksearch/usr/bin/danksearch
-
-override_dh_auto_clean:
-	# Don't delete binaries - they're part of the source package (native format)
-	dh_auto_clean

distro/ubuntu/danklinux/danksearch/debian/source/format

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

distro/ubuntu/danklinux/dgop/debian/changelog

@@ -1,9 +0,0 @@
-dgop (0.1.11ppa2) questing; urgency=medium
-
-  * Rebuild for Questing (25.10) - Ubuntu 25.10+ only
-  * Stateless CPU/GPU monitoring tool
-  * Support for NVIDIA and AMD GPUs
-  * JSON output for integration
-  * Pre-built binary package for amd64 and arm64
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Sun, 16 Nov 2025 22:50:00 -0500

distro/ubuntu/danklinux/dgop/debian/control

@@ -1,27 +0,0 @@
-Source: dgop
-Section: utils
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13),
-               wget,
-               gzip
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/dgop
-Vcs-Browser: https://github.com/AvengeMedia/dgop
-Vcs-Git: https://github.com/AvengeMedia/dgop.git
-
-Package: dgop
-Architecture: amd64 arm64
-Depends: ${misc:Depends}
-Description: Stateless CPU/GPU monitor for DankMaterialShell
- 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.
- .
- Features:
-  - CPU usage monitoring
-  - GPU usage and temperature (NVIDIA, AMD)
-  - Memory and swap statistics
-  - Network traffic monitoring
-  - Zero-state design (no background processes)
-  - JSON output for easy integration

distro/ubuntu/danklinux/dgop/debian/copyright

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

distro/ubuntu/danklinux/dgop/debian/files

@@ -1 +0,0 @@
-dgop_0.1.11ppa2_source.buildinfo utils optional

distro/ubuntu/danklinux/dgop/debian/rules

@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-# Extract version from debian/changelog
-DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
-# Get upstream version (strip -1ppa1 suffix)
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-
-# Detect architecture for downloading correct binary
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-# Map Debian arch to GitHub release arch names
-ifeq ($(DEB_HOST_ARCH),amd64)
-    GITHUB_ARCH := amd64
-else ifeq ($(DEB_HOST_ARCH),arm64)
-    GITHUB_ARCH := arm64
-else
-    $(error Unsupported architecture: $(DEB_HOST_ARCH))
-endif
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	# Binary is already included in source package (native format)
-	# Just verify it exists and is executable
-	test -f dgop || (echo "ERROR: dgop binary not found!" && exit 1)
-	chmod +x dgop
-
-override_dh_auto_install:
-	# Install binary
-	install -Dm755 dgop debian/dgop/usr/bin/dgop
-
-override_dh_auto_clean:
-	# Don't delete dgop binary - it's part of the source package (native format)
-	rm -f dgop.gz
-	dh_auto_clean

distro/ubuntu/danklinux/dgop/debian/source/format

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

distro/ubuntu/dms-git/debian/changelog

@@ -1,5 +0,0 @@
-dms-git (0.6.2+git2094.6cc6e7c8ppa1) questing; urgency=medium
-
-  * Git snapshot (commit 2094: 6cc6e7c8)
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Sun, 23 Nov 2025 00:43:28 -0500

distro/ubuntu/dms-git/debian/control

@@ -1,50 +0,0 @@
-Source: dms-git
-Section: x11
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git
-
-Package: dms-git
-Architecture: amd64
-Depends: ${misc:Depends},
-         quickshell-git | quickshell,
-         accountsservice,
-         cava,
-         cliphist,
-         danksearch,
-         dgop,
-         matugen,
-         qml6-module-qtcore,
-         qml6-module-qtmultimedia,
-         qml6-module-qtqml,
-         qml6-module-qtquick,
-         qml6-module-qtquick-controls,
-         qml6-module-qtquick-dialogs,
-         qml6-module-qtquick-effects,
-         qml6-module-qtquick-layouts,
-         qml6-module-qtquick-templates,
-         qml6-module-qtquick-window,
-         qt6ct,
-         wl-clipboard
-Provides: dms
-Conflicts: dms
-Replaces: dms
-Description: DankMaterialShell - Modern Wayland Desktop Shell (git nightly)
- DMS (DankMaterialShell) is a feature-rich desktop shell built on
- Quickshell, providing a modern and customizable user interface for
- Wayland compositors like niri, hyprland, and sway.
- .
- This is the nightly/git version built from the latest master branch.
- .
- Features include:
-  - Material Design inspired UI
-  - Customizable themes and appearance
-  - Built-in application launcher
-  - System tray and notifications
-  - Network and Bluetooth management
-  - Audio controls
-  - Systemd integration

distro/ubuntu/dms-git/debian/copyright

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

distro/ubuntu/dms-git/debian/files

@@ -1 +0,0 @@
-dms-git_0.6.2+git2094.6cc6e7c8ppa1_source.buildinfo x11 optional

distro/ubuntu/dms-git/debian/rules

@@ -1,45 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-# Get git commit date for version
-GIT_DATE := $(shell date +%Y%m%d)
-GIT_COMMIT := HEAD
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	# Git source is already included in source package (cloned by build-source.sh)
-	# Launchpad build environment has no internet access
-	test -d dms-git-repo || (echo "ERROR: dms-git-repo directory not found!" && exit 1)
-	test -f dms-distropkg-amd64.gz || (echo "ERROR: dms-distropkg-amd64.gz not found!" && exit 1)
-
-	# Extract pre-built binary from latest release
-	# Note: For git versions, we use the latest release binary
-	# The QML files come from git master
-	gunzip -c dms-distropkg-amd64.gz > dms
-	chmod +x dms
-
-override_dh_auto_install:
-	# Install binary
-	install -Dm755 dms debian/dms-git/usr/bin/dms
-
-	# Install QML files from git clone
-	mkdir -p debian/dms-git/usr/share/quickshell/dms
-	cp -r dms-git-repo/* debian/dms-git/usr/share/quickshell/dms/
-
-	# Remove unnecessary directories
-	rm -rf debian/dms-git/usr/share/quickshell/dms/core
-	rm -rf debian/dms-git/usr/share/quickshell/dms/distro
-
-	# Install systemd user service
-	install -Dm644 dms-git-repo/quickshell/assets/systemd/dms.service \
-		debian/dms-git/usr/lib/systemd/user/dms.service
-
-override_dh_auto_clean:
-	# Don't delete dms-git-repo directory - it's part of the source package (native format)
-	# Clean up build artifacts (but keep dms-distropkg-amd64.gz for Launchpad)
-	rm -f dms
-	# Don't remove dms-distropkg-amd64.gz - it needs to be included in the source package for Launchpad builds
-	dh_auto_clean

distro/ubuntu/dms-git/debian/source/format

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

distro/ubuntu/dms-git/debian/source/include-binaries

@@ -1 +0,0 @@
-dms-distropkg-amd64.gz

distro/ubuntu/dms-git/debian/source/options

@@ -1,4 +0,0 @@
-# Include files that are normally excluded by .gitignore
-# These are needed for the build process on Launchpad (which has no internet access)
-tar-ignore = !dms-distropkg-amd64.gz
-tar-ignore = !dms-git-repo

distro/ubuntu/dms/debian/changelog

@@ -1,5 +0,0 @@
-dms (0.6.2ppa3) questing; urgency=medium
-
-  * Rebuild for packaging fixes (ppa3)
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Sun, 23 Nov 2025 00:40:41 -0500

distro/ubuntu/dms/debian/control

@@ -1,47 +0,0 @@
-Source: dms
-Section: x11
-Priority: optional
-Maintainer: Avenge Media <AvengeMedia.US@gmail.com>
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2
-Homepage: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell
-Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git
-
-Package: dms
-Architecture: amd64
-Depends: ${misc:Depends},
-         quickshell-git | quickshell,
-         accountsservice,
-         cava,
-         cliphist,
-         danksearch,
-         dgop,
-         matugen,
-         qml6-module-qtcore,
-         qml6-module-qtmultimedia,
-         qml6-module-qtqml,
-         qml6-module-qtquick,
-         qml6-module-qtquick-controls,
-         qml6-module-qtquick-dialogs,
-         qml6-module-qtquick-effects,
-         qml6-module-qtquick-layouts,
-         qml6-module-qtquick-templates,
-         qml6-module-qtquick-window,
-         qt6ct,
-         wl-clipboard
-Conflicts: dms-git
-Replaces: dms-git
-Description: DankMaterialShell - Modern Wayland Desktop Shell
- DMS (DankMaterialShell) is a feature-rich desktop shell built on
- Quickshell, providing a modern and customizable user interface for
- Wayland compositors like niri, hyprland, and sway.
- .
- Features include:
-  - Material Design inspired UI
-  - Customizable themes and appearance
-  - Built-in application launcher
-  - System tray and notifications
-  - Network and Bluetooth management
-  - Audio controls
-  - Systemd integration

distro/ubuntu/dms/debian/copyright

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

distro/ubuntu/dms/debian/files

@@ -1 +0,0 @@
-dms_0.6.2ppa3_source.buildinfo x11 optional

distro/ubuntu/dms/debian/rules

@@ -1,63 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE = 1
-
-# Extract version from debian/changelog
-DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
-# Get upstream version (strip -1ppa1 suffix)
-UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-# Strip ppa suffix and handle git versions
-# Examples: 0.5.2ppa9 -> 0.5.2, 0.5.2+git20251116 -> 0.5.2
-BASE_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed 's/ppa[0-9]*$$//' | sed 's/+git.*//')
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	# All files are included in source package (downloaded by build-source.sh)
-	# Launchpad build environment has no internet access
-	test -f dms-distropkg-amd64.gz || (echo "ERROR: dms-distropkg-amd64.gz not found!" && exit 1)
-	test -f dms-source.tar.gz || (echo "ERROR: dms-source.tar.gz not found!" && exit 1)
-
-	# Extract pre-built binary
-	gunzip -c dms-distropkg-amd64.gz > dms
-	chmod +x dms
-
-	# Extract source tarball for QML files
-	tar -xzf dms-source.tar.gz
-	# Find the extracted directory (it might have various names)
-	# and create a symlink to expected name for consistent install
-	SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell*" | head -n1); \
-	if [ -n "$$SOURCE_DIR" ]; then \
-		ln -sf $$SOURCE_DIR DankMaterialShell-$(BASE_VERSION); \
-	fi
-
-override_dh_auto_install:
-	# Install binary
-	install -Dm755 dms debian/dms/usr/bin/dms
-
-	# Install QML files from source tarball
-	mkdir -p debian/dms/usr/share/quickshell/dms
-	cp -r DankMaterialShell-$(BASE_VERSION)/* debian/dms/usr/share/quickshell/dms/
-
-	# Remove unnecessary directories
-	rm -rf debian/dms/usr/share/quickshell/dms/core
-	rm -rf debian/dms/usr/share/quickshell/dms/distro
-
-	# Install systemd user service
-	install -Dm644 DankMaterialShell-$(BASE_VERSION)/quickshell/assets/systemd/dms.service \
-		debian/dms/usr/lib/systemd/user/dms.service
-
-	# Generate and install shell completions (if applicable)
-	# Uncomment if dms supports completion generation
-	# ./dms completion bash > dms.bash
-	# ./dms completion zsh > dms.zsh
-	# install -Dm644 dms.bash debian/dms/usr/share/bash-completion/completions/dms
-	# install -Dm644 dms.zsh debian/dms/usr/share/zsh/vendor-completions/_dms
-
-override_dh_auto_clean:
-	rm -f dms
-	rm -rf DankMaterialShell-*
-	# Don't remove dms-distropkg-amd64.gz and dms-source.tar.gz
-	# They need to be included in the source package for Launchpad builds
-	dh_auto_clean

distro/ubuntu/dms/debian/source/format

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

distro/ubuntu/dms/debian/source/include-binaries

@@ -1,2 +0,0 @@
-dms-distropkg-amd64.gz
-dms-source.tar.gz