Merge branch 'master' of github.com:bbedward/DankMaterialShell

* Reapply "Add default configuration option to home-manager (#356)"

This reverts commit bc23109f99.

* fix multiple xdg.configFile definitions error

* update dms-cli flake to fix build

.github/workflows/release.yml

@@ -57,7 +57,28 @@ jobs:
             CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" "${PREVIOUS_TAG}..${TAG}")
           fi
 
-          cat > CHANGELOG.md << EOF
+          cat > RELEASE_BODY.md << 'EOF'
+          ## Assets
+
+          ### Complete Packages
+          - **`dms-full-amd64.tar.gz`** - Complete package for x86_64 systems (CLI binary + QML source + installation guide)
+          - **`dms-full-arm64.tar.gz`** - Complete package for ARM64 systems (CLI binary + QML source + installation guide)
+
+          ### Individual Components
+          - **`dms-cli-amd64.gz`** - DMS CLI binary for x86_64 systems
+          - **`dms-cli-arm64.gz`** - DMS CLI binary for ARM64 systems
+          - **`dms-qml.tar.gz`** - QML source code only
+
+          ### Checksums
+          - **`*.sha256`** - SHA256 checksums for verifying download integrity
+
+          **Installation:** Extract the `dms-full-*.tar.gz` package for your architecture and follow the `INSTALL.md` instructions inside.
+
+          ---
+
+          EOF
+
+          cat >> RELEASE_BODY.md << EOF
           ## What's Changed
 
           $CHANGELOG
@@ -66,7 +87,7 @@ jobs:
           EOF
 
           echo "changelog<<EOF" >> $GITHUB_OUTPUT
-          cat CHANGELOG.md >> $GITHUB_OUTPUT
+          cat RELEASE_BODY.md >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Create/Update DankMaterialShell Release
@@ -80,18 +101,113 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download DMS release assets
+      - name: Download and prepare release assets
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -euxo pipefail
-          # gh is preinstalled on ubuntu-24.04; auth via GH_TOKEN env
+
+          mkdir -p _release_assets
+
+          # Download DMS CLI binaries from the danklinux repo
           gh release download "${TAG}" -R "${DMS_REPO}" --dir ./_dms_assets
 
-      - name: Attach DMS assets to DankMaterialShell release
+          # Rename CLI binaries to dms-cli-* format
+          for file in _dms_assets/dms-*.gz*; do
+            if [ -f "$file" ]; then
+              basename=$(basename "$file")
+              # dms-amd64.gz -> dms-cli-amd64.gz
+              # dms-amd64.gz.sha256 -> dms-cli-amd64.gz.sha256
+              newname=$(echo "$basename" | sed 's/^dms-/dms-cli-/')
+              cp "$file" "_release_assets/$newname"
+            fi
+          done
+
+          # Create QML source package (exclude .git, .github, build artifacts)
+          tar --exclude='.git' \
+              --exclude='.github' \
+              --exclude='_dms_assets' \
+              --exclude='_release_assets' \
+              --exclude='*.tar.gz' \
+              -czf _release_assets/dms-qml.tar.gz .
+
+          # Generate checksum for QML package
+          (cd _release_assets && sha256sum dms-qml.tar.gz > dms-qml.tar.gz.sha256)
+
+          # Create full packages for each architecture
+          for arch in amd64 arm64; do
+            mkdir -p _temp_full/dms
+            mkdir -p _temp_full/bin
+
+            # Extract QML source to temp directory
+            tar -xzf _release_assets/dms-qml.tar.gz -C _temp_full/dms
+
+            # Copy CLI binary if it exists
+            if [ -f "_dms_assets/dms-${arch}.gz" ]; then
+              gunzip -c "_dms_assets/dms-${arch}.gz" > _temp_full/bin/dms
+              chmod +x _temp_full/bin/dms
+            fi
+
+            # Create INSTALL.md
+            cat > _temp_full/INSTALL.md << 'EOF'
+          # DankMaterialShell Installation
+
+          ## Requirements
+
+          - Wayland compositor (niri or Hyprland recommended)
+          - Quickshell framework
+          - Qt6
+
+          ## Installation Steps
+
+          1. **Install quickshell assets:**
+             ```bash
+             mkdir -p ~/.config/quickshell
+             cp -r dms ~/.config/quickshell/
+             ```
+
+          2. **Install the DMS CLI binary:**
+             ```bash
+             sudo install -m 755 bin/dms /usr/local/bin/dms
+             # or install to a local directory:
+             mkdir -p ~/.local/bin
+             install -m 755 bin/dms ~/.local/bin/dms
+             ```
+
+          3. **Start the shell:**
+             ```bash
+             dms run
+             # or directly with quickshell (will lack some dbus integrations & plugin management):
+             quickshell -p ~/.config/quickshell/dms
+             ```
+
+          ## Configuration
+
+          - Settings are stored in `~/.config/DankMaterialShell/settings.json`
+          - Plugins go in `~/.config/DankMaterialShell/plugins/`
+          - See the documentation in the `dms/` directory for more details
+
+          ## Troubleshooting
+
+          - Run with verbose output: `quickshell -v -p ~/.config/quickshell/dms`
+          - Check logs in `~/.local/state/DankMaterialShell/`
+          - Ensure all dependencies are installed
+          EOF
+
+            # Create the full package
+            (cd _temp_full && tar -czf "../_release_assets/dms-full-${arch}.tar.gz" .)
+
+            # Generate checksum
+            (cd _release_assets && sha256sum "dms-full-${arch}.tar.gz" > "dms-full-${arch}.tar.gz.sha256")
+
+            # Cleanup
+            rm -rf _temp_full
+          done
+
+      - name: Attach all assets to release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.TAG }}
-          files: _dms_assets/**
+          files: _release_assets/**
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Common/I18n.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import Qt.labs.folderlistmodel
 import Quickshell
 import Quickshell.Io
 pragma Singleton
@@ -7,60 +8,106 @@ pragma ComponentBehavior: Bound
 Singleton {
     id: root
 
-    property string currentLocale: Qt.locale().name.substring(0, 2)
-    property var translations: ({})
-    property bool translationsLoaded: false
+    readonly property string _rawLocale: Qt.locale().name
+    readonly property string _lang: _rawLocale.split(/[_-]/)[0]
+    readonly property var    _candidates: {
+        const fullUnderscore = _rawLocale;
+        const fullHyphen     = _rawLocale.replace("_", "-");
+        return [fullUnderscore, fullHyphen, _lang].filter(c => c && c !== "en");
+    }
+
+  
+    readonly property url translationsFolder: Qt.resolvedUrl("../translations/poexports")
+
+    property string currentLocale: "en"
+    property var    translations: ({})
+    property bool   translationsLoaded: false
+
+    property url _selectedPath: ""
+
+    FolderListModel {
+        id: dir
+        folder: root.translationsFolder
+        nameFilters: ["*.json"]
+        showDirs: false
+        showDotAndDotDot: false
+
+        onStatusChanged: if (status === FolderListModel.Ready) root._pickTranslation()
+    }
 
     FileView {
         id: translationLoader
-        path: root.currentLocale === "en" ? "" : Qt.resolvedUrl(`../translations/${root.currentLocale}.json`)
+        path: root._selectedPath
 
         onLoaded: {
             try {
                 root.translations = JSON.parse(text())
                 root.translationsLoaded = true
-                console.log(`I18n: Loaded translations for locale '${root.currentLocale}' (${Object.keys(root.translations).length} contexts)`)
+                console.log(`I18n: Loaded translations for '${root.currentLocale}' ` +
+                            `(${Object.keys(root.translations).length} contexts)`)
             } catch (e) {
-                console.warn(`I18n: Error parsing translations for locale '${root.currentLocale}':`, e, "- falling back to English")
-                root.translationsLoaded = false
+                console.warn(`I18n: Error parsing '${root.currentLocale}':`, e,
+                             "- falling back to English")
+                root._fallbackToEnglish()
             }
         }
 
         onLoadFailed: (error) => {
-            console.warn(`I18n: Failed to load translations for locale '${root.currentLocale}' (${error}), falling back to English`)
-            root.translationsLoaded = false
+            console.warn(`I18n: Failed to load '${root.currentLocale}' (${error}), ` +
+                         "falling back to English")
+            root._fallbackToEnglish()
         }
     }
 
-    function tr(term, context) {
-        if (!translationsLoaded || !translations) {
-            return term
-        }
-
-        const actualContext = context || term
-
-        if (translations[actualContext] && translations[actualContext][term]) {
-            return translations[actualContext][term]
-        }
-
-        for (const ctx in translations) {
-            if (translations[ctx][term]) {
-                return translations[ctx][term]
+    function _pickTranslation() {
+        const present = new Set()
+        for (let i = 0; i < dir.count; i++) {
+            const name = dir.get(i, "fileName") // e.g. "zh_CN.json"
+            if (name && name.endsWith(".json")) {
+                present.add(name.slice(0, -5))
             }
         }
 
+        for (let i = 0; i < _candidates.length; i++) {
+            const cand = _candidates[i]
+            if (present.has(cand)) {
+                _useLocale(cand, dir.folder + "/" + cand + ".json")
+                return
+            }
+        }
+
+        _fallbackToEnglish()
+    }
+
+    function _useLocale(localeTag, fileUrl) {
+        currentLocale = localeTag
+        _selectedPath = fileUrl
+        translationsLoaded = false
+        translations = ({})
+        console.log(`I18n: Using locale '${localeTag}' from ${fileUrl}`)
+    }
+
+    function _fallbackToEnglish() {
+        currentLocale = "en"
+        _selectedPath = ""
+        translationsLoaded = false
+        translations = ({})
+        console.warn("I18n: Falling back to built-in English strings")
+    }
+
+    function tr(term, context) {
+        if (!translationsLoaded || !translations) return term
+        const ctx = context || term
+        if (translations[ctx] && translations[ctx][term]) return translations[ctx][term]
+        for (const c in translations) {
+            if (translations[c] && translations[c][term]) return translations[c][term]
+        }
         return term
     }
 
     function trContext(context, term) {
-        if (!translationsLoaded || !translations) {
-            return term
-        }
-
-        if (translations[context] && translations[context][term]) {
-            return translations[context][term]
-        }
-
+        if (!translationsLoaded || !translations) return term
+        if (translations[context] && translations[context][term]) return translations[context][term]
         return term
     }
 }

Common/Paths.qml

@@ -38,6 +38,10 @@ Singleton {
         return stringify(path).replace("file://", "")
     }
 
+    function toFileUrl(path: string): string {
+        return path.startsWith("file://") ? path : "file://" + path
+    }
+
     function mkdir(path: url): void {
         Quickshell.execDetached(["mkdir", "-p", strip(path)])
     }

Common/SessionData.qml

@@ -70,6 +70,7 @@ Singleton {
     property int batteryHibernateTimeout: 0 // Never
 
     property bool lockBeforeSuspend: false
+    property bool loginctlLockIntegration: true
     property var recentColors: []
     property bool showThirdPartyPlugins: false
 
@@ -152,6 +153,7 @@ Singleton {
                 batterySuspendTimeout = settings.batterySuspendTimeout !== undefined ? settings.batterySuspendTimeout : 0
                 batteryHibernateTimeout = settings.batteryHibernateTimeout !== undefined ? settings.batteryHibernateTimeout : 0
                 lockBeforeSuspend = settings.lockBeforeSuspend !== undefined ? settings.lockBeforeSuspend : false
+                loginctlLockIntegration = settings.loginctlLockIntegration !== undefined ? settings.loginctlLockIntegration : true
                 recentColors = settings.recentColors !== undefined ? settings.recentColors : []
                 showThirdPartyPlugins = settings.showThirdPartyPlugins !== undefined ? settings.showThirdPartyPlugins : false
 
@@ -215,6 +217,7 @@ Singleton {
                                                 "batterySuspendTimeout": batterySuspendTimeout,
                                                 "batteryHibernateTimeout": batteryHibernateTimeout,
                                                 "lockBeforeSuspend": lockBeforeSuspend,
+                                                "loginctlLockIntegration": loginctlLockIntegration,
                                                 "recentColors": recentColors,
                                                 "showThirdPartyPlugins": showThirdPartyPlugins
                                             }, null, 2))
@@ -643,6 +646,11 @@ Singleton {
         saveSettings()
     }
 
+    function setLoginctlLockIntegration(enabled) {
+        loginctlLockIntegration = enabled
+        saveSettings()
+    }
+
     function setShowThirdPartyPlugins(enabled) {
         showThirdPartyPlugins = enabled
         saveSettings()

Common/SettingsData.qml

@@ -155,6 +155,14 @@ Singleton {
     property bool dankBarNoBackground: false
     property bool dankBarGothCornersEnabled: false
     property bool dankBarBorderEnabled: false
+    property string dankBarBorderColor: "surfaceText"
+    property real dankBarBorderOpacity: 1.0
+    property real dankBarBorderThickness: 1
+
+    onDankBarBorderColorChanged: saveSettings()
+    onDankBarBorderOpacityChanged: saveSettings()
+    onDankBarBorderThicknessChanged: saveSettings()
+
     property int dankBarPosition: SettingsData.Position.Top
     property bool dankBarIsVertical: dankBarPosition === SettingsData.Position.Left || dankBarPosition === SettingsData.Position.Right
     property bool lockScreenShowPowerActions: true
@@ -407,6 +415,9 @@ Singleton {
                 dankBarNoBackground = settings.dankBarNoBackground !== undefined ? settings.dankBarNoBackground : (settings.topBarNoBackground !== undefined ? settings.topBarNoBackground : false)
                 dankBarGothCornersEnabled = settings.dankBarGothCornersEnabled !== undefined ? settings.dankBarGothCornersEnabled : (settings.topBarGothCornersEnabled !== undefined ? settings.topBarGothCornersEnabled : false)
                 dankBarBorderEnabled = settings.dankBarBorderEnabled !== undefined ? settings.dankBarBorderEnabled : false
+                dankBarBorderColor = settings.dankBarBorderColor !== undefined ? settings.dankBarBorderColor : "surfaceText"
+                dankBarBorderOpacity = settings.dankBarBorderOpacity !== undefined ? settings.dankBarBorderOpacity : 1.0
+                dankBarBorderThickness = settings.dankBarBorderThickness !== undefined ? settings.dankBarBorderThickness : 1
                 dankBarPosition = settings.dankBarPosition !== undefined ? settings.dankBarPosition : (settings.dankBarAtBottom !== undefined ? (settings.dankBarAtBottom ? SettingsData.Position.Bottom : SettingsData.Position.Top) : (settings.topBarAtBottom !== undefined ? (settings.topBarAtBottom ? SettingsData.Position.Bottom : SettingsData.Position.Top) : SettingsData.Position.Top))
                 lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true
                 hideBrightnessSlider = settings.hideBrightnessSlider !== undefined ? settings.hideBrightnessSlider : false
@@ -533,6 +544,9 @@ Singleton {
                                                 "dankBarNoBackground": dankBarNoBackground,
                                                 "dankBarGothCornersEnabled": dankBarGothCornersEnabled,
                                                 "dankBarBorderEnabled": dankBarBorderEnabled,
+                                                "dankBarBorderColor": dankBarBorderColor,
+                                                "dankBarBorderOpacity": dankBarBorderOpacity,
+                                                "dankBarBorderThickness": dankBarBorderThickness,
                                                 "dankBarPosition": dankBarPosition,
                                                 "lockScreenShowPowerActions": lockScreenShowPowerActions,
                                                 "hideBrightnessSlider": hideBrightnessSlider,
@@ -969,7 +983,7 @@ Singleton {
         updateQtIconTheme(themeName)
         saveSettings()
         if (typeof Theme !== "undefined" && Theme.currentTheme === Theme.dynamic)
-            Theme.generateSystemThemes()
+            Theme.generateSystemThemesFromCurrentTheme()
     }
 
     function updateGtkIconTheme(themeName) {

Common/Theme.qml

@@ -74,7 +74,6 @@ Singleton {
     property bool qtThemingEnabled: typeof SettingsData !== "undefined" ? (SettingsData.qt5ctAvailable || SettingsData.qt6ctAvailable) : false
     property var workerRunning: false
     property var matugenColors: ({})
-    property int colorUpdateTrigger: 0
     property var customThemeData: null
 
     readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.CacheLocation).toString()) + "/dankshell"
@@ -84,7 +83,6 @@ Singleton {
         matugenCheck.running = true
         if (typeof SessionData !== "undefined") {
             SessionData.isLightModeChanged.connect(root.onLightModeChanged)
-            isLightMode = SessionData.isLightMode
         }
 
         if (typeof SettingsData !== "undefined" && SettingsData.currentThemeName) {
@@ -100,7 +98,6 @@ Singleton {
     }
 
     function getMatugenColor(path, fallback) {
-        colorUpdateTrigger
         const colorMode = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "light" : "dark"
         let cur = matugenColors && matugenColors.colors && matugenColors.colors[colorMode]
         for (const part of path.split(".")) {
@@ -578,10 +575,6 @@ Singleton {
 
 
     function onLightModeChanged() {
-        if (matugenColors && Object.keys(matugenColors).length > 0) {
-            colorUpdateTrigger++
-        }
-
         if (currentTheme === "custom" && customThemeFileView.path) {
             customThemeFileView.reload()
         }
@@ -692,7 +685,17 @@ Singleton {
     function withAlpha(c, a) { return Qt.rgba(c.r, c.g, c.b, a); }
 
     function snap(value, dpr) {
-        return Math.round(value * dpr) / dpr
+        const s = dpr || 1
+        return Math.round(value * s) / s
+    }
+
+    function px(value, dpr) {
+        const s = dpr || 1
+        return Math.round(value * s) / s
+    }
+
+    function hairline(dpr) {
+        return 1 / (dpr || 1)
     }
 
     function invertHex(hex) {
@@ -905,7 +908,6 @@ Singleton {
                 const colorsText = dynamicColorsFileView.text()
                 if (colorsText) {
                     root.matugenColors = JSON.parse(colorsText)
-                    root.colorUpdateTrigger++
                     if (typeof ToastService !== "undefined") {
                         ToastService.clearWallpaperError()
                     }

Modals/Clipboard/ClipboardContent.qml

@@ -46,6 +46,7 @@ Item {
             leftIconName: "search"
             showClearButton: true
             focus: true
+            ignoreTabKeys: true
             keyForwardTargets: [modal.modalFocusScope]
             onTextChanged: {
                 modal.searchText = text

Modals/Common/ConfirmModal.qml

@@ -68,9 +68,11 @@ DankModal {
         }
     }
     onOpened: {
-        modalFocusScope.forceActiveFocus()
-        modalFocusScope.focus = true
-        shouldHaveFocus = true
+        Qt.callLater(function () {
+            modalFocusScope.forceActiveFocus()
+            modalFocusScope.focus = true
+            shouldHaveFocus = true
+        })
     }
     modalFocusScope.Keys.onPressed: function (event) {
         switch (event.key) {

Modals/Common/DankModal.qml

@@ -1,7 +1,9 @@
 import QtQuick
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Wayland
 import qs.Common
+import qs.Services
 
 PanelWindow {
     id: root
@@ -14,14 +16,16 @@ PanelWindow {
     property real height: 300
     readonly property real screenWidth: screen ? screen.width : 1920
     readonly property real screenHeight: screen ? screen.height : 1080
-    readonly property real dpr: (screen && screen.devicePixelRatio) || 1
-
-    function snap(v) {
-        return Math.round(v * dpr) / dpr
-    }
-
-    function px(v) {
-        return Math.round(v)
+    readonly property real dpr: {
+        if (CompositorService.isNiri && screen) {
+            const niriScale = NiriService.displayScales[screen.name]
+            if (niriScale !== undefined) return niriScale
+        }
+        if (CompositorService.isHyprland && screen) {
+            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === screen.name)
+            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
+        }
+        return (screen?.devicePixelRatio) || 1
     }
     property bool showBackground: true
     property real backgroundOpacity: 0.5
@@ -142,26 +146,26 @@ PanelWindow {
     Rectangle {
         id: contentContainer
 
-        width: px(root.width)
-        height: px(root.height)
+        width: Theme.px(root.width, dpr)
+        height: Theme.px(root.height, dpr)
         anchors.centerIn: undefined
         x: {
             if (positioning === "center") {
-                return snap((root.screenWidth - width) / 2)
+                return Theme.snap((root.screenWidth - width) / 2, dpr)
             } else if (positioning === "top-right") {
-                return px(Math.max(Theme.spacingL, root.screenWidth - width - Theme.spacingL))
+                return Theme.px(Math.max(Theme.spacingL, root.screenWidth - width - Theme.spacingL), dpr)
             } else if (positioning === "custom") {
-                return snap(root.customPosition.x)
+                return Theme.snap(root.customPosition.x, dpr)
             }
             return 0
         }
         y: {
             if (positioning === "center") {
-                return snap((root.screenHeight - height) / 2)
+                return Theme.snap((root.screenHeight - height) / 2, dpr)
             } else if (positioning === "top-right") {
-                return px(Theme.barHeight + Theme.spacingXS)
+                return Theme.px(Theme.barHeight + Theme.spacingXS, dpr)
             } else if (positioning === "custom") {
-                return snap(root.customPosition.y)
+                return Theme.snap(root.customPosition.y, dpr)
             }
             return 0
         }
@@ -170,6 +174,7 @@ PanelWindow {
         border.color: root.borderColor
         border.width: root.borderWidth
         clip: false
+        layer.enabled: true
         opacity: root.shouldBeVisible ? 1 : 0
         transform: root.animationType === "slide" ? slideTransform : null
 
@@ -179,8 +184,8 @@ PanelWindow {
             readonly property real rawX: root.shouldBeVisible ? 0 : 15
             readonly property real rawY: root.shouldBeVisible ? 0 : -30
 
-            x: snap(rawX)
-            y: snap(rawY)
+            x: Theme.snap(rawX, root.dpr)
+            y: Theme.snap(rawY, root.dpr)
         }
 
         Behavior on opacity {

Modals/FileBrowser/FileBrowserModal.qml

@@ -621,7 +621,6 @@ DankModal {
                         required property bool fileIsDir
                         required property string filePath
                         required property string fileName
-                        required property url fileURL
                         required property int index
 
                         width: weMode ? 245 : 140

Modals/NotificationModal.qml

@@ -54,6 +54,9 @@ DankModal {
     height: 700
     visible: false
     onBackgroundClicked: hide()
+    onOpened: () => {
+        Qt.callLater(() => modalFocusScope.forceActiveFocus());
+    }
     onShouldBeVisibleChanged: (shouldBeVisible) => {
         if (!shouldBeVisible) {
             notificationModalOpen = false

Modals/PowerMenuModal.qml

@@ -78,7 +78,7 @@ DankModal {
     }
     onOpened: () => {
         selectedIndex = 0;
-        modalFocusScope.forceActiveFocus();
+        Qt.callLater(() => modalFocusScope.forceActiveFocus());
     }
     modalFocusScope.Keys.onPressed: (event) => {
         switch (event.key) {

Modals/Settings/PowerSettings.qml

@@ -219,11 +219,20 @@ Item {
                         }
                     }
 
+                    DankToggle {
+                        width: parent.width
+                        text: I18n.tr("Enable loginctl lock integration")
+                        description: "Bind lock screen to dbus signals from loginctl. Disable if using an external lock screen."
+                        checked: SessionData.loginctlLockIntegration
+                        onToggled: checked => SessionData.setLoginctlLockIntegration(checked)
+                    }
+
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Lock before suspend")
                         description: "Automatically lock the screen when the system prepares to suspend"
                         checked: SessionData.lockBeforeSuspend
+                        visible: SessionData.loginctlLockIntegration
                         onToggled: checked => SessionData.setLockBeforeSuspend(checked)
                     }
 

Modals/Spotlight/SpotlightContent.qml

@@ -128,6 +128,7 @@ Item {
                 enabled: parentModal ? parentModal.spotlightOpen : true
                 placeholderText: ""
                 ignoreLeftRightKeys: appLauncher.viewMode !== "list"
+                ignoreTabKeys: true
                 keyForwardTargets: [spotlightKeyHandler]
                 text: appLauncher.searchQuery
                 onTextEdited: () => {

Modals/Spotlight/SpotlightContextMenu.qml

@@ -77,12 +77,14 @@ Popup {
         spacing: 1
 
         Rectangle {
-            width: parent.width
+            implicitWidth: pinRow.implicitWidth + Theme.spacingS * 2
+            width: implicitWidth
             height: 32
             radius: Theme.cornerRadius
             color: pinMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
             Row {
+                id: pinRow
                 anchors.left: parent.left
                 anchors.leftMargin: Theme.spacingS
                 anchors.verticalCenter: parent.verticalCenter
@@ -155,16 +157,16 @@ Popup {
             model: contextMenu.currentApp && contextMenu.currentApp.desktopEntry && contextMenu.currentApp.desktopEntry.actions ? contextMenu.currentApp.desktopEntry.actions : []
 
             Rectangle {
-                width: parent.width
+                implicitWidth: actionRow.implicitWidth + Theme.spacingS * 2
+                width: implicitWidth
                 height: 32
                 radius: Theme.cornerRadius
                 color: actionMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
                 Row {
+                    id: actionRow
                     anchors.left: parent.left
                     anchors.leftMargin: Theme.spacingS
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.spacingS
                     anchors.verticalCenter: parent.verticalCenter
                     spacing: Theme.spacingS
 
@@ -189,8 +191,6 @@ Popup {
                         color: Theme.surfaceText
                         font.weight: Font.Normal
                         anchors.verticalCenter: parent.verticalCenter
-                        elide: Text.ElideRight
-                        width: parent.width - (modelData.icon && modelData.icon !== "" ? (Theme.iconSize - 2 + Theme.spacingS) : 0)
                     }
                 }
 
@@ -228,12 +228,14 @@ Popup {
         }
 
         Rectangle {
-            width: parent.width
+            implicitWidth: launchRow.implicitWidth + Theme.spacingS * 2
+            width: implicitWidth
             height: 32
             radius: Theme.cornerRadius
             color: launchMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
             Row {
+                id: launchRow
                 anchors.left: parent.left
                 anchors.leftMargin: Theme.spacingS
                 anchors.verticalCenter: parent.verticalCenter
@@ -288,12 +290,14 @@ Popup {
 
         Rectangle {
             visible: SessionService.hasPrimeRun
-            width: parent.width
+            implicitWidth: primeRunRow.implicitWidth + Theme.spacingS * 2
+            width: implicitWidth
             height: 32
             radius: Theme.cornerRadius
             color: primeRunMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
             Row {
+                id: primeRunRow
                 anchors.left: parent.left
                 anchors.leftMargin: Theme.spacingS
                 anchors.verticalCenter: parent.verticalCenter

Modules/AppDrawer/AppDrawerPopout.qml

@@ -112,6 +112,8 @@ DankPopout {
                     mappings[Qt.Key_Up] = () => appLauncher.selectPrevious()
                     mappings[Qt.Key_Return] = () => appLauncher.launchSelected()
                     mappings[Qt.Key_Enter] = () => appLauncher.launchSelected()
+                    mappings[Qt.Key_Tab] = () => appLauncher.viewMode === "grid" ? appLauncher.selectNextInRow() : appLauncher.selectNext()
+                    mappings[Qt.Key_Backtab] = () => appLauncher.viewMode === "grid" ? appLauncher.selectPreviousInRow() : appLauncher.selectPrevious()
 
                     if (appLauncher.viewMode === "grid") {
                         mappings[Qt.Key_Right] = () => appLauncher.selectNextInRow()
@@ -217,6 +219,7 @@ DankPopout {
                         font.pixelSize: Theme.fontSizeLarge
                         enabled: appDrawerPopout.shouldBeVisible
                         ignoreLeftRightKeys: appLauncher.viewMode !== "list"
+                        ignoreTabKeys: true
                         keyForwardTargets: [keyHandler]
                         onTextEdited: {
                             appLauncher.searchQuery = text
@@ -241,7 +244,7 @@ DankPopout {
                                 return
                             }
 
-                            const navigationKeys = [Qt.Key_Down, Qt.Key_Up, Qt.Key_Left, Qt.Key_Right]
+                            const navigationKeys = [Qt.Key_Down, Qt.Key_Up, Qt.Key_Left, Qt.Key_Right, Qt.Key_Tab, Qt.Key_Backtab]
                             const isNavigationKey = navigationKeys.includes(event.key)
                             const isEmptyEnter = isEnterKey && !hasText
 
@@ -797,12 +800,13 @@ DankPopout {
                 model: contextMenu.currentApp && contextMenu.currentApp.desktopEntry && contextMenu.currentApp.desktopEntry.actions ? contextMenu.currentApp.desktopEntry.actions : []
 
                 Rectangle {
-                    width: parent.width
+                    width: Math.max(parent.width, actionRow.implicitWidth + Theme.spacingS * 2)
                     height: 32
                     radius: Theme.cornerRadius
                     color: actionMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
                     Row {
+                        id: actionRow
                         anchors.left: parent.left
                         anchors.leftMargin: Theme.spacingS
                         anchors.verticalCenter: parent.verticalCenter

Modules/DankBar/BarCanvas.qml

@@ -25,7 +25,7 @@ Item {
 
         readonly property real correctWidth: root.width
         readonly property real correctHeight: root.height
-        canvasSize: Qt.size(barWindow.px(correctWidth), barWindow.px(correctHeight))
+        canvasSize: Qt.size(Math.ceil(correctWidth), Math.ceil(correctHeight))
 
         property real wing: SettingsData.dankBarGothCornersEnabled ? barWindow._wingR : 0
         property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.cornerRadius
@@ -40,7 +40,6 @@ Item {
         Connections {
             target: barWindow
             function on_BgColorChanged() { barShape.requestPaint() }
-            function on_DprChanged() { barShape.requestPaint() }
         }
 
         Connections {
@@ -50,19 +49,16 @@ Item {
 
         onPaint: {
             const ctx = getContext("2d")
-            const scale = barWindow._dpr
-            const W = barWindow.px(barWindow.isVertical ? correctHeight : correctWidth)
-            const H_raw = barWindow.px(barWindow.isVertical ? correctWidth : correctHeight)
-            const R = barWindow.px(wing)
-            const RT = barWindow.px(rt)
+            const W = barWindow.isVertical ? correctHeight : correctWidth
+            const H_raw = barWindow.isVertical ? correctWidth : correctHeight
+            const R = wing
+            const RT = rt
             const H = H_raw - (R > 0 ? R : 0)
             const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
             const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
             const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
             const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
 
-            ctx.scale(scale, scale)
-
             function drawTopPath() {
                 ctx.beginPath()
                 ctx.moveTo(RT, 0)
@@ -89,7 +85,7 @@ Item {
             }
 
             ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
+            ctx.clearRect(0, 0, Math.ceil(W), Math.ceil(H_raw))
 
             ctx.save()
             if (isBottom) {
@@ -120,7 +116,7 @@ Item {
 
         readonly property real correctWidth: root.width
         readonly property real correctHeight: root.height
-        canvasSize: Qt.size(barWindow.px(correctWidth), barWindow.px(correctHeight))
+        canvasSize: Qt.size(Math.ceil(correctWidth), Math.ceil(correctHeight))
 
         property real wing: SettingsData.dankBarGothCornersEnabled ? barWindow._wingR : 0
         property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.cornerRadius
@@ -137,7 +133,6 @@ Item {
         Connections {
             target: barWindow
             function on_BgColorChanged() { barTint.requestPaint() }
-            function on_DprChanged() { barTint.requestPaint() }
         }
 
         Connections {
@@ -147,19 +142,16 @@ Item {
 
         onPaint: {
             const ctx = getContext("2d")
-            const scale = barWindow._dpr
-            const W = barWindow.px(barWindow.isVertical ? correctHeight : correctWidth)
-            const H_raw = barWindow.px(barWindow.isVertical ? correctWidth : correctHeight)
-            const R = barWindow.px(wing)
-            const RT = barWindow.px(rt)
+            const W = barWindow.isVertical ? correctHeight : correctWidth
+            const H_raw = barWindow.isVertical ? correctWidth : correctHeight
+            const R = wing
+            const RT = rt
             const H = H_raw - (R > 0 ? R : 0)
             const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
             const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
             const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
             const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
 
-            ctx.scale(scale, scale)
-
             function drawTopPath() {
                 ctx.beginPath()
                 ctx.moveTo(RT, 0)
@@ -186,7 +178,7 @@ Item {
             }
 
             ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
+            ctx.clearRect(0, 0, Math.ceil(W), Math.ceil(H_raw))
 
             ctx.save()
             if (isBottom) {
@@ -211,14 +203,14 @@ Item {
     Canvas {
         id: barBorder
         anchors.fill: parent
-        antialiasing: true
+        antialiasing: false
         visible: SettingsData.dankBarBorderEnabled
         renderTarget: Canvas.FramebufferObject
         renderStrategy: Canvas.Cooperative
 
         readonly property real correctWidth: root.width
         readonly property real correctHeight: root.height
-        canvasSize: Qt.size(barWindow.px(correctWidth), barWindow.px(correctHeight))
+        canvasSize: Qt.size(Math.ceil(correctWidth), Math.ceil(correctHeight))
 
         property real wing: SettingsData.dankBarGothCornersEnabled ? barWindow._wingR : 0
         property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.cornerRadius
@@ -232,32 +224,28 @@ Item {
         onVisibleChanged: if (visible) requestPaint()
         Component.onCompleted: requestPaint()
 
-        Connections {
-            target: barWindow
-            function on_DprChanged() { barBorder.requestPaint() }
-        }
-
         Connections {
             target: Theme
-            function onSecondaryChanged() { barBorder.requestPaint() }
+            function onIsLightModeChanged() { barBorder.requestPaint() }
         }
 
         Connections {
             target: SettingsData
+            function onDankBarBorderColorChanged() { barBorder.requestPaint() }
+            function onDankBarBorderOpacityChanged() { barBorder.requestPaint() }
+            function onDankBarBorderThicknessChanged() { barBorder.requestPaint() }
             function onDankBarSpacingChanged() { barBorder.requestPaint() }
             function onDankBarSquareCornersChanged() { barBorder.requestPaint() }
-            function onCornerRadiusChanged() { barBorder.requestPaint() }
         }
 
         onPaint: {
             if (!borderEnabled) return
 
             const ctx = getContext("2d")
-            const scale = barWindow._dpr
-            const W = barWindow.px(barWindow.isVertical ? correctHeight : correctWidth)
-            const H_raw = barWindow.px(barWindow.isVertical ? correctWidth : correctHeight)
-            const R = barWindow.px(wing)
-            const RT = barWindow.px(rt)
+            const W = barWindow.isVertical ? correctHeight : correctWidth
+            const H_raw = barWindow.isVertical ? correctWidth : correctHeight
+            const R = wing
+            const RT = rt
             const H = H_raw - (R > 0 ? R : 0)
             const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
             const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
@@ -267,8 +255,6 @@ Item {
             const spacing = SettingsData.dankBarSpacing
             const hasEdgeGap = spacing > 0 || RT > 0
 
-            ctx.scale(scale, scale)
-
             function drawTopBorder() {
                 ctx.beginPath()
 
@@ -302,7 +288,7 @@ Item {
             }
 
             ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
+            ctx.clearRect(0, 0, Math.ceil(W), Math.ceil(H_raw))
 
             ctx.save()
             if (isBottom) {
@@ -319,9 +305,17 @@ Item {
             drawTopBorder()
             ctx.restore()
 
-            ctx.lineWidth = 1
-            ctx.strokeStyle = Theme.secondary
+            const key = SettingsData.dankBarBorderColor || "surfaceText"
+            const base = (key === "surfaceText") ? Theme.surfaceText
+                       : (key === "primary") ? Theme.primary
+                       : Theme.secondary
+            const color = Theme.withAlpha(base, SettingsData.dankBarBorderOpacity ?? 1.0)
+            const thickness = Math.max(1, SettingsData.dankBarBorderThickness ?? 1)
+
+            ctx.globalCompositeOperation = "source-over"
+            ctx.lineWidth = thickness
+            ctx.strokeStyle = color
             ctx.stroke()
         }
     }
-}
+}

Modules/DankBar/DankBar.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Effects
 import QtQuick.Shapes
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import Quickshell.Services.Mpris
 import Quickshell.Services.Notifications
@@ -61,8 +62,17 @@ Item {
             property real wingtipsRadius: Theme.cornerRadius
             readonly property real _wingR: Math.max(0, wingtipsRadius)
             readonly property color _bgColor: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, topBarCore?.backgroundTransparency ?? SettingsData.dankBarTransparency)
-            readonly property real _dpr: (barWindow.screen && barWindow.screen.devicePixelRatio) ? barWindow.screen.devicePixelRatio : 1
-            function px(v) { return Math.round(v * _dpr) / _dpr }
+            readonly property real _dpr: {
+                if (CompositorService.isNiri && barWindow.screen) {
+                    const niriScale = NiriService.displayScales[barWindow.screen.name]
+                    if (niriScale !== undefined) return niriScale
+                }
+                if (CompositorService.isHyprland && barWindow.screen) {
+                    const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === barWindow.screen.name)
+                    if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
+                }
+                return (barWindow.screen?.devicePixelRatio) || 1
+            }
 
             property string screenName: modelData.name
             readonly property int notificationCount: NotificationService.notifications.length
@@ -70,8 +80,8 @@ Item {
             readonly property real widgetThickness: Math.max(20, 26 + SettingsData.dankBarInnerPadding * 0.6)
 
             screen: modelData
-            implicitHeight: !isVertical ? px(effectiveBarThickness + SettingsData.dankBarSpacing + (SettingsData.dankBarGothCornersEnabled ? _wingR : 0)) : 0
-            implicitWidth: isVertical ? px(effectiveBarThickness + SettingsData.dankBarSpacing + (SettingsData.dankBarGothCornersEnabled ? _wingR : 0)) : 0
+            implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + SettingsData.dankBarSpacing + (SettingsData.dankBarGothCornersEnabled ? _wingR : 0), _dpr) : 0
+            implicitWidth: isVertical ? Theme.px(effectiveBarThickness + SettingsData.dankBarSpacing + (SettingsData.dankBarGothCornersEnabled ? _wingR : 0), _dpr) : 0
             color: "transparent"
 
             property var nativeInhibitor: null
@@ -234,7 +244,7 @@ Item {
             Item {
                 id: inputMask
 
-                readonly property int barThickness: px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing)
+                readonly property int barThickness: Theme.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing, barWindow._dpr)
 
                 readonly property bool inOverviewWithShow: CompositorService.isNiri && NiriService.inOverview && SettingsData.dankBarOpenOnOverview
                 readonly property bool effectiveVisible: SettingsData.dankBarVisible || inOverviewWithShow
@@ -367,8 +377,8 @@ Item {
             id: topBarMouseArea
             y: !barWindow.isVertical ? (SettingsData.dankBarPosition === SettingsData.Position.Bottom ? parent.height - height : 0) : 0
             x: barWindow.isVertical ? (SettingsData.dankBarPosition === SettingsData.Position.Right ? parent.width - width : 0) : 0
-            height: !barWindow.isVertical ? px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing) : undefined
-            width: barWindow.isVertical ? px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing) : undefined
+            height: !barWindow.isVertical ? Theme.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing, barWindow._dpr) : undefined
+            width: barWindow.isVertical ? Theme.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing, barWindow._dpr) : undefined
             anchors {
                 left: !barWindow.isVertical ? parent.left : (SettingsData.dankBarPosition === SettingsData.Position.Left ? parent.left : undefined)
                 right: !barWindow.isVertical ? parent.right : (SettingsData.dankBarPosition === SettingsData.Position.Right ? parent.right : undefined)
@@ -387,8 +397,8 @@ Item {
 
                 transform: Translate {
                     id: topBarSlide
-                    x: barWindow.isVertical ? px(topBarCore.reveal ? 0 : (SettingsData.dankBarPosition === SettingsData.Position.Right ? barWindow.implicitWidth : -barWindow.implicitWidth)) : 0
-                    y: !barWindow.isVertical ? px(topBarCore.reveal ? 0 : (SettingsData.dankBarPosition === SettingsData.Position.Bottom ? barWindow.implicitHeight : -barWindow.implicitHeight)) : 0
+                    x: barWindow.isVertical ? Theme.snap(topBarCore.reveal ? 0 : (SettingsData.dankBarPosition === SettingsData.Position.Right ? barWindow.implicitWidth : -barWindow.implicitWidth), barWindow._dpr) : 0
+                    y: !barWindow.isVertical ? Theme.snap(topBarCore.reveal ? 0 : (SettingsData.dankBarPosition === SettingsData.Position.Bottom ? barWindow.implicitHeight : -barWindow.implicitHeight), barWindow._dpr) : 0
 
                     Behavior on x {
                         NumberAnimation {
@@ -408,10 +418,10 @@ Item {
                 Item {
                     id: barUnitInset
                     anchors.fill: parent
-                    anchors.leftMargin: !barWindow.isVertical ? px(SettingsData.dankBarSpacing) : (axis.edge === "left" ? px(SettingsData.dankBarSpacing) : 0)
-                    anchors.rightMargin: !barWindow.isVertical ? px(SettingsData.dankBarSpacing) : (axis.edge === "right" ? px(SettingsData.dankBarSpacing) : 0)
-                    anchors.topMargin: barWindow.isVertical ? px(SettingsData.dankBarSpacing) : (axis.outerVisualEdge() === "bottom" ? 0 : px(SettingsData.dankBarSpacing))
-                    anchors.bottomMargin: barWindow.isVertical ? px(SettingsData.dankBarSpacing) : (axis.outerVisualEdge() === "bottom" ? px(SettingsData.dankBarSpacing) : 0)
+                    anchors.leftMargin: !barWindow.isVertical ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : (axis.edge === "left" ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : 0)
+                    anchors.rightMargin: !barWindow.isVertical ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : (axis.edge === "right" ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : 0)
+                    anchors.topMargin: barWindow.isVertical ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : (axis.outerVisualEdge() === "bottom" ? 0 : Theme.px(SettingsData.dankBarSpacing, barWindow._dpr))
+                    anchors.bottomMargin: barWindow.isVertical ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : (axis.outerVisualEdge() === "bottom" ? Theme.px(SettingsData.dankBarSpacing, barWindow._dpr) : 0)
 
                     BarCanvas {
                         id: barBackground

Modules/DankDash/MediaPlayerTab.qml

@@ -491,7 +491,6 @@ Item {
                                     }
                                 }
                                 
-                                Behavior on color { ColorAnimation { duration: Anims.durShort } }
                                 Behavior on border.color { ColorAnimation { duration: Anims.durShort } }
                             }
                         }
@@ -675,14 +674,6 @@ Item {
                                     }
                                 }
 
-                                Behavior on color {
-                                    ColorAnimation { 
-                                        duration: Anims.durShort
-                                        easing.type: Easing.BezierSpline
-                                        easing.bezierCurve: Anims.standard
-                                    }
-                                }
-
                                 Behavior on border.color {
                                     ColorAnimation { 
                                         duration: Anims.durShort
@@ -858,14 +849,6 @@ Item {
                                         }
                                     }
                                 }
-
-                                Behavior on color {
-                                    ColorAnimation {
-                                        duration: Anims.durShort
-                                        easing.type: Easing.BezierSpline
-                                        easing.bezierCurve: Anims.standard
-                                    }
-                                }
                             }
                         }
 
@@ -1024,14 +1007,6 @@ Item {
                                         }
                                     }
                                 }
-
-                                Behavior on color {
-                                    ColorAnimation {
-                                        duration: Anims.durShort
-                                        easing.type: Easing.BezierSpline
-                                        easing.bezierCurve: Anims.standard
-                                    }
-                                }
                             }
                         }
                         }  

Modules/Dock/DockAppButton.qml

@@ -322,7 +322,21 @@ Item {
                                }
                            }
                        } else if (mouse.button === Qt.MiddleButton) {
-                           if (appData && appData.appId) {
+                           if (appData && appData.type === "window") {
+                               const sortedToplevels = CompositorService.sortedToplevels
+                               for (var i = 0; i < sortedToplevels.length; i++) {
+                                   const toplevel = sortedToplevels[i]
+                                   const checkId = toplevel.title + "|" + (toplevel.appId || "") + "|" + i
+                                   if (checkId === appData.uniqueId) {
+                                       toplevel.close()
+                                       break
+                                   }
+                               }
+                           } else if (appData && appData.type === "grouped") {
+                               if (contextMenu) {
+                                   contextMenu.showForButton(root, appData, 40, false, cachedDesktopEntry)
+                               }
+                           } else if (appData && appData.appId) {
                                const desktopEntry = cachedDesktopEntry
                                if (desktopEntry) {
                                    AppUsageHistoryData.addAppUsage({
@@ -333,7 +347,7 @@ Item {
                                                                        "comment": desktopEntry.comment || ""
                                                                    })
                                }
-                             SessionService.launchDesktopEntry(desktopEntry)
+                               SessionService.launchDesktopEntry(desktopEntry)
                            }
                        } else if (mouse.button === Qt.RightButton) {
                            if (contextMenu && appData) {

Modules/Greetd/GreeterContent.qml

@@ -1291,7 +1291,7 @@ Item {
             if (sessionCmd) {
                 GreetdMemory.setLastSessionId(GreeterState.sessionPaths[GreeterState.currentSessionIndex])
                 GreetdMemory.setLastSuccessfulUser(GreeterState.username)
-                Greetd.launch(sessionCmd.split(" "), ["XDG_SESSION_TYPE=wayland"], true)
+                Greetd.launch(sessionCmd.split(" "), ["XDG_SESSION_TYPE=wayland"])
             }
         }
 

Modules/Greetd/README.md

@@ -18,34 +18,43 @@ The easiest thing is to run `dms greeter install` or `dms` for interactive insta
 
 ### Manual
 
-1. Install `greetd` (in most distro's standard repositories)
-2. Copy `assets/dms-niri.kdl` or `assets/dms-hypr.conf` to `/etc/greetd`
-  - niri if you want to run the greeter under niri, hypr if you want to run the greeter under Hyprland
-3. Copy `assets/greet-niri.sh` or `assets/greet-hyprland.sh` to `/usr/local/bin/start-dms-greetd.sh`
-4. Edit `/etc/greetd/dms-niri.kdl` or `/etc/greetd/dms-hypr.conf` and replace `_DMS_PATH_` with the absolute path to dms, e.g. `/home/joecool/.config/quickshell/dms`
-5. Edit or create `/etc/greetd/config.toml` 
+1. Install `greetd` (in most distro's standard repositories) and `quickshell`
+2. Clone the dms project to `/etc/xdg/quickshell/dms-greeter`
+```bash
+sudo git clone https://github.com/AvengeMedia/DankMaterialShell.git /etc/xdg/quickshell/dms-greeter
+```
+3. Copy `assets/dms-greeter` to `/usr/local/bin/dms-greeter`:
+```bash
+sudo cp assets/dms-greeter /usr/local/bin/dms-greeter
+sudo chmod +x /usr/local/bin/dms-greeter
+```
+4. Create greeter cache directory with proper permissions:
+```bash
+sudo mkdir -p /var/cache/dms-greeter
+sudo chown greeter:greeter /var/cache/dms-greeter
+sudo chmod 770 /var/cache/dms-greeter
+```
+6. Edit or create `/etc/greetd/config.toml`:
 ```toml
 [terminal]
-# The VT to run the greeter on. Can be "next", "current" or a number
-# designating the VT.
 vt = 1
 
-# The default session, also known as the greeter.
 [default_session]
-
-# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
-# with whatever you want started, such as `sway`.
-
-# The user to run the command as. The privileges this user must have depends
-# on the greeter. A graphical greeter may for example require the user to be
-# in the `video` group.
 user = "greeter"
-
-command = "/usr/local/bin/start-dms-greetd.sh"
+# Change compositor to sway or hyprland if preferred
+command = "/usr/local/bin/dms-greeter --command niri"
 ```
 
 Enable the greeter with `sudo systemctl enable greetd`
 
+#### Legacy installation (deprecated)
+
+If you prefer the old method with separate shell scripts and config files:
+1. Copy `assets/dms-niri.kdl` or `assets/dms-hypr.conf` to `/etc/greetd`
+2. Copy `assets/greet-niri.sh` or `assets/greet-hyprland.sh` to `/usr/local/bin/start-dms-greetd.sh`
+3. Edit the config file and replace `_DMS_PATH_` with your DMS installation path
+4. Configure greetd to use `/usr/local/bin/start-dms-greetd.sh`
+
 ### NixOS
 
 To install the greeter on NixOS add the repo to your flake inputs as described in the readme. Then somewhere in your NixOS config add this to imports:
@@ -66,7 +75,30 @@ programs.dankMaterialShell.greeter = {
 
 ## Usage
 
-To run dms in greeter mode you just need to set `DMS_RUN_GREETER=1` in the environment.
+### Using dms-greeter wrapper (recommended)
+
+The `dms-greeter` wrapper simplifies running the greeter with any compositor:
+
+```bash
+dms-greeter --command niri
+dms-greeter --command hyprland
+dms-greeter --command sway
+dms-greeter --command niri -C /path/to/custom-niri.kdl
+```
+
+Configure greetd to use it in `/etc/greetd/config.toml`:
+```toml
+[terminal]
+vt = 1
+
+[default_session]
+user = "greeter"
+command = "/usr/local/bin/dms-greeter --command niri"
+```
+
+### Manual usage
+
+To run dms in greeter mode you can also manually set environment variables:
 
 ```bash
 DMS_RUN_GREETER=1 qs -p /path/to/dms
@@ -86,15 +118,17 @@ Wallpapers and themes and weather and clock formats and things are a TODO on the
 
 You can synchronize those configurations with a specific user if you want greeter settings to always mirror the shell.
 
+The greeter uses the `dms-greeter` group for file access permissions, so ensure your user and the greeter user are both members of this group.
+
 ```bash
 # For core settings (theme, clock formats, etc)
-sudo ln -sf ~/.config/DankMaterialShell/settings.json /etc/greetd/.dms/settings.json
+sudo ln -sf ~/.config/DankMaterialShell/settings.json /var/cache/dms-greeter/settings.json
 # For state (mainly you would configure wallpaper in this file)
-sudo ln -sf ~/.local/state/DankMaterialShell/session.json /etc/greetd/.dms/session.json
+sudo ln -sf ~/.local/state/DankMaterialShell/session.json /var/cache/dms-greeter/session.json
 # For wallpaper based theming
-sudo ln -sf ~/.cache/quickshell/dankshell/dms-colors.json /etc/greetd/.dms/dms-colors.json
+sudo ln -sf ~/.cache/quickshell/dankshell/dms-colors.json /var/cache/dms-greeter/dms-colors.json
 ```
 
-You can override the configuration path with the `DMS_GREET_CFG_DIR` environment variable, the default is `/etc/greetd/.dms`
+You can override the configuration path with the `DMS_GREET_CFG_DIR` environment variable or the `--cache-dir` flag when using `dms-greeter`. The default is `/var/cache/dms-greeter`.
 
-It should be writable by the greeter user.
+The cache directory should be owned by `greeter:greeter` with `770` permissions.

Modules/Greetd/assets/dms-greeter

@@ -0,0 +1,174 @@
+#!/bin/bash
+
+set -e
+
+COMPOSITOR=""
+COMPOSITOR_CONFIG=""
+DMS_PATH="dms-greeter"
+CACHE_DIR="/var/cache/dms-greeter"
+
+show_help() {
+    cat << EOF
+dms-greeter - DankMaterialShell greeter launcher
+
+Usage: dms-greeter --command COMPOSITOR [OPTIONS]
+
+Required:
+    --command COMPOSITOR    Compositor to use (niri, hyprland, or sway)
+
+Options:
+    -C, --config PATH       Custom compositor config file
+    -p, --path PATH         DMS path (config name or absolute path)
+                           (default: dms-greeter)
+    --cache-dir PATH        Cache directory for greeter data
+                           (default: /var/cache/dms-greeter)
+    -h, --help             Show this help message
+
+Examples:
+    dms-greeter --command niri
+    dms-greeter --command hyprland -C /etc/greetd/custom-hypr.conf
+    dms-greeter --command sway -p /home/user/.config/quickshell/custom-dms
+    dms-greeter --command niri --cache-dir /tmp/dmsgreeter
+EOF
+}
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --command)
+            COMPOSITOR="$2"
+            shift 2
+            ;;
+        -C|--config)
+            COMPOSITOR_CONFIG="$2"
+            shift 2
+            ;;
+        -p|--path)
+            DMS_PATH="$2"
+            shift 2
+            ;;
+        --cache-dir)
+            CACHE_DIR="$2"
+            shift 2
+            ;;
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $1" >&2
+            show_help
+            exit 1
+            ;;
+    esac
+done
+
+if [[ -z "$COMPOSITOR" ]]; then
+    echo "Error: --command COMPOSITOR is required" >&2
+    show_help
+    exit 1
+fi
+
+export XDG_SESSION_TYPE=wayland
+export QT_QPA_PLATFORM=wayland
+export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+export EGL_PLATFORM=gbm
+export DMS_RUN_GREETER=1
+export DMS_GREET_CFG_DIR="$CACHE_DIR"
+
+mkdir -p "$CACHE_DIR"
+
+QS_CMD="qs"
+if [[ "$DMS_PATH" == /* ]]; then
+    QS_CMD="qs -p $DMS_PATH"
+else
+    QS_CMD="qs -c $DMS_PATH"
+fi
+
+case "$COMPOSITOR" in
+    niri)
+        if [[ -z "$COMPOSITOR_CONFIG" ]]; then
+            TEMP_CONFIG=$(mktemp)
+            cat > "$TEMP_CONFIG" << NIRI_EOF
+hotkey-overlay {
+    skip-at-startup
+}
+
+environment {
+    DMS_RUN_GREETER "1"
+}
+
+spawn-at-startup "sh" "-c" "$QS_CMD; niri msg action quit --skip-confirmation"
+
+debug {
+  keep-max-bpc-unchanged
+}
+
+gestures {
+   hot-corners {
+     off
+   }
+}
+
+layout {
+  background-color "#000000"
+}
+NIRI_EOF
+            COMPOSITOR_CONFIG="$TEMP_CONFIG"
+        else
+            TEMP_CONFIG=$(mktemp)
+            cat "$COMPOSITOR_CONFIG" > "$TEMP_CONFIG"
+            cat >> "$TEMP_CONFIG" << NIRI_EOF
+
+spawn-at-startup "sh" "-c" "$QS_CMD; niri msg action quit --skip-confirmation"
+NIRI_EOF
+            COMPOSITOR_CONFIG="$TEMP_CONFIG"
+        fi
+        exec niri -c "$COMPOSITOR_CONFIG"
+        ;;
+
+    hyprland)
+        if [[ -z "$COMPOSITOR_CONFIG" ]]; then
+            TEMP_CONFIG=$(mktemp)
+            cat > "$TEMP_CONFIG" << HYPRLAND_EOF
+env = DMS_RUN_GREETER,1
+
+exec = sh -c "$QS_CMD; hyprctl dispatch exit"
+HYPRLAND_EOF
+            COMPOSITOR_CONFIG="$TEMP_CONFIG"
+        else
+            TEMP_CONFIG=$(mktemp)
+            cat "$COMPOSITOR_CONFIG" > "$TEMP_CONFIG"
+            cat >> "$TEMP_CONFIG" << HYPRLAND_EOF
+
+exec = sh -c "$QS_CMD; hyprctl dispatch exit"
+HYPRLAND_EOF
+            COMPOSITOR_CONFIG="$TEMP_CONFIG"
+        fi
+        exec Hyprland -c "$COMPOSITOR_CONFIG"
+        ;;
+
+    sway)
+        if [[ -z "$COMPOSITOR_CONFIG" ]]; then
+            TEMP_CONFIG=$(mktemp)
+            cat > "$TEMP_CONFIG" << SWAY_EOF
+exec "$QS_CMD; swaymsg exit"
+SWAY_EOF
+            COMPOSITOR_CONFIG="$TEMP_CONFIG"
+        else
+            TEMP_CONFIG=$(mktemp)
+            cat "$COMPOSITOR_CONFIG" > "$TEMP_CONFIG"
+            cat >> "$TEMP_CONFIG" << SWAY_EOF
+
+exec "$QS_CMD; swaymsg exit"
+SWAY_EOF
+            COMPOSITOR_CONFIG="$TEMP_CONFIG"
+        fi
+        exec sway -c "$COMPOSITOR_CONFIG"
+        ;;
+
+    *)
+        echo "Error: Unsupported compositor: $COMPOSITOR" >&2
+        echo "Supported compositors: niri, hyprland, sway" >&2
+        exit 1
+        ;;
+esac

Modules/Lock/Lock.qml

@@ -8,81 +8,54 @@ import qs.Services
 Item {
     id: root
 
-    function activate() {
-        loader.activeAsync = true
-    }
+    property string sharedPasswordBuffer: ""
+    property bool shouldLock: false
 
     Component.onCompleted: {
-        if (SessionService.loginctlAvailable || SessionService.sessionPath) {
-            if (SessionService.locked || SessionService.lockedHint) {
-                console.log("Lock: Session locked on startup")
-                loader.activeAsync = true
-            }
-        }
+        IdleService.lockComponent = root
     }
 
-    Connections {
-        target: IdleService
-        function onLockRequested() {
-            console.log("Lock: Received lock request from IdleService")
-            loader.activeAsync = true
-        }
+    function activate() {
+        shouldLock = true
     }
 
     Connections {
         target: SessionService
 
         function onSessionLocked() {
-            console.log("Lock: Lock signal received -> show lock")
-            loader.activeAsync = true
+            shouldLock = true
         }
 
         function onSessionUnlocked() {
-            console.log("Lock: Unlock signal received -> hide lock")
-            loader.active = false
-        }
-
-        function onLoginctlStateChanged() {
-            if (SessionService.lockedHint && !loader.active) {
-                console.log("Lock: LockedHint=true -> show lock")
-                loader.activeAsync = true
-            } else if (!SessionService.locked && !SessionService.lockedHint && loader.active) {
-                console.log("Lock: LockedHint=false -> hide lock")
-                loader.active = false
-            }
-        }
-
-        function onPrepareForSleep() {
-            if (SessionService.preparingForSleep && SessionData.lockBeforeSuspend) {
-                console.log("Lock: PrepareForSleep -> lock before suspend")
-                loader.activeAsync = true
-            }
+            shouldLock = false
         }
     }
 
-    LazyLoader {
-        id: loader
+    Connections {
+        target: IdleService
 
-        WlSessionLock {
-            id: sessionLock
+        function onLockRequested() {
+            shouldLock = true
+        }
+    }
 
-            property bool unlocked: false
-            property string sharedPasswordBuffer: ""
+    WlSessionLock {
+        id: sessionLock
 
-            locked: true
+        locked: root.shouldLock
 
-            onLockedChanged: {
-                if (!locked) {
-                    loader.active = false
-                }
-            }
+        WlSessionLockSurface {
+            color: "transparent"
 
             LockSurface {
-                id: lockSurface
+                anchors.fill: parent
                 lock: sessionLock
-                sharedPasswordBuffer: sessionLock.sharedPasswordBuffer
+                sharedPasswordBuffer: root.sharedPasswordBuffer
+                onUnlockRequested: {
+                    root.shouldLock = false
+                }
                 onPasswordChanged: newPassword => {
-                                       sessionLock.sharedPasswordBuffer = newPassword
+                                       root.sharedPasswordBuffer = newPassword
                                    }
             }
         }
@@ -96,17 +69,15 @@ Item {
         target: "lock"
 
         function lock() {
-            console.log("Lock screen requested via IPC")
-            loader.activeAsync = true
+            shouldLock = true
         }
 
         function demo() {
-            console.log("Lock screen DEMO mode requested via IPC")
             demoWindow.showDemo()
         }
 
         function isLocked(): bool {
-            return SessionService.locked || loader.active
+            return sessionLock.locked
         }
     }
 }

Modules/Lock/LockSurface.qml

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

Modules/Plugins/PluginSettings.qml

@@ -17,7 +17,14 @@ Item {
     implicitHeight: hasPermission ? settingsColumn.implicitHeight : errorText.implicitHeight
     height: implicitHeight
 
-    readonly property bool hasPermission: pluginService && pluginService.hasPermission ? pluginService.hasPermission(pluginId, "settings_write") : true
+    readonly property bool hasPermission: {
+        if (!pluginService || !pluginId) return true
+        const allPlugins = pluginService.availablePlugins
+        const plugin = allPlugins[pluginId]
+        if (!plugin) return true
+        const permissions = Array.isArray(plugin.permissions) ? plugin.permissions : []
+        return permissions.indexOf("settings_write") !== -1
+    }
 
     Component.onCompleted: {
         loadVariants()
@@ -94,6 +101,42 @@ Item {
         return defaultValue
     }
 
+    function findFlickable(item) {
+        var current = item?.parent
+        while (current) {
+            if (current.contentY !== undefined && current.contentHeight !== undefined) {
+                return current
+            }
+            current = current.parent
+        }
+        return null
+    }
+
+    function ensureItemVisible(item) {
+        if (!item) return
+
+        var flickable = findFlickable(root)
+        if (!flickable) return
+
+        var itemGlobalY = item.mapToItem(null, 0, 0).y
+        var itemHeight = item.height
+        var flickableGlobalY = flickable.mapToItem(null, 0, 0).y
+        var viewportHeight = flickable.height
+
+        var itemRelativeY = itemGlobalY - flickableGlobalY
+        var viewportTop = 0
+        var viewportBottom = viewportHeight
+
+        if (itemRelativeY < viewportTop) {
+            flickable.contentY = Math.max(0, flickable.contentY - (viewportTop - itemRelativeY) - Theme.spacingL)
+        } else if (itemRelativeY + itemHeight > viewportBottom) {
+            flickable.contentY = Math.min(
+                flickable.contentHeight - viewportHeight,
+                flickable.contentY + (itemRelativeY + itemHeight - viewportBottom) + Theme.spacingL
+            )
+        }
+    }
+
     StyledText {
         id: errorText
         visible: pluginService && !root.hasPermission

Modules/Settings/AboutTab.qml

@@ -258,7 +258,7 @@ Item {
 
                     StyledText {
                         text: `dms is a highly customizable, modern desktop shell with a <a href="https://m3.material.io/" style="text-decoration:none; color:${Theme.primary};">material 3 inspired</a> design.
-                        <br /><br/>It is built on top of <a href="https://quickshell.org" style="text-decoration:none; color:${Theme.primary};">Quickshell</a>, a QT6 framework for building desktop shells.
+                        <br /><br/>It is built with <a href="https://quickshell.org" style="text-decoration:none; color:${Theme.primary};">Quickshell</a>, a QT6 framework for building desktop shells, and <a href="https://go.dev" style="text-decoration:none; color:${Theme.primary};">Go</a>, a statically typed, compiled programming language.
                         `
                         textFormat: Text.RichText
                         font.pixelSize: Theme.fontSizeMedium
@@ -352,7 +352,7 @@ Item {
                         }
 
                         StyledText {
-                            text: I18n.tr("QML (Qt Modeling Language)")
+                            text: I18n.tr("QML, JavaScript, Go")
                             font.pixelSize: Theme.fontSizeMedium
                             color: Theme.surfaceVariantText
                         }

Modules/Settings/DankBarTab.qml

@@ -942,14 +942,51 @@ Item {
                         width: parent.width
                         spacing: Theme.spacingS
 
-                        StyledText {
-                            text: I18n.tr("Edge Spacing (0 = edge-to-edge)")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
+                        Row {
+                            width: parent.width
+                            spacing: Theme.spacingS
+
+                            StyledText {
+                                text: I18n.tr("Edge Spacing (0 = edge-to-edge)")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceText
+                                font.weight: Font.Medium
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            Item {
+                                width: parent.width - edgeSpacingText.implicitWidth - resetEdgeSpacingBtn.width - Theme.spacingS - Theme.spacingM
+                                height: 1
+
+                                StyledText {
+                                    id: edgeSpacingText
+                                    visible: false
+                                    text: I18n.tr("Edge Spacing (0 = edge-to-edge)")
+                                    font.pixelSize: Theme.fontSizeSmall
+                                }
+                            }
+
+                            DankActionButton {
+                                id: resetEdgeSpacingBtn
+                                buttonSize: 20
+                                iconName: "refresh"
+                                iconSize: 12
+                                backgroundColor: Theme.surfaceContainerHigh
+                                iconColor: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
+                                onClicked: {
+                                    SettingsData.setDankBarSpacing(4)
+                                }
+                            }
+
+                            Item {
+                                width: Theme.spacingS
+                                height: 1
+                            }
                         }
 
                         DankSlider {
+                            id: edgeSpacingSlider
                             width: parent.width
                             height: 24
                             value: SettingsData.dankBarSpacing
@@ -963,6 +1000,13 @@ Item {
                                                       SettingsData.setDankBarSpacing(
                                                           newValue)
                                                   }
+
+                            Binding {
+                                target: edgeSpacingSlider
+                                property: "value"
+                                value: SettingsData.dankBarSpacing
+                                restoreMode: Binding.RestoreBinding
+                            }
                         }
                     }
 
@@ -970,19 +1014,56 @@ Item {
                         width: parent.width
                         spacing: Theme.spacingS
 
-                        StyledText {
-                            text: I18n.tr("Exclusive Zone Offset")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
+                        Row {
+                            width: parent.width
+                            spacing: Theme.spacingS
+
+                            StyledText {
+                                text: I18n.tr("Exclusive Zone Offset")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceText
+                                font.weight: Font.Medium
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            Item {
+                                width: parent.width - exclusiveZoneText.implicitWidth - resetExclusiveZoneBtn.width - Theme.spacingS - Theme.spacingM
+                                height: 1
+
+                                StyledText {
+                                    id: exclusiveZoneText
+                                    visible: false
+                                    text: I18n.tr("Exclusive Zone Offset")
+                                    font.pixelSize: Theme.fontSizeSmall
+                                }
+                            }
+
+                            DankActionButton {
+                                id: resetExclusiveZoneBtn
+                                buttonSize: 20
+                                iconName: "refresh"
+                                iconSize: 12
+                                backgroundColor: Theme.surfaceContainerHigh
+                                iconColor: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
+                                onClicked: {
+                                    SettingsData.setDankBarBottomGap(0)
+                                }
+                            }
+
+                            Item {
+                                width: Theme.spacingS
+                                height: 1
+                            }
                         }
 
                         DankSlider {
+                            id: exclusiveZoneSlider
                             width: parent.width
                             height: 24
                             value: SettingsData.dankBarBottomGap
-                            minimum: -100
-                            maximum: 100
+                            minimum: -50
+                            maximum: 50
                             unit: ""
                             showValue: true
                             wheelEnabled: false
@@ -991,6 +1072,13 @@ Item {
                                                       SettingsData.setDankBarBottomGap(
                                                           newValue)
                                                   }
+
+                            Binding {
+                                target: exclusiveZoneSlider
+                                property: "value"
+                                value: SettingsData.dankBarBottomGap
+                                restoreMode: Binding.RestoreBinding
+                            }
                         }
                     }
 
@@ -998,14 +1086,51 @@ Item {
                         width: parent.width
                         spacing: Theme.spacingS
 
-                        StyledText {
-                            text: I18n.tr("Size")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
+                        Row {
+                            width: parent.width
+                            spacing: Theme.spacingS
+
+                            StyledText {
+                                text: I18n.tr("Size")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceText
+                                font.weight: Font.Medium
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            Item {
+                                width: parent.width - sizeText.implicitWidth - resetSizeBtn.width - Theme.spacingS - Theme.spacingM
+                                height: 1
+
+                                StyledText {
+                                    id: sizeText
+                                    visible: false
+                                    text: I18n.tr("Size")
+                                    font.pixelSize: Theme.fontSizeSmall
+                                }
+                            }
+
+                            DankActionButton {
+                                id: resetSizeBtn
+                                buttonSize: 20
+                                iconName: "refresh"
+                                iconSize: 12
+                                backgroundColor: Theme.surfaceContainerHigh
+                                iconColor: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
+                                onClicked: {
+                                    SettingsData.setDankBarInnerPadding(4)
+                                }
+                            }
+
+                            Item {
+                                width: Theme.spacingS
+                                height: 1
+                            }
                         }
 
                         DankSlider {
+                            id: sizeSlider
                             width: parent.width
                             height: 24
                             value: SettingsData.dankBarInnerPadding
@@ -1019,6 +1144,13 @@ Item {
                                                       SettingsData.setDankBarInnerPadding(
                                                           newValue)
                                                   }
+
+                            Binding {
+                                target: sizeSlider
+                                property: "value"
+                                value: SettingsData.dankBarInnerPadding
+                                restoreMode: Binding.RestoreBinding
+                            }
                         }
                     }
 
@@ -1056,14 +1188,227 @@ Item {
                                    }
                     }
 
-                    DankToggle {
+                    Column {
                         width: parent.width
-                        text: I18n.tr("Border")
-                        description: "Add a 1px border to the bar. Smart edge detection only shows border on exposed sides."
-                        checked: SettingsData.dankBarBorderEnabled
-                        onToggled: checked => {
-                                       SettingsData.setDankBarBorderEnabled(checked)
-                                   }
+                        spacing: Theme.spacingM
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Border")
+                            description: "Add a 1px border to the bar. Smart edge detection only shows border on exposed sides."
+                            checked: SettingsData.dankBarBorderEnabled
+                            onToggled: checked => {
+                                           SettingsData.setDankBarBorderEnabled(checked)
+                                       }
+                        }
+
+                        Column {
+                            width: parent.width
+                            leftPadding: Theme.spacingM
+                            spacing: Theme.spacingM
+                            visible: SettingsData.dankBarBorderEnabled
+
+                            Rectangle {
+                                width: parent.width - parent.leftPadding
+                                height: 1
+                                color: Theme.outline
+                                opacity: 0.2
+                            }
+
+                            Row {
+                                width: parent.width - parent.leftPadding
+                                spacing: Theme.spacingM
+
+                                Column {
+                                    width: parent.width - borderColorGroup.width - Theme.spacingM
+                                    spacing: Theme.spacingXS
+
+                                    StyledText {
+                                        text: I18n.tr("Border Color")
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                    }
+
+                                    StyledText {
+                                        text: I18n.tr("Choose the border accent color")
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceVariantText
+                                        width: parent.width
+                                    }
+                                }
+
+                                DankButtonGroup {
+                                    id: borderColorGroup
+                                    anchors.verticalCenter: parent.verticalCenter
+                                    model: ["Surface", "Secondary", "Primary"]
+                                    currentIndex: {
+                                        const colorOption = SettingsData.dankBarBorderColor || "surfaceText"
+                                        switch (colorOption) {
+                                            case "surfaceText": return 0
+                                            case "secondary": return 1
+                                            case "primary": return 2
+                                            default: return 0
+                                        }
+                                    }
+                                    onSelectionChanged: (index, selected) => {
+                                        if (selected) {
+                                            let newColor = "surfaceText"
+                                            switch (index) {
+                                                case 0: newColor = "surfaceText"; break
+                                                case 1: newColor = "secondary"; break
+                                                case 2: newColor = "primary"; break
+                                            }
+                                            if (SettingsData.dankBarBorderColor !== newColor) {
+                                                SettingsData.dankBarBorderColor = newColor
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            Column {
+                                width: parent.width - parent.leftPadding
+                                spacing: Theme.spacingS
+
+                                Row {
+                                    width: parent.width
+                                    spacing: Theme.spacingS
+
+                                    StyledText {
+                                        text: I18n.tr("Border Opacity")
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                        anchors.verticalCenter: parent.verticalCenter
+                                    }
+
+                                    Item {
+                                        width: parent.width - borderOpacityText.implicitWidth - resetBorderOpacityBtn.width - Theme.spacingS - Theme.spacingM
+                                        height: 1
+
+                                        StyledText {
+                                            id: borderOpacityText
+                                            visible: false
+                                            text: I18n.tr("Border Opacity")
+                                            font.pixelSize: Theme.fontSizeSmall
+                                        }
+                                    }
+
+                                    DankActionButton {
+                                        id: resetBorderOpacityBtn
+                                        buttonSize: 20
+                                        iconName: "refresh"
+                                        iconSize: 12
+                                        backgroundColor: Theme.surfaceContainerHigh
+                                        iconColor: Theme.surfaceText
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        onClicked: {
+                                            SettingsData.dankBarBorderOpacity = 1.0
+                                        }
+                                    }
+
+                                    Item {
+                                        width: Theme.spacingS
+                                        height: 1
+                                    }
+                                }
+
+                                DankSlider {
+                                    id: borderOpacitySlider
+                                    width: parent.width
+                                    height: 24
+                                    value: (SettingsData.dankBarBorderOpacity ?? 1.0) * 100
+                                    minimum: 0
+                                    maximum: 100
+                                    unit: "%"
+                                    showValue: true
+                                    wheelEnabled: false
+                                    thumbOutlineColor: Theme.surfaceContainerHigh
+                                    onSliderValueChanged: newValue => {
+                                        SettingsData.dankBarBorderOpacity = newValue / 100
+                                    }
+
+                                    Binding {
+                                        target: borderOpacitySlider
+                                        property: "value"
+                                        value: (SettingsData.dankBarBorderOpacity ?? 1.0) * 100
+                                        restoreMode: Binding.RestoreBinding
+                                    }
+                                }
+                            }
+
+                            Column {
+                                width: parent.width - parent.leftPadding
+                                spacing: Theme.spacingS
+
+                                Row {
+                                    width: parent.width
+                                    spacing: Theme.spacingS
+
+                                    StyledText {
+                                        text: I18n.tr("Border Thickness")
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                        anchors.verticalCenter: parent.verticalCenter
+                                    }
+
+                                    Item {
+                                        width: parent.width - borderThicknessText.implicitWidth - resetBorderThicknessBtn.width - Theme.spacingS - Theme.spacingM
+                                        height: 1
+
+                                        StyledText {
+                                            id: borderThicknessText
+                                            visible: false
+                                            text: I18n.tr("Border Thickness")
+                                            font.pixelSize: Theme.fontSizeSmall
+                                        }
+                                    }
+
+                                    DankActionButton {
+                                        id: resetBorderThicknessBtn
+                                        buttonSize: 20
+                                        iconName: "refresh"
+                                        iconSize: 12
+                                        backgroundColor: Theme.surfaceContainerHigh
+                                        iconColor: Theme.surfaceText
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        onClicked: {
+                                            SettingsData.dankBarBorderThickness = 1
+                                        }
+                                    }
+
+                                    Item {
+                                        width: Theme.spacingS
+                                        height: 1
+                                    }
+                                }
+
+                                DankSlider {
+                                    id: borderThicknessSlider
+                                    width: parent.width
+                                    height: 24
+                                    value: SettingsData.dankBarBorderThickness ?? 1
+                                    minimum: 1
+                                    maximum: 10
+                                    unit: "px"
+                                    showValue: true
+                                    wheelEnabled: false
+                                    thumbOutlineColor: Theme.surfaceContainerHigh
+                                    onSliderValueChanged: newValue => {
+                                        SettingsData.dankBarBorderThickness = newValue
+                                    }
+
+                                    Binding {
+                                        target: borderThicknessSlider
+                                        property: "value"
+                                        value: SettingsData.dankBarBorderThickness ?? 1
+                                        restoreMode: Binding.RestoreBinding
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     Rectangle {

Modules/Settings/PluginsTab.qml

@@ -256,6 +256,7 @@ FocusScope {
                                     anchors.bottomMargin: pluginDelegate.isExpanded ? settingsContainer.height : 0
                                     hoverEnabled: true
                                     cursorShape: pluginDelegate.hasSettings ? Qt.PointingHandCursor : Qt.ArrowCursor
+                                    enabled: !pluginDelegate.isExpanded || !pluginDelegate.hasSettings
                                     onClicked: {
                                         if (pluginDelegate.hasSettings) {
                                             pluginsTab.expandedPluginId = pluginsTab.expandedPluginId === pluginDelegate.pluginId ? "" : pluginDelegate.pluginId
@@ -504,6 +505,10 @@ FocusScope {
                                     clip: true
                                     focus: pluginDelegate.isExpanded && pluginDelegate.hasSettings
 
+                                    Keys.onPressed: event => {
+                                        event.accepted = true
+                                    }
+
                                     Rectangle {
                                         anchors.fill: parent
                                         color: Theme.surfaceContainerHighest
@@ -600,6 +605,9 @@ FocusScope {
                 pluginsTab.expandedPluginId = ""
             }
         }
+        function onPluginListUpdated() {
+            refreshPluginList()
+        }
     }
 
     Connections {

Modules/Settings/ThemeColorsTab.qml

@@ -992,6 +992,7 @@ Item {
                         }
 
                         DankDropdown {
+                            width: parent.width - Theme.iconSize - Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
                             text: I18n.tr("Icon Theme")
                             description: "DankShell & System Icons\n(requires restart)"

README.md

@@ -12,7 +12,7 @@
 
 </div>
 
-A modern Wayland desktop shell built with [Quickshell](https://quickshell.org/) and optimized for the [niri](https://github.com/YaLTeR/niri) and [Hyprland](https://hyprland.org/) compositors.
+A modern Wayland desktop shell built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/). Optimized for the [niri](https://github.com/YaLTeR/niri) and [Hyprland](https://hyprland.org/) compositors.
 
 Features notifications, app launcher, wallpaper customization, and fully customizable with [plugins](https://github.com/AvengeMedia/dms-plugin-registry).
 
@@ -134,7 +134,7 @@ curl -fsSL https://install.danklinux.com | sh
 
 ### Compositor Setup
 
-DankMaterialShell supports both **niri** and **Hyprland** compositors:
+DankMaterialShell particularly aims at supporting the **niri** and **Hyprland** compositors, but it does support more wayland compositors with a diminished feature set (no monitor off, workspace switcher, overview integration, etc.):
 
 **Niri**:
 ```bash
@@ -661,6 +661,16 @@ cp -R ./PLUGINS/ExampleEmojiPlugin ~/.config/DankMaterialShell/plugins
 
 **Only install plugins from TRUSTED sources.** Plugins execute QML and javascript at runtime, plugins from third parties should be reviewed before enabling them in dms.
 
+### nixOS - via home-manager
+
+Add the following to your home-manager config to install a plugin:
+
+```nix
+programs.dankMaterialShell.plugins = {
+    ExampleEmojiPlugin.src = "${inputs.dankMaterialShell}/PLUGINS/ExampleEmojiPlugin";
+};
+```
+
 ### Calendar Setup
 
 Sync your caldev compatible calendar (Google, Office365, etc.) for dashboard integration:

Services/IdleService.qml

@@ -136,6 +136,15 @@ Singleton {
         }
     }
 
+    Connections {
+        target: SessionService
+        function onPrepareForSleep() {
+            if (SessionData.lockBeforeSuspend) {
+                root.lockRequested()
+            }
+        }
+    }
+
     Component.onCompleted: {
         if (!idleMonitorAvailable) {
             console.warn("IdleService: IdleMonitor not available - power management disabled. This requires a newer version of Quickshell.")

Services/NiriService.qml

@@ -23,6 +23,7 @@ Singleton {
 
     property var outputs: ({})
     property var windows: []
+    property var displayScales: ({})
 
     property bool inOverview: false
 
@@ -68,6 +69,7 @@ Singleton {
                     const outputsData = JSON.parse(text)
                     outputs = outputsData
                     console.log("NiriService: Loaded", Object.keys(outputsData).length, "outputs")
+                    updateDisplayScales()
                     if (windows.length > 0) {
                         windows = sortWindowsByLayout(windows)
                     }
@@ -169,6 +171,20 @@ Singleton {
         outputsProcess.running = true
     }
 
+    function updateDisplayScales() {
+        if (!outputs || Object.keys(outputs).length === 0) return
+
+        const scales = {}
+        for (const outputName in outputs) {
+            const output = outputs[outputName]
+            if (output.logical && output.logical.scale !== undefined) {
+                scales[outputName] = output.logical.scale
+            }
+        }
+
+        displayScales = scales
+    }
+
     function sortWindowsByLayout(windowList) {
         return [...windowList].sort((a, b) => {
             const aWorkspace = workspaces[a.workspace_id]
@@ -395,6 +411,7 @@ Singleton {
     function handleOutputsChanged(data) {
         if (!data.outputs) return
         outputs = data.outputs
+        updateDisplayScales()
         windows = sortWindowsByLayout(windows)
     }
 
@@ -410,6 +427,7 @@ Singleton {
             if (ToastService.toastVisible && ToastService.currentLevel === ToastService.levelError) {
                 ToastService.hideToast()
             }
+            fetchOutputs()
             if (hasInitialConnection && !suppressConfigToast && !suppressNextConfigToast && !matugenSuppression) {
                 ToastService.showInfo("niri: config reloaded")
             } else if (suppressNextConfigToast) {

Services/PluginService.qml

@@ -4,6 +4,7 @@ pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
+import Qt.labs.folderlistmodel
 import Quickshell
 import Quickshell.Io
 import qs.Common
@@ -24,197 +25,202 @@ Singleton {
         return configDirStr + "/DankMaterialShell/plugins"
     }
     property string systemPluginDirectory: "/etc/xdg/quickshell/dms-plugins"
-    property var pluginDirectories: [pluginDirectory, systemPluginDirectory]
+
+    property var knownManifests: ({})
+    property var pathToPluginId: ({})
+    property var pluginInstances: ({})
 
     signal pluginLoaded(string pluginId)
     signal pluginUnloaded(string pluginId)
     signal pluginLoadFailed(string pluginId, string error)
     signal pluginDataChanged(string pluginId)
+    signal pluginListUpdated()
+
+    Timer {
+        id: resyncDebounce
+        interval: 120
+        repeat: false
+        onTriggered: resyncAll()
+    }
 
     Component.onCompleted: {
-        Qt.callLater(initializePlugins)
+        userWatcher.folder = Paths.toFileUrl(root.pluginDirectory)
+        systemWatcher.folder = Paths.toFileUrl(root.systemPluginDirectory)
+        Qt.callLater(resyncAll)
     }
 
-    function initializePlugins() {
-        scanPlugins()
+    FolderListModel {
+        id: userWatcher
+        showDirs: true
+        showFiles: false
+        showDotAndDotDot: false
+        nameFilters: ["plugin.json"]
+
+        onCountChanged: resyncDebounce.restart()
+        onStatusChanged: if (status === FolderListModel.Ready) resyncDebounce.restart()
     }
 
-    property int currentScanIndex: 0
-    property var scanResults: []
-    property var foundPlugins: ({})
+    FolderListModel {
+        id: systemWatcher
+        showDirs: true
+        showFiles: false
+        showDotAndDotDot: false
+        nameFilters: ["plugin.json"]
 
-    property var lsProcess: Process {
-        id: dirScanner
+        onCountChanged: resyncDebounce.restart()
+        onStatusChanged: if (status === FolderListModel.Ready) resyncDebounce.restart()
+    }
 
-        stdout: StdioCollector {
-            onStreamFinished: {
-                var output = text.trim()
-                var currentDir = pluginDirectories[currentScanIndex]
-                if (output) {
-                    var directories = output.split('\n')
-                    for (var i = 0; i < directories.length; i++) {
-                        var dir = directories[i].trim()
-                        if (dir) {
-                            var manifestPath = currentDir + "/" + dir + "/plugin.json"
-                            loadPluginManifest(manifestPath)
-                        }
-                    }
-                }
+    function snapshotModel(model, sourceTag) {
+        const out = []
+        const n = model.count
+        const baseDir = sourceTag === "user" ? pluginDirectory : systemPluginDirectory
+        for (let i = 0; i < n; i++) {
+            let dirPath = model.get(i, "filePath")
+            if (dirPath.startsWith("file://")) {
+                dirPath = dirPath.substring(7)
+            }
+            if (!dirPath.startsWith(baseDir)) {
+                continue
+            }
+            const manifestPath = dirPath + "/plugin.json"
+            out.push({ path: manifestPath, source: sourceTag })
+        }
+        return out
+    }
+
+    function resyncAll() {
+        const userList = snapshotModel(userWatcher, "user")
+        const sysList  = snapshotModel(systemWatcher, "system")
+        const seenPaths = {}
+
+        function consider(entry) {
+            const key = entry.path
+            seenPaths[key] = true
+            const prev = knownManifests[key]
+            if (!prev) {
+                loadPluginManifestFile(entry.path, entry.source, Date.now())
             }
         }
+        for (let i=0;i<userList.length;i++) consider(userList[i])
+        for (let i=0;i<sysList.length;i++)  consider(sysList[i])
 
-        onExited: function(exitCode) {
-            currentScanIndex++
-            if (currentScanIndex < pluginDirectories.length) {
-                scanNextDirectory()
-            } else {
-                currentScanIndex = 0
-                cleanupRemovedPlugins()
-            }
+        const removed = []
+        for (const path in knownManifests) {
+            if (!seenPaths[path]) removed.push(path)
         }
-    }
-
-    function scanPlugins() {
-        currentScanIndex = 0
-        foundPlugins = {}
-        scanNextDirectory()
-    }
-
-    function scanNextDirectory() {
-        var dir = pluginDirectories[currentScanIndex]
-        lsProcess.command = ["find", "-L", dir, "-maxdepth", "1", "-type", "d", "-not", "-path", dir, "-exec", "basename", "{}", ";"]
-        lsProcess.running = true
-    }
-
-    property var manifestReaders: ({})
-
-    function loadPluginManifest(manifestPath) {
-        var readerId = "reader_" + Date.now() + "_" + Math.random()
-
-        var checkProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { stdout: StdioCollector { } }")
-        if (checkProcess.status === Component.Ready) {
-            var checker = checkProcess.createObject(root)
-            checker.command = ["test", "-f", manifestPath]
-            checker.exited.connect(function(exitCode) {
-                if (exitCode !== 0) {
-                    checker.destroy()
-                    delete manifestReaders[readerId]
-                    return
+        if (removed.length) {
+            removed.forEach(function(path) {
+                const pid = pathToPluginId[path]
+                if (pid) {
+                    unregisterPluginByPath(path, pid)
                 }
-
-                var catProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { stdout: StdioCollector { } }")
-                if (catProcess.status === Component.Ready) {
-                    var process = catProcess.createObject(root)
-                    process.command = ["cat", manifestPath]
-                    process.stdout.streamFinished.connect(function() {
-                        try {
-                            var manifest = JSON.parse(process.stdout.text.trim())
-                            processManifest(manifest, manifestPath)
-                        } catch (e) {
-                            console.error("PluginService: Failed to parse manifest", manifestPath, ":", e.message)
-                        }
-                        process.destroy()
-                        delete manifestReaders[readerId]
-                    })
-                    process.exited.connect(function(exitCode) {
-                        if (exitCode !== 0) {
-                            console.error("PluginService: Failed to read manifest file:", manifestPath, "exit code:", exitCode)
-                            process.destroy()
-                            delete manifestReaders[readerId]
-                        }
-                    })
-                    manifestReaders[readerId] = process
-                    process.running = true
-                } else {
-                    console.error("PluginService: Failed to create manifest reader process")
-                }
-
-                checker.destroy()
+                delete knownManifests[path]
+                delete pathToPluginId[path]
             })
-            manifestReaders[readerId] = checker
-            checker.running = true
-        } else {
-            console.error("PluginService: Failed to create file check process")
+            pluginListUpdated()
         }
     }
 
-    function processManifest(manifest, manifestPath) {
-        registerPlugin(manifest, manifestPath)
-
-        var enabled = SettingsData.getPluginSetting(manifest.id, "enabled", false)
-        if (enabled) {
-            loadPlugin(manifest.id)
-        }
+    function loadPluginManifestFile(manifestPathNoScheme, sourceTag, mtimeEpochMs) {
+        const manifestId = "m_" + Math.random().toString(36).slice(2)
+        const qml = `
+            import QtQuick
+            import Quickshell.Io
+            FileView {
+                id: fv
+                property string absPath: ""
+                onLoaded: {
+                    try {
+                        let raw = text()
+                        if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1)
+                        const manifest = JSON.parse(raw)
+                        root._onManifestParsed(absPath, manifest, "${sourceTag}", ${mtimeEpochMs})
+                    } catch (e) {
+                        console.error("PluginService: bad manifest", absPath, e.message)
+                        knownManifests[absPath] = { mtime: ${mtimeEpochMs}, source: "${sourceTag}", bad: true }
+                    }
+                    fv.destroy()
+                }
+                onLoadFailed: (err) => {
+                    console.warn("PluginService: manifest load failed", absPath, err)
+                    fv.destroy()
+                }
+            }
+        `
+        const loader = Qt.createQmlObject(qml, root, "mf_" + manifestId)
+        loader.absPath = manifestPathNoScheme
+        loader.path = manifestPathNoScheme
     }
 
-    function registerPlugin(manifest, manifestPath) {
-        if (!manifest.id || !manifest.name || !manifest.component) {
-            console.error("PluginService: Invalid manifest, missing required fields:", manifestPath)
+    function _onManifestParsed(absPath, manifest, sourceTag, mtimeEpochMs) {
+        if (!manifest || !manifest.id || !manifest.name || !manifest.component) {
+            console.error("PluginService: invalid manifest fields:", absPath)
+            knownManifests[absPath] = { mtime: mtimeEpochMs, source: sourceTag, bad: true }
             return
         }
 
-        var pluginDir = manifestPath.substring(0, manifestPath.lastIndexOf('/'))
+        const dir = absPath.substring(0, absPath.lastIndexOf('/'))
+        let comp = manifest.component
+        if (comp.startsWith("./")) comp = comp.slice(2)
+        let settings = manifest.settings
+        if (settings && settings.startsWith("./")) settings = settings.slice(2)
 
-        // Clean up relative paths by removing './' prefix
-        var componentFile = manifest.component
-        if (componentFile.startsWith('./')) {
-            componentFile = componentFile.substring(2)
+        const info = {}
+        for (const k in manifest) info[k] = manifest[k]
+
+        let perms = manifest.permissions
+        if (typeof perms === "string") {
+            perms = perms.split(/\s*,\s*/)
         }
-
-        var settingsFile = manifest.settings
-        if (settingsFile && settingsFile.startsWith('./')) {
-            settingsFile = settingsFile.substring(2)
+        if (!Array.isArray(perms)) {
+            perms = []
         }
+        info.permissions = perms.map(p => String(p).trim())
 
-        var pluginInfo = {}
-        for (var key in manifest) {
-            pluginInfo[key] = manifest[key]
+        info.manifestPath = absPath
+        info.pluginDirectory = dir
+        info.componentPath = dir + "/" + comp
+        info.settingsPath  = settings ? (dir + "/" + settings) : null
+        info.loaded = isPluginLoaded(manifest.id)
+        info.type = manifest.type || "widget"
+        info.source = sourceTag
+
+        const existing = availablePlugins[manifest.id]
+        const shouldReplace =
+            (!existing) ||
+            (existing && existing.source === "system" && sourceTag === "user")
+
+        if (shouldReplace) {
+            if (existing && existing.loaded && existing.source !== sourceTag) {
+                unloadPlugin(manifest.id)
+            }
+            const newMap = Object.assign({}, availablePlugins)
+            newMap[manifest.id] = info
+            availablePlugins = newMap
+            pathToPluginId[absPath] = manifest.id
+            knownManifests[absPath] = { mtime: mtimeEpochMs, source: sourceTag }
+            pluginListUpdated()
+            const enabled = SettingsData.getPluginSetting(manifest.id, "enabled", false)
+            if (enabled && !info.loaded) loadPlugin(manifest.id)
+        } else {
+            knownManifests[absPath] = { mtime: mtimeEpochMs, source: sourceTag, shadowedBy: existing.source }
+            pathToPluginId[absPath] = manifest.id
         }
-        pluginInfo.manifestPath = manifestPath
-        pluginInfo.pluginDirectory = pluginDir
-        pluginInfo.componentPath = pluginDir + '/' + componentFile
-        pluginInfo.settingsPath = settingsFile ? pluginDir + '/' + settingsFile : null
-        pluginInfo.loaded = false
-        pluginInfo.type = manifest.type || "widget"
-
-        var newPlugins = Object.assign({}, availablePlugins)
-        newPlugins[manifest.id] = pluginInfo
-        availablePlugins = newPlugins
-        foundPlugins[manifest.id] = true
     }
 
-    function hasPermission(pluginId, permission) {
-        var plugin = availablePlugins[pluginId]
-        if (!plugin) {
-            return false
-        }
-        var permissions = plugin.permissions || []
-        return permissions.indexOf(permission) !== -1
-    }
-
-    function cleanupRemovedPlugins() {
-        var pluginsToRemove = []
-        for (var pluginId in availablePlugins) {
-            if (!foundPlugins[pluginId]) {
-                pluginsToRemove.push(pluginId)
-            }
-        }
-
-        if (pluginsToRemove.length > 0) {
-            var newPlugins = Object.assign({}, availablePlugins)
-            for (var i = 0; i < pluginsToRemove.length; i++) {
-                var pluginId = pluginsToRemove[i]
-                if (isPluginLoaded(pluginId)) {
-                    unloadPlugin(pluginId)
-                }
-                delete newPlugins[pluginId]
-            }
-            availablePlugins = newPlugins
+    function unregisterPluginByPath(absPath, pluginId) {
+        const current = availablePlugins[pluginId]
+        if (current && current.manifestPath === absPath) {
+            if (current.loaded) unloadPlugin(pluginId)
+            const newMap = Object.assign({}, availablePlugins)
+            delete newMap[pluginId]
+            availablePlugins = newMap
         }
     }
 
     function loadPlugin(pluginId) {
-        var plugin = availablePlugins[pluginId]
+        const plugin = availablePlugins[pluginId]
         if (!plugin) {
             console.error("PluginService: Plugin not found:", pluginId)
             pluginLoadFailed(pluginId, "Plugin not found")
@@ -225,48 +231,43 @@ Singleton {
             return true
         }
 
-        var isDaemon = plugin.type === "daemon"
-        var componentMap = isDaemon ? pluginDaemonComponents : pluginWidgetComponents
+        const isDaemon = plugin.type === "daemon"
+        const map = isDaemon ? pluginDaemonComponents : pluginWidgetComponents
 
-        if (componentMap[pluginId]) {
-            componentMap[pluginId]?.destroy()
-            if (isDaemon) {
-                var newDaemons = Object.assign({}, pluginDaemonComponents)
-                delete newDaemons[pluginId]
-                pluginDaemonComponents = newDaemons
-            } else {
-                var newComponents = Object.assign({}, pluginWidgetComponents)
-                delete newComponents[pluginId]
-                pluginWidgetComponents = newComponents
-            }
+        const prevInstance = pluginInstances[pluginId]
+        if (prevInstance) {
+            prevInstance.destroy()
+            const newInstances = Object.assign({}, pluginInstances)
+            delete newInstances[pluginId]
+            pluginInstances = newInstances
         }
 
         try {
-            var componentUrl = "file://" + plugin.componentPath
-            var component = Qt.createComponent(componentUrl, Component.PreferSynchronous)
-
-            if (component.status === Component.Loading) {
-                component.statusChanged.connect(function() {
-                    if (component.status === Component.Error) {
-                        console.error("PluginService: Failed to create component for plugin:", pluginId, "Error:", component.errorString())
-                        pluginLoadFailed(pluginId, component.errorString())
-                    }
-                })
-            }
-
-            if (component.status === Component.Error) {
-                console.error("PluginService: Failed to create component for plugin:", pluginId, "Error:", component.errorString())
-                pluginLoadFailed(pluginId, component.errorString())
+            const url = "file://" + plugin.componentPath
+            const comp = Qt.createComponent(url, Component.PreferSynchronous)
+            if (comp.status === Component.Error) {
+                console.error("PluginService: component error", pluginId, comp.errorString())
+                pluginLoadFailed(pluginId, comp.errorString())
                 return false
             }
 
             if (isDaemon) {
-                var newDaemons = Object.assign({}, pluginDaemonComponents)
-                newDaemons[pluginId] = component
+                const instance = comp.createObject(root, { "pluginId": pluginId })
+                if (!instance) {
+                    console.error("PluginService: failed to instantiate daemon:", pluginId, comp.errorString())
+                    pluginLoadFailed(pluginId, comp.errorString())
+                    return false
+                }
+                const newInstances = Object.assign({}, pluginInstances)
+                newInstances[pluginId] = instance
+                pluginInstances = newInstances
+
+                const newDaemons = Object.assign({}, pluginDaemonComponents)
+                newDaemons[pluginId] = comp
                 pluginDaemonComponents = newDaemons
             } else {
-                var newComponents = Object.assign({}, pluginWidgetComponents)
-                newComponents[pluginId] = component
+                const newComponents = Object.assign({}, pluginWidgetComponents)
+                newComponents[pluginId] = comp
                 pluginWidgetComponents = newComponents
             }
 
@@ -276,31 +277,37 @@ Singleton {
             pluginLoaded(pluginId)
             return true
 
-        } catch (error) {
-            console.error("PluginService: Error loading plugin:", pluginId, "Error:", error.message)
-            pluginLoadFailed(pluginId, error.message)
+        } catch (e) {
+            console.error("PluginService: Error loading plugin:", pluginId, e.message)
+            pluginLoadFailed(pluginId, e.message)
             return false
         }
     }
 
     function unloadPlugin(pluginId) {
-        var plugin = loadedPlugins[pluginId]
+        const plugin = loadedPlugins[pluginId]
         if (!plugin) {
             console.warn("PluginService: Plugin not loaded:", pluginId)
             return false
         }
 
         try {
-            var isDaemon = plugin.type === "daemon"
+            const isDaemon = plugin.type === "daemon"
+
+            const instance = pluginInstances[pluginId]
+            if (instance) {
+                instance.destroy()
+                const newInstances = Object.assign({}, pluginInstances)
+                delete newInstances[pluginId]
+                pluginInstances = newInstances
+            }
 
             if (isDaemon && pluginDaemonComponents[pluginId]) {
-                pluginDaemonComponents[pluginId]?.destroy()
-                var newDaemons = Object.assign({}, pluginDaemonComponents)
+                const newDaemons = Object.assign({}, pluginDaemonComponents)
                 delete newDaemons[pluginId]
                 pluginDaemonComponents = newDaemons
             } else if (pluginWidgetComponents[pluginId]) {
-                pluginWidgetComponents[pluginId]?.destroy()
-                var newComponents = Object.assign({}, pluginWidgetComponents)
+                const newComponents = Object.assign({}, pluginWidgetComponents)
                 delete newComponents[pluginId]
                 pluginWidgetComponents = newComponents
             }
@@ -326,30 +333,30 @@ Singleton {
     }
 
     function getAvailablePlugins() {
-        var result = []
-        for (var key in availablePlugins) {
+        const result = []
+        for (const key in availablePlugins) {
             result.push(availablePlugins[key])
         }
         return result
     }
 
     function getPluginVariants(pluginId) {
-        var plugin = availablePlugins[pluginId]
+        const plugin = availablePlugins[pluginId]
         if (!plugin) {
             return []
         }
-        var variants = SettingsData.getPluginSetting(pluginId, "variants", [])
+        const variants = SettingsData.getPluginSetting(pluginId, "variants", [])
         return variants
     }
 
     function getAllPluginVariants() {
-        var result = []
-        for (var pluginId in availablePlugins) {
-            var plugin = availablePlugins[pluginId]
+        const result = []
+        for (const pluginId in availablePlugins) {
+            const plugin = availablePlugins[pluginId]
             if (plugin.type !== "widget") {
                 continue
             }
-            var variants = getPluginVariants(pluginId)
+            const variants = getPluginVariants(pluginId)
             if (variants.length === 0) {
                 result.push({
                     pluginId: pluginId,
@@ -361,8 +368,8 @@ Singleton {
                     loaded: plugin.loaded
                 })
             } else {
-                for (var i = 0; i < variants.length; i++) {
-                    var variant = variants[i]
+                for (let i = 0; i < variants.length; i++) {
+                    const variant = variants[i]
                     result.push({
                         pluginId: pluginId,
                         variantId: variant.id,
@@ -379,9 +386,9 @@ Singleton {
     }
 
     function createPluginVariant(pluginId, variantName, variantConfig) {
-        var variants = getPluginVariants(pluginId)
-        var variantId = "variant_" + Date.now()
-        var newVariant = Object.assign({}, variantConfig, {
+        const variants = getPluginVariants(pluginId)
+        const variantId = "variant_" + Date.now()
+        const newVariant = Object.assign({}, variantConfig, {
             id: variantId,
             name: variantName
         })
@@ -392,15 +399,44 @@ Singleton {
     }
 
     function removePluginVariant(pluginId, variantId) {
-        var variants = getPluginVariants(pluginId)
-        var newVariants = variants.filter(function(v) { return v.id !== variantId })
+        const variants = getPluginVariants(pluginId)
+        const newVariants = variants.filter(function(v) { return v.id !== variantId })
         SettingsData.setPluginSetting(pluginId, "variants", newVariants)
+
+        const fullId = pluginId + ":" + variantId
+        removeWidgetFromDankBar(fullId)
+
         pluginDataChanged(pluginId)
     }
 
+    function removeWidgetFromDankBar(widgetId) {
+        function filterWidget(widget) {
+            const id = typeof widget === "string" ? widget : widget.id
+            return id !== widgetId
+        }
+
+        const leftWidgets = SettingsData.dankBarLeftWidgets
+        const centerWidgets = SettingsData.dankBarCenterWidgets
+        const rightWidgets = SettingsData.dankBarRightWidgets
+
+        const newLeft = leftWidgets.filter(filterWidget)
+        const newCenter = centerWidgets.filter(filterWidget)
+        const newRight = rightWidgets.filter(filterWidget)
+
+        if (newLeft.length !== leftWidgets.length) {
+            SettingsData.setDankBarLeftWidgets(newLeft)
+        }
+        if (newCenter.length !== centerWidgets.length) {
+            SettingsData.setDankBarCenterWidgets(newCenter)
+        }
+        if (newRight.length !== rightWidgets.length) {
+            SettingsData.setDankBarRightWidgets(newRight)
+        }
+    }
+
     function updatePluginVariant(pluginId, variantId, variantConfig) {
-        var variants = getPluginVariants(pluginId)
-        for (var i = 0; i < variants.length; i++) {
+        const variants = getPluginVariants(pluginId)
+        for (let i = 0; i < variants.length; i++) {
             if (variants[i].id === variantId) {
                 variants[i] = Object.assign({}, variants[i], variantConfig)
                 break
@@ -411,8 +447,8 @@ Singleton {
     }
 
     function getPluginVariantData(pluginId, variantId) {
-        var variants = getPluginVariants(pluginId)
-        for (var i = 0; i < variants.length; i++) {
+        const variants = getPluginVariants(pluginId)
+        for (let i = 0; i < variants.length; i++) {
             if (variants[i].id === variantId) {
                 return variants[i]
             }
@@ -421,8 +457,8 @@ Singleton {
     }
 
     function getLoadedPlugins() {
-        var result = []
-        for (var key in loadedPlugins) {
+        const result = []
+        for (const key in loadedPlugins) {
             result.push(loadedPlugins[key])
         }
         return result
@@ -463,10 +499,14 @@ Singleton {
         SettingsData.savePluginSettings()
     }
 
+    function scanPlugins() {
+        resyncDebounce.restart()
+    }
+
     function createPluginDirectory() {
-        var mkdirProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { }")
+        const mkdirProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { }")
         if (mkdirProcess.status === Component.Ready) {
-            var process = mkdirProcess.createObject(root)
+            const process = mkdirProcess.createObject(root)
             process.command = ["mkdir", "-p", pluginDirectory]
             process.exited.connect(function(exitCode) {
                 if (exitCode !== 0) {

Services/SessionService.qml

@@ -61,6 +61,10 @@ Singleton {
             detectHibernateProcess.running = true
             detectPrimeRunProcess.running = true
             console.log("SessionService: Native inhibitor available:", nativeInhibitorAvailable)
+            if (!SessionData.loginctlLockIntegration) {
+                console.log("SessionService: loginctl lock integration disabled by user")
+                return
+            }
             if (socketPath && socketPath.length > 0) {
                 checkDMSCapabilities()
             } else {
@@ -291,10 +295,29 @@ Singleton {
         }
     }
 
+    Connections {
+        target: SessionData
+
+        function onLoginctlLockIntegrationChanged() {
+            if (SessionData.loginctlLockIntegration) {
+                if (socketPath && socketPath.length > 0) {
+                    checkDMSCapabilities()
+                } else {
+                    initFallbackLoginctl()
+                }
+            } else {
+                subscriptionSocket.connected = false
+                lockStateMonitorFallback.running = false
+                loginctlAvailable = false
+                stateInitialized = false
+            }
+        }
+    }
+
     DankSocket {
         id: subscriptionSocket
         path: root.socketPath
-        connected: loginctlAvailable
+        connected: loginctlAvailable && SessionData.loginctlLockIntegration
 
         onConnectionStateChanged: {
             root.subscriptionConnected = connected
@@ -342,6 +365,10 @@ Singleton {
             return
         }
 
+        if (!SessionData.loginctlLockIntegration) {
+            return
+        }
+
         if (DMSService.capabilities.includes("loginctl")) {
             loginctlAvailable = true
             if (!stateInitialized) {
@@ -366,6 +393,8 @@ Singleton {
     }
 
     function updateLoginctlState(state) {
+        const wasLocked = locked
+
         sessionId = state.sessionId || ""
         sessionPath = state.sessionPath || ""
         locked = state.locked || false
@@ -384,6 +413,12 @@ Singleton {
             prepareForSleep()
         }
 
+        if (locked && !wasLocked) {
+            sessionLocked()
+        } else if (!locked && wasLocked) {
+            sessionUnlocked()
+        }
+
         loginctlStateChanged()
     }
 
@@ -483,10 +518,4 @@ Singleton {
         }
     }
 
-    Process {
-        id: lockSessionFallback
-        command: ["loginctl", "lock-session"]
-        running: false
-    }
-
 }

Widgets/DankPopout.qml

@@ -1,7 +1,9 @@
 import QtQuick
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Wayland
 import qs.Common
+import qs.Services
 
 PanelWindow {
     id: root
@@ -69,9 +71,21 @@ PanelWindow {
 
     readonly property real screenWidth: root.screen.width
     readonly property real screenHeight: root.screen.height
-    readonly property real dpr: root.screen.devicePixelRatio
+    readonly property real dpr: {
+        if (CompositorService.isNiri && root.screen) {
+            const niriScale = NiriService.displayScales[root.screen.name]
+            if (niriScale !== undefined) return niriScale
+        }
+        if (CompositorService.isHyprland && root.screen) {
+            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === root.screen.name)
+            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
+        }
+        return root.screen?.devicePixelRatio || 1
+    }
 
-    readonly property real calculatedX: {
+    readonly property real alignedWidth: Theme.px(popupWidth, dpr)
+    readonly property real alignedHeight: Theme.px(popupHeight, dpr)
+    readonly property real alignedX: Theme.snap((() => {
         if (SettingsData.dankBarPosition === SettingsData.Position.Left) {
             return triggerY
         } else if (SettingsData.dankBarPosition === SettingsData.Position.Right) {
@@ -80,8 +94,8 @@ PanelWindow {
             const centerX = triggerX + (triggerWidth / 2) - (popupWidth / 2)
             return Math.max(Theme.popupDistance, Math.min(screenWidth - popupWidth - Theme.popupDistance, centerX))
         }
-    }
-    readonly property real calculatedY: {
+    })(), dpr)
+    readonly property real alignedY: Theme.snap((() => {
         if (SettingsData.dankBarPosition === SettingsData.Position.Left || SettingsData.dankBarPosition === SettingsData.Position.Right) {
             const centerY = triggerX + (triggerWidth / 2) - (popupHeight / 2)
             return Math.max(Theme.popupDistance, Math.min(screenHeight - popupHeight - Theme.popupDistance, centerY))
@@ -90,12 +104,7 @@ PanelWindow {
         } else {
             return Math.max(Theme.popupDistance, Math.min(screenHeight - popupHeight - Theme.popupDistance, triggerY + Theme.popupDistance))
         }
-    }
-
-    readonly property real alignedWidth: Theme.snap(popupWidth, dpr)
-    readonly property real alignedHeight: Theme.snap(popupHeight, dpr)
-    readonly property real alignedX: Theme.snap(calculatedX, dpr)
-    readonly property real alignedY: Theme.snap(calculatedY, dpr)
+    })(), dpr)
 
     MouseArea {
         anchors.fill: parent
@@ -117,6 +126,7 @@ PanelWindow {
         height: alignedHeight
         active: root.visible
         asynchronous: false
+        layer.enabled: Quickshell.env("DMS_DISABLE_LAYER") !== "true"
         opacity: shouldBeVisible ? 1 : 0
 
         Behavior on opacity {

Widgets/DankTextField.qml

@@ -42,6 +42,7 @@ StyledRect {
     property real topPadding: Theme.spacingM
     property real bottomPadding: Theme.spacingM
     property bool ignoreLeftRightKeys: false
+    property bool ignoreTabKeys: false
     property var keyForwardTargets: []
     property Item keyNavigationTab: null
     property Item keyNavigationBacktab: null
@@ -109,7 +110,7 @@ StyledRect {
         onEditingFinished: root.editingFinished()
         onAccepted: root.accepted()
         onActiveFocusChanged: root.focusStateChanged(activeFocus)
-        Keys.forwardTo: root.ignoreLeftRightKeys ? root.keyForwardTargets : []
+        Keys.forwardTo: root.keyForwardTargets
         Keys.onLeftPressed: event => {
                                 if (root.ignoreLeftRightKeys) {
                                     event.accepted = true
@@ -122,10 +123,19 @@ StyledRect {
                                  if (root.ignoreLeftRightKeys) {
                                      event.accepted = true
                                  } else {
-                                     // Allow normal TextInput cursor movement
                                      event.accepted = false
                                  }
                              }
+        Keys.onPressed: event => {
+                            if (root.ignoreTabKeys && (event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab)) {
+                                event.accepted = false
+                                for (var i = 0; i < root.keyForwardTargets.length; i++) {
+                                    if (root.keyForwardTargets[i]) {
+                                        root.keyForwardTargets[i].Keys.pressed(event)
+                                    }
+                                }
+                            }
+                        }
 
         MouseArea {
             anchors.fill: parent

dms.spec

@@ -0,0 +1,104 @@
+# Spec for DMS - uses rpkg macros for both stable and git builds
+
+%global debug_package %{nil}
+%global version {{{ git_dir_version }}}
+%global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+
+Name:           dms
+Version:        %{version}
+Release:        1%{?dist}
+Summary:        %{pkg_summary}
+
+License:        GPL-3.0-only
+URL:            https://github.com/AvengeMedia/DankMaterialShell
+VCS:            {{{ git_dir_vcs }}}
+Source0:        {{{ git_dir_pack }}}
+
+# DMS CLI tool sources - compiled from danklinux
+Source1:        https://github.com/AvengeMedia/danklinux/archive/refs/heads/master.tar.gz#/danklinux-master.tar.gz
+
+BuildRequires:  git-core
+BuildRequires:  golang >= 1.21
+BuildRequires:  rpkg
+
+# Core requirements - Shell and fonts
+# Requires:     (quickshell or quickshell-git)
+Requires:       dms-cli = %{version}-%{release}
+Requires:       dgop
+Requires:       fira-code-fonts
+Requires:       material-symbols-fonts
+Requires:       rsms-inter-fonts
+Requires:       quickshell-git
+
+# Core utilities (Highly recommended for DMS functionality)
+Recommends:     brightnessctl
+Recommends:     cava
+Recommends:     cliphist
+Recommends:     hyprpicker
+Recommends:     matugen
+Recommends:     wl-clipboard
+
+# Recommended system packages
+Recommends:     gammastep
+Recommends:     NetworkManager
+Recommends:     qt6ct
+
+%description
+DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+and optimized for the niri and hyprland compositors. Features notifications,
+app launcher, wallpaper customization, and fully customizable with plugins.
+
+Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+process monitoring, notification center, clipboard history, dock, control center,
+lock screen, and comprehensive plugin system.
+
+%package -n dms-cli
+Summary:        DankMaterialShell CLI tool
+License:        GPL-3.0-only
+URL:            https://github.com/AvengeMedia/danklinux
+
+%description -n dms-cli
+Command-line interface for DankMaterialShell configuration and management.
+Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+%prep
+{{{ git_dir_setup_macro }}}
+
+# Extract danklinux for building dms CLI
+tar -xzf %{SOURCE1} -C %{_builddir}
+
+%build
+# Compile dms CLI from danklinux source
+pushd %{_builddir}/danklinux-master
+export CGO_CPPFLAGS="${CPPFLAGS}"
+export CGO_CFLAGS="${CFLAGS}"
+export CGO_CXXFLAGS="${CXXFLAGS}"
+export CGO_LDFLAGS="${LDFLAGS}"
+export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
+go build -o dms ./cmd/dms
+popd
+
+%install
+# Install dms-cli binary
+install -Dm755 %{_builddir}/danklinux-master/dms %{buildroot}%{_bindir}/dms-cli
+
+# Install shell files to XDG config location
+install -dm755 %{buildroot}%{_sysconfdir}/xdg/quickshell/dms
+cp -r ./* %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/
+
+# Remove git-related files
+rm -rf %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/.git*
+rm -f %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/.gitignore
+rm -rf %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/.github
+
+%files
+%license LICENSE
+%doc README.md CONTRIBUTING.md
+%{_sysconfdir}/xdg/quickshell/dms/
+
+%files -n dms-cli
+%{_bindir}/dms-cli
+
+%changelog
+{{{ git_dir_changelog }}}

flake.lock

@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759946376,
-        "narHash": "sha256-/kQpJPH1y+U6V7N3bbGzvNRGfk9VuxdZev9Os4bS5ZQ=",
+        "lastModified": 1759982027,
+        "narHash": "sha256-4deRT98VwfZWZ685wIGevyYl3CzpuZJPjdjfulABH00=",
         "owner": "AvengeMedia",
         "repo": "danklinux",
-        "rev": "98db89ffba290265bc4a886d13b8a27a53fdaca1",
+        "rev": "5cdfeeae2e14089079dcb0d6b61f014ce754021f",
         "type": "github"
       },
       "original": {

nix/default.nix

@@ -6,6 +6,7 @@
     ...
 }: let
     cfg = config.programs.dankMaterialShell;
+    jsonFormat = pkgs.formats.json { };
 in {
     options.programs.dankMaterialShell = with lib.types; {
         enable = lib.mkEnableOption "DankMaterialShell";
@@ -54,6 +55,37 @@ in {
         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
@@ -65,14 +97,39 @@ in {
             configs.dms = "${
                 dmsPkgs.dankMaterialShell
             }/etc/xdg/quickshell/DankMaterialShell";
-            activeConfig = lib.mkIf cfg.enableSystemd "dms";
-
-            systemd = lib.mkIf cfg.enableSystemd {
-                enable = true;
-                target = "graphical-session.target";
-            };
         };
 
+        systemd.user.services.dms = lib.mkIf cfg.enableSystemd {
+            Unit = {
+                Description = "DankMaterialShell";
+                PartOf = [ config.wayland.systemd.target ];
+                After = [ config.wayland.systemd.target ];
+            };
+
+            Service = {
+                ExecStart = lib.getExe dmsPkgs.dmsCli + " run";
+                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

translations/poexports/ja.json

@@ -30,16 +30,16 @@
         "A file with this name already exists. Do you want to overwrite it?": "この名前のファイルは既に存在します。上書きしてもよろしいですか?"
     },
     "About": {
-        "About": ""
+        "About": "詳細"
     },
     "Access clipboard history": {
-        "Access clipboard history": ""
+        "Access clipboard history": "クリップボードの履歴へのアクセス"
     },
     "Access to notifications and do not disturb": {
-        "Access to notifications and do not disturb": ""
+        "Access to notifications and do not disturb": "通知へのアクセスおよびサイレントモード"
     },
     "Access to system controls and settings": {
-        "Access to system controls and settings": ""
+        "Access to system controls and settings": "システム制御へのアクセスおよび設定"
     },
     "Actions": {
         "Actions": "アクション"
@@ -63,7 +63,7 @@
         "All displays": "すべてのディスプレイ"
     },
     "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": {
-        "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": ""
+        "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close": "Alt+←/Backspace: 戻る • F1/I: ファイル情報 • F10: ヘルプ • Esc: 閉じる"
     },
     "Always Show OSD Percentage": {
         "Always Show OSD Percentage": "常に OSD パーセンテージを表示"
@@ -75,10 +75,10 @@
         "Animations": "アニメーション"
     },
     "App Launcher": {
-        "App Launcher": ""
+        "App Launcher": "アプリランチャー"
     },
     "Applications": {
-        "Applications": ""
+        "Applications": "アプリ"
     },
     "Apply": {
         "Apply": "適用"
@@ -93,7 +93,7 @@
         "Apps Icon": "アプリアイコン"
     },
     "Apps are ordered by usage frequency, then last used, then alphabetically.": {
-        "Apps are ordered by usage frequency, then last used, then alphabetically.": ""
+        "Apps are ordered by usage frequency, then last used, then alphabetically.": "アプリは使用頻度、最終使用日、アルファベット順の優先順位で並べられています。"
     },
     "Are you sure you want to hibernate the system?": {
         "Are you sure you want to hibernate the system?": "システムを休止状態にしますか?"
@@ -171,13 +171,13 @@
         "Available Screens (": "利用可能なスクリーン（"
     },
     "Back": {
-        "Back": ""
+        "Back": "戻る"
     },
     "Battery": {
-        "Battery": ""
+        "Battery": "バッテリー"
     },
     "Battery level and power management": {
-        "Battery level and power management": ""
+        "Battery level and power management": "バッテリーレベルおよび電源管理"
     },
     "Battery not detected - only AC power settings available": {
         "Battery not detected - only AC power settings available": "バッテリーが検出されません - AC電源設定のみ利用可能です"
@@ -192,7 +192,7 @@
         "Border": "ボーダー"
     },
     "Brightness": {
-        "Brightness": ""
+        "Brightness": "明るさ"
     },
     "Browse": {
         "Browse": "ブラウズ"
@@ -204,16 +204,16 @@
         "CPU": "CPU"
     },
     "CPU Temperature": {
-        "CPU Temperature": ""
+        "CPU Temperature": "CPU温度"
     },
     "CPU Usage": {
-        "CPU Usage": ""
+        "CPU Usage": "CPU使用率"
     },
     "CPU temperature display": {
-        "CPU temperature display": ""
+        "CPU temperature display": "CPU温度表示"
     },
     "CPU usage indicator": {
-        "CPU usage indicator": ""
+        "CPU usage indicator": "CPU使用率インジケーター"
     },
     "Cancel": {
         "Cancel": "キャンセル"
@@ -225,37 +225,37 @@
         "Center Section": "センターセクション"
     },
     "Check for system updates": {
-        "Check for system updates": ""
+        "Check for system updates": "システムアップデートを検査"
     },
     "Choose Launcher Logo Color": {
-        "Choose Launcher Logo Color": ""
+        "Choose Launcher Logo Color": "ランチャーロゴの色を選ぶ"
     },
     "Choose icon": {
-        "Choose icon": "アイコンを選択"
+        "Choose icon": "アイコンを選ぶ"
     },
     "Choose the logo displayed on the launcher button in DankBar": {
-        "Choose the logo displayed on the launcher button in DankBar": "Dank Barのランチャーボタンに表示されるロゴを選択"
+        "Choose the logo displayed on the launcher button in DankBar": "Dank Barのランチャーボタンに表示されるロゴを選ぶ"
     },
     "Choose where notification popups appear on screen": {
-        "Choose where notification popups appear on screen": ""
+        "Choose where notification popups appear on screen": "通知ポップアップが画面に表示される場所を選ぶ"
     },
     "Clear": {
         "Clear": "クリア"
     },
     "Clear All": {
-        "Clear All": ""
+        "Clear All": "すべてクリア"
     },
     "Clear All History?": {
-        "Clear All History?": ""
+        "Clear All History?": "すべての履歴をクリアしますか？"
     },
     "Clipboard History": {
-        "Clipboard History": ""
+        "Clipboard History": "クリップボード履歴"
     },
     "Clipboard Manager": {
-        "Clipboard Manager": ""
+        "Clipboard Manager": "クリップボード管理"
     },
     "Clock": {
-        "Clock": ""
+        "Clock": "時計"
     },
     "Close": {
         "Close": "閉じる"
@@ -264,10 +264,10 @@
         "Color Override": "色のオーバーライド"
     },
     "Color Picker": {
-        "Color Picker": ""
+        "Color Picker": "カラーピッカー"
     },
     "Color temperature for night mode": {
-        "Color temperature for night mode": ""
+        "Color temperature for night mode": "ナイトモードの色温度"
     },
     "Communication": {
         "Communication": "コミュニケーション"
@@ -294,19 +294,19 @@
         "Connected Displays": "接続されたディスプレイ"
     },
     "Contrast": {
-        "Contrast": ""
+        "Contrast": "コントラスト"
     },
     "Control Center": {
-        "Control Center": ""
+        "Control Center": "コントロールセンター"
     },
     "Control currently playing media": {
-        "Control currently playing media": ""
+        "Control currently playing media": "現在再生中のメディアを制御"
     },
     "Control the speed of animations throughout the interface": {
-        "Control the speed of animations throughout the interface": "インターフェース全体のアニメーションの速度を制御する"
+        "Control the speed of animations throughout the interface": "インターフェース全体のアニメーションの速度を制御"
     },
     "Copied to clipboard": {
-        "Copied to clipboard": ""
+        "Copied to clipboard": "クリップボードにコピーしました"
     },
     "Copied!": {
         "Copied!": "コピーしました！"
@@ -321,7 +321,7 @@
         "Copy Process Name": "プロセス名をコピー"
     },
     "Corner Radius (0 = square corners)": {
-        "Corner Radius (0 = square corners)": ""
+        "Corner Radius (0 = square corners)": "コーナー半径（0 = 角丸なし）"
     },
     "Create Dir": {
         "Create Dir": "ディレクトリを作成"
@@ -333,10 +333,10 @@
         "Current Items": "現在のアイテム"
     },
     "Current time and date display": {
-        "Current time and date display": ""
+        "Current time and date display": "現在の日時を表示"
     },
     "Current weather conditions and temperature": {
-        "Current weather conditions and temperature": ""
+        "Current weather conditions and temperature": "現在の天気状況と気温"
     },
     "Custom": {
         "Custom": "カスタム"
@@ -351,7 +351,7 @@
         "Custom: ": "カスタム： "
     },
     "Customizable empty space": {
-        "Customizable empty space": ""
+        "Customizable empty space": "カスタマイズ可能な空きスペース"
     },
     "DEMO MODE - Click anywhere to exit": {
         "DEMO MODE - Click anywhere to exit": "デモモード -任意の場所をクリックして 終了"
@@ -360,13 +360,13 @@
         "DMS Plugin Manager Unavailable": "DMS プラグイン マネージャーが利用できません"
     },
     "DMS_SOCKET not available": {
-        "DMS_SOCKET not available": ""
+        "DMS_SOCKET not available": "DMS_SOCKETが利用できません"
     },
     "Daily at:": {
         "Daily at:": "毎日："
     },
     "Dank Bar": {
-        "Dank Bar": ""
+        "Dank Bar": "Dank Bar"
     },
     "Dank Bar Transparency": {
         "Dank Bar Transparency": "Dank Barの透明性"
@@ -384,7 +384,7 @@
         "Date Format": "日付形式"
     },
     "Default": {
-        "Default": ""
+        "Default": "デフォルト"
     },
     "Defaults": {
         "Defaults": "デフォルト"
@@ -405,7 +405,7 @@
         "Disk": "ディスク"
     },
     "Disk Usage": {
-        "Disk Usage": ""
+        "Disk Usage": "ディスク使用率"
     },
     "Display Settings": {
         "Display Settings": "表示設定"
@@ -417,22 +417,22 @@
         "Display all priorities over fullscreen apps": "フルスクリーンアプリよりもすべての優先度を表示する"
     },
     "Display currently focused application title": {
-        "Display currently focused application title": ""
+        "Display currently focused application title": "現在フォーカスされているアプリケーションのタイトルを表示"
     },
     "Display volume and brightness percentage values by default in OSD popups": {
-        "Display volume and brightness percentage values by default in OSD popups": ""
+        "Display volume and brightness percentage values by default in OSD popups": "OSDポップアップに音量と輝度のパーセンテージ値をデフォルトで表示"
     },
     "Displays": {
-        "Displays": ""
+        "Displays": "表示"
     },
     "Displays the active keyboard layout and allows switching": {
-        "Displays the active keyboard layout and allows switching": ""
+        "Displays the active keyboard layout and allows switching": "アクティブなキーボードレイアウトを表示、切り替えを可能に"
     },
     "Do Not Disturb": {
         "Do Not Disturb": "サイレントモード"
     },
     "Dock": {
-        "Dock": ""
+        "Dock": "ドック"
     },
     "Dock Position": {
         "Dock Position": "ドック位置"
@@ -441,13 +441,13 @@
         "Dock Transparency": "ドックの透明度"
     },
     "Drag widgets to reorder within sections. Use the eye icon to hide/show widgets (maintains spacing), or X to remove them completely.": {
-        "Drag widgets to reorder within sections. Use the eye icon to hide/show widgets (maintains spacing), or X to remove them completely.": ""
+        "Drag widgets to reorder within sections. Use the eye icon to hide/show widgets (maintains spacing), or X to remove them completely.": "ウィジェットをドラッグしてセクション内で順序を変更できます。目のアイコンでウィジェットを表示/非表示に（スペースは維持）、Xで完全に削除できます。"
     },
     "Dynamic Theming": {
         "Dynamic Theming": "ダイナミックテーマ"
     },
     "Edge Spacing (0 = edge-to-edge)": {
-        "Edge Spacing (0 = edge-to-edge)": ""
+        "Edge Spacing (0 = edge-to-edge)": "エッジ間隔（0 = エッジ・トゥ・エッジ）"
     },
     "Education": {
         "Education": "教育"
@@ -480,7 +480,7 @@
         "Exclusive Zone Offset": "排他ゾーンオフセット"
     },
     "F1/I: Toggle • F10: Help": {
-        "F1/I: Toggle • F10: Help": ""
+        "F1/I: Toggle • F10: Help": "F1/I: 切り替え • F10: ヘルプ"
     },
     "Feels Like": {
         "Feels Like": "どうやら"
@@ -498,7 +498,7 @@
         "Find in note...": "メモで検索..."
     },
     "Focused Window": {
-        "Focused Window": ""
+        "Focused Window": "フォーカスされたウィンドウ"
     },
     "Font Family": {
         "Font Family": "フォントファミリー"
@@ -534,13 +534,13 @@
         "Fun": "娯楽"
     },
     "GPU": {
-        "GPU": "グラフィックプロセッサ"
+        "GPU": "GPU"
     },
     "GPU Temperature": {
-        "GPU Temperature": ""
+        "GPU Temperature": "GPU温度"
     },
     "GPU temperature display": {
-        "GPU temperature display": ""
+        "GPU temperature display": "GPU温度表示"
     },
     "Games": {
         "Games": "ゲーム"
@@ -585,7 +585,7 @@
         "Hour": "時間"
     },
     "How often to change wallpaper": {
-        "How often to change wallpaper": ""
+        "How often to change wallpaper": "壁紙を切り替える間隔"
     },
     "Humidity": {
         "Humidity": "湿度"
@@ -597,7 +597,7 @@
         "Icon Theme": "アイコンテーマ"
     },
     "Idle Inhibitor": {
-        "Idle Inhibitor": ""
+        "Idle Inhibitor": "アイドルインヒビター"
     },
     "Idle Settings": {
         "Idle Settings": "アイドル設定"
@@ -606,7 +606,7 @@
         "Idle monitoring not supported - requires newer Quickshell version": "アイドル監視はサポートされていません - 新しい Quickshell バージョンが必要です"
     },
     "Image": {
-        "Image": ""
+        "Image": "画像"
     },
     "Include Transitions": {
         "Include Transitions": "トランジションを含める"
@@ -624,10 +624,10 @@
         "Interval": "間隔"
     },
     "Invert on mode change": {
-        "Invert on mode change": ""
+        "Invert on mode change": "モード変更時に反転"
     },
     "Keyboard Layout Name": {
-        "Keyboard Layout Name": ""
+        "Keyboard Layout Name": "キーボードレイアウト名"
     },
     "Kill Process": {
         "Kill Process": "プロセスを強制終了"
@@ -642,13 +642,13 @@
         "Launch": "起動"
     },
     "Launch Prefix": {
-        "Launch Prefix": ""
+        "Launch Prefix": "起動プリフィックス"
     },
     "Launch on dGPU": {
         "Launch on dGPU": "dGPUで起動"
     },
     "Launcher": {
-        "Launcher": ""
+        "Launcher": "ランチャー"
     },
     "Launcher Button Logo": {
         "Launcher Button Logo": "ランチャーのボタンロゴ"
@@ -678,7 +678,7 @@
         "Log Out": "ログアウト"
     },
     "Long Text": {
-        "Long Text": ""
+        "Long Text": "長文"
     },
     "Longitude": {
         "Longitude": "経度"
@@ -693,7 +693,7 @@
         "Manual Coordinates": "手動座標"
     },
     "Manual Show/Hide": {
-        "Manual Show/Hide": ""
+        "Manual Show/Hide": "手動で表示/非表示"
     },
     "Material Colors": {
         "Material Colors": "Material Colors"
@@ -708,7 +708,7 @@
         "Media": "メディア"
     },
     "Media Controls": {
-        "Media Controls": ""
+        "Media Controls": "メディアコントロール"
     },
     "Media Player Settings": {
         "Media Player Settings": "メディアプレーヤーの設定"
@@ -720,10 +720,10 @@
         "Memory": "メモリ"
     },
     "Memory Usage": {
-        "Memory Usage": ""
+        "Memory Usage": "メモリ使用率"
     },
     "Memory usage indicator": {
-        "Memory usage indicator": ""
+        "Memory usage indicator": "メモリ使用率インジケーター"
     },
     "Minute": {
         "Minute": "分"
@@ -744,7 +744,7 @@
         "Mount": "マウント"
     },
     "NM not supported": {
-        "NM not supported": ""
+        "NM not supported": "NMが利用できません"
     },
     "Named Workspace Icons": {
         "Named Workspace Icons": "名前付きワークスペースアイコン"
@@ -768,10 +768,10 @@
         "Network Settings": "ネットワーク設定"
     },
     "Network Speed Monitor": {
-        "Network Speed Monitor": ""
+        "Network Speed Monitor": "ネットワーク速度モニター"
     },
     "Network download and upload speed display": {
-        "Network download and upload speed display": ""
+        "Network download and upload speed display": "ネットワークのダウンロードおよびアップロード速度を表示"
     },
     "New": {
         "New": "新しい"
@@ -813,7 +813,7 @@
         "No plugins found": "プラグインが見つかりませんでした"
     },
     "No plugins found.": {
-        "No plugins found.": ""
+        "No plugins found.": "プラグインが見つかりませんでした。"
     },
     "Normal Priority": {
         "Normal Priority": "通常の優先度"
@@ -828,7 +828,7 @@
         "Nothing to see here": "ここには何もありません"
     },
     "Notification Center": {
-        "Notification Center": ""
+        "Notification Center": "通知センター"
     },
     "Notification Overlay": {
         "Notification Overlay": "通知オーバーレイ"
@@ -885,19 +885,19 @@
         "Per-Monitor Workspaces": "モニターごとのワークスペース"
     },
     "Percentage": {
-        "Percentage": ""
+        "Percentage": "百分率"
     },
     "Personalization": {
-        "Personalization": ""
+        "Personalization": "パーソナライゼーション"
     },
     "Pin to Dock": {
-        "Pin to Dock": ""
+        "Pin to Dock": "ドックにピン留め"
     },
     "Place plugin directories here. Each plugin should have a plugin.json manifest file.": {
         "Place plugin directories here. Each plugin should have a plugin.json manifest file.": "プラグインディレクトリをここに配置します。各プラグインには plugin.json マニフェストファイルが必要です。"
     },
     "Place plugins in": {
-        "Place plugins in": ""
+        "Place plugins in": "プラグインを配置する場所"
     },
     "Plugin Directory": {
         "Plugin Directory": "プラグインディレクトリ"
@@ -906,10 +906,10 @@
         "Plugin Management": "プラグイン管理"
     },
     "Plugin is disabled - enable in Plugins settings to use": {
-        "Plugin is disabled - enable in Plugins settings to use": ""
+        "Plugin is disabled - enable in Plugins settings to use": "プラグインは無効です - 使用するにはプラグイン設定で有効にしてください"
     },
     "Plugins": {
-        "Plugins": ""
+        "Plugins": "プラグイン"
     },
     "Popup Position": {
         "Popup Position": "ポップアップの位置"
@@ -921,7 +921,7 @@
         "Position": "位置"
     },
     "Power": {
-        "Power": ""
+        "Power": "電源"
     },
     "Power Off": {
         "Power Off": "電源オフ"
@@ -936,13 +936,13 @@
         "Pressure": "プレッシャー"
     },
     "Prevent screen timeout": {
-        "Prevent screen timeout": ""
+        "Prevent screen timeout": "画面のタイムアウトを防止"
     },
     "Primary": {
-        "Primary": ""
+        "Primary": "プライマリー"
     },
     "Privacy Indicator": {
-        "Privacy Indicator": ""
+        "Privacy Indicator": "プライバシーインジケーター"
     },
     "Process": {
         "Process": "プロセス"
@@ -951,13 +951,13 @@
         "QML (Qt Modeling Language)": "QML (Qt モデリング言語)"
     },
     "Quick access to application launcher": {
-        "Quick access to application launcher": ""
+        "Quick access to application launcher": "アプリケーションランチャーへのクイックアクセス"
     },
     "Quick access to color picker": {
-        "Quick access to color picker": ""
+        "Quick access to color picker": "カラーピッカーへのクイックアクセス"
     },
     "Quick access to notepad": {
-        "Quick access to notepad": ""
+        "Quick access to notepad": "メモ帳へのクイックアクセス"
     },
     "Rain Chance": {
         "Rain Chance": "降水確率"
@@ -969,7 +969,7 @@
         "Recent Colors": "最近の色"
     },
     "Recently Used Apps": {
-        "Recently Used Apps": ""
+        "Recently Used Apps": "最近使用したアプリ"
     },
     "Refresh": {
         "Refresh": "リフレッシュ"
@@ -981,7 +981,7 @@
         "Reset": "リセット"
     },
     "Running Apps": {
-        "Running Apps": ""
+        "Running Apps": "実行中のアプリ"
     },
     "Running Apps Only In Current Workspace": {
         "Running Apps Only In Current Workspace": "現在のワークスペースでのみアプリを実行する"
@@ -1020,34 +1020,34 @@
         "Search...": "検索..."
     },
     "Select Launcher Logo": {
-        "Select Launcher Logo": "ランチャーロゴを選択"
+        "Select Launcher Logo": "ランチャーロゴを選ぶ"
     },
     "Select a color from the palette or use custom sliders": {
-        "Select a color from the palette or use custom sliders": "パレットから色を選択するか、カスタムスライダーを使用します"
+        "Select a color from the palette or use custom sliders": "パレットから色を選ぶか、カスタムスライダーを使用します"
     },
     "Select a widget to add to the ": {
-        "Select a widget to add to the ": "追加するウィジェットを選択してください "
+        "Select a widget to add to the ": "追加するウィジェットを選ぶ "
     },
     "Select an image file...": {
-        "Select an image file...": "画像ファイルを選択..."
+        "Select an image file...": "画像ファイルを選ぶ..."
     },
     "Select font weight": {
-        "Select font weight": ""
+        "Select font weight": "フォントの太さを選ぶ"
     },
     "Select monitor to configure wallpaper": {
-        "Select monitor to configure wallpaper": ""
+        "Select monitor to configure wallpaper": "壁紙を設定するモニターを選ぶ"
     },
     "Select monospace font for process list and technical displays": {
-        "Select monospace font for process list and technical displays": ""
+        "Select monospace font for process list and technical displays": "プロセスリストと技術表示用の等幅フォントを選ぶ"
     },
     "Select system font family": {
-        "Select system font family": ""
+        "Select system font family": "システムフォントファミリーを選ぶ"
     },
     "Select which transitions to include in randomization": {
         "Select which transitions to include in randomization": "含めたいトランジションをランダム化に選択"
     },
     "Separator": {
-        "Separator": ""
+        "Separator": "区切り"
     },
     "Set different wallpapers for each connected monitor": {
         "Set different wallpapers for each connected monitor": "接続されているモニターごとに異なる壁紙を設定する"
@@ -1077,7 +1077,7 @@
         "Show on Overview": "概要に表示"
     },
     "Show on all connected displays": {
-        "Show on all connected displays": ""
+        "Show on all connected displays": "すべての接続されたディスプレイに表示"
     },
     "Show on screens:": {
         "Show on screens:": "画面に表示:"
@@ -1089,28 +1089,28 @@
         "Show weather information in top bar and control center": "トップバーとコントロールセンターに天気情報を表示"
     },
     "Shows all running applications with focus indication": {
-        "Shows all running applications with focus indication": ""
+        "Shows all running applications with focus indication": "実行中のすべてのアプリケーションをフォーカス状態で表示"
     },
     "Shows current workspace and allows switching": {
-        "Shows current workspace and allows switching": ""
+        "Shows current workspace and allows switching": "現在のワークスペースを表示、切り替えを可能に"
     },
     "Shows when microphone, camera, or screen sharing is active": {
-        "Shows when microphone, camera, or screen sharing is active": ""
+        "Shows when microphone, camera, or screen sharing is active": "マイク、カメラ、または画面共有がアクティブなときに表示"
     },
     "Size": {
         "Size": "サイズ"
     },
     "Size Offset": {
-        "Size Offset": ""
+        "Size Offset": "サイズオフセット"
     },
     "Spacer": {
-        "Spacer": ""
+        "Spacer": "間隔"
     },
     "Spacing": {
         "Spacing": "間隔"
     },
     "Square Corners": {
-        "Square Corners": "コーナーを四角くする"
+        "Square Corners": "四角コーナー"
     },
     "Start": {
         "Start": "始める"
@@ -1125,7 +1125,7 @@
         "Storage & Disks": "ストレージとディスク"
     },
     "Surface": {
-        "Surface": ""
+        "Surface": "表面"
     },
     "Suspend": {
         "Suspend": "一時停止"
@@ -1155,19 +1155,19 @@
         "System Monitoring:": "システム監視："
     },
     "System Tray": {
-        "System Tray": ""
+        "System Tray": "システムトレイ"
     },
     "System Update": {
-        "System Update": ""
+        "System Update": "システムアップデート"
     },
     "System Updates": {
         "System Updates": "システムアップデート"
     },
     "System notification area icons": {
-        "System notification area icons": ""
+        "System notification area icons": "システム通知エリアアイコン"
     },
     "Tab/Shift+Tab: Nav • ←→↑↓: Grid Nav • Enter/Space: Select": {
-        "Tab/Shift+Tab: Nav • ←→↑↓: Grid Nav • Enter/Space: Select": ""
+        "Tab/Shift+Tab: Nav • ←→↑↓: Grid Nav • Enter/Space: Select": "Tab/Shift+Tab: ナビゲーション • ←→↑↓: グリッドナビゲーション • Enter/Space: 選択"
     },
     "Technical Details": {
         "Technical Details": "技術的な詳細"
@@ -1176,16 +1176,16 @@
         "Temperature": "温度"
     },
     "Text": {
-        "Text": ""
+        "Text": "テキスト"
     },
     "The DMS_SOCKET environment variable is not set or the socket is unavailable. Automated plugin management requires the DMS_SOCKET.": {
         "The DMS_SOCKET environment variable is not set or the socket is unavailable. Automated plugin management requires the DMS_SOCKET.": "DMS_SOCKET環境変数が設定されていないか、ソケットが利用できません。自動プラグイン管理にはDMS_SOCKETが必要です。"
     },
     "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).": {
-        "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).": ""
+        "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).": "以下の設定は、GTKとQtの設定を変更します。現在の設定を維持したい場合は、バックアップを作成してください（qt5ct.conf|qt6ct.conf および ~/.config/gtk-3.0|gtk-4.0）。"
     },
     "Theme & Colors": {
-        "Theme & Colors": ""
+        "Theme & Colors": "テーマおよびカラー"
     },
     "Theme Color": {
         "Theme Color": "テーマカラー"
@@ -1194,16 +1194,16 @@
         "Third-Party Plugin Warning": "サードパーティ製プラグインの警告"
     },
     "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": {
-        "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": ""
+        "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.": "サードパーティプラグインはコミュニティによって作成されており、DankMaterialShellによる公式サポートはありません。\\n\\nこれらのプラグインはセキュリティやプライバシーのリスクをもたらす可能性があります - 自己責任でインストールしてください。"
     },
     "This widget prevents GPU power off states, which can significantly impact battery life on laptops. It is not recommended to use this on laptops with hybrid graphics.": {
-        "This widget prevents GPU power off states, which can significantly impact battery life on laptops. It is not recommended to use this on laptops with hybrid graphics.": ""
+        "This widget prevents GPU power off states, which can significantly impact battery life on laptops. It is not recommended to use this on laptops with hybrid graphics.": "このウィジェットはGPUの省電力状態を防ぎ、ノートパソコンのバッテリー寿命に大きな影響を与える可能性があります。ハイブリッドグラフィックス搭載のノートパソコンでの使用は推奨されません。"
     },
     "This will permanently delete all clipboard history.": {
-        "This will permanently delete all clipboard history.": ""
+        "This will permanently delete all clipboard history.": "これはすべてのクリップボード履歴を完全に削除します。"
     },
     "Time & Date": {
-        "Time & Date": ""
+        "Time & Date": "時間と日付"
     },
     "Today": {
         "Today": "今日"
@@ -1224,7 +1224,7 @@
         "Turn off monitors after": "後にモニターの電源を切る"
     },
     "Unpin from Dock": {
-        "Unpin from Dock": ""
+        "Unpin from Dock": "ドックから固定を解除"
     },
     "Unsaved Changes": {
         "Unsaved Changes": "保存されていない変更"
@@ -1242,7 +1242,7 @@
         "Update All": "すべて更新"
     },
     "Use 24-hour time format instead of 12-hour AM/PM": {
-        "Use 24-hour time format instead of 12-hour AM/PM": ""
+        "Use 24-hour time format instead of 12-hour AM/PM": "12時間制のAM/PMではなく、24時間表記を使用"
     },
     "Use Fahrenheit": {
         "Use Fahrenheit": "華氏を使用する"
@@ -1254,7 +1254,7 @@
         "Use Monospace Font": "等幅フォントを使用"
     },
     "Use light theme instead of dark theme": {
-        "Use light theme instead of dark theme": ""
+        "Use light theme instead of dark theme": "ダークテーマではなく、ライトテーマを使用"
     },
     "Use%": {
         "Use%": "使用％"
@@ -1263,28 +1263,28 @@
         "Used": "使用済み"
     },
     "Uses sunrise/sunset times to automatically adjust night mode based on your location.": {
-        "Uses sunrise/sunset times to automatically adjust night mode based on your location.": ""
+        "Uses sunrise/sunset times to automatically adjust night mode based on your location.": "あなたの位置情報に基づいて、日の出と日の入りの時間を使ってナイトモードを自動調整します。"
     },
     "Utilities": {
         "Utilities": "ユーティリティ"
     },
     "VPN": {
-        "VPN": ""
+        "VPN": "VPN"
     },
     "VPN Connections": {
         "VPN Connections": "VPN接続"
     },
     "VPN status and quick connect": {
-        "VPN status and quick connect": ""
+        "VPN status and quick connect": "VPNステータスとクイック接続"
     },
     "Visibility": {
         "Visibility": "可視性"
     },
     "Visual divider between widgets": {
-        "Visual divider between widgets": ""
+        "Visual divider between widgets": "ウィジェット間の視覚的分離"
     },
     "Visual effect used when wallpaper changes": {
-        "Visual effect used when wallpaper changes": ""
+        "Visual effect used when wallpaper changes": "壁紙が変更される時に使用されるビジュアルエフェクト"
     },
     "Wallpaper": {
         "Wallpaper": "壁紙"
@@ -1293,10 +1293,10 @@
         "Wave Progress Bars": "ウェーブプログレスバー"
     },
     "Weather": {
-        "Weather": ""
+        "Weather": "天気"
     },
     "Weather Widget": {
-        "Weather Widget": ""
+        "Weather Widget": "天気ウィジェット"
     },
     "WiFi is off": {
         "WiFi is off": "Wi-Fiはオフ中"
@@ -1308,7 +1308,7 @@
         "Widget Styling": "ウィジェットのスタイル"
     },
     "Widgets": {
-        "Widgets": ""
+        "Widgets": "ウィジェット"
     },
     "Wind": {
         "Wind": "風"
@@ -1326,7 +1326,7 @@
         "Workspace Settings": "ワークスペース設定"
     },
     "Workspace Switcher": {
-        "Workspace Switcher": ""
+        "Workspace Switcher": "ワークスペーススイッチャー"
     },
     "You have unsaved changes. Save before closing this tab?": {
         "You have unsaved changes. Save before closing this tab?": "保存されていない変更があります。このタブを閉じる前に保存しますか?"
@@ -1347,7 +1347,7 @@
         "official": "公式"
     },
     "update dms for NM integration.": {
-        "update dms for NM integration.": ""
+        "update dms for NM integration.": "NM統合のためにDMSを更新します。"
     },
     "• Install only from trusted sources": {
         "• Install only from trusted sources": "• 信頼できるソースからのみインストールする"