compositor+matugen: border override, hypr/mango layout overrides, new

templates, respect XDG paths
- Add Hyprland and MangoWC templates
- Add GUI gaps, window radius, and border thickness overrides for niri,
  Hyprland, and MangoWC
- Add replacement support in matugen templates for DATA_DIR, CACHE_DIR,
  CONFIG_DIR
fixes #1274
fixes #1273

quickshell/Services/CompositorService.qml

@@ -137,7 +137,11 @@ Singleton {
     Component.onCompleted: {
         detectCompositor();
         scheduleSort();
-        Qt.callLater(() => NiriService.generateNiriLayoutConfig());
+        Qt.callLater(() => {
+            NiriService.generateNiriLayoutConfig();
+            HyprlandService.generateLayoutConfig();
+            DwlService.generateLayoutConfig();
+        });
     }
 
     Connections {
@@ -396,7 +400,11 @@ Singleton {
         repeat: false
         onTriggered: {
             detectCompositor();
-            Qt.callLater(() => NiriService.generateNiriLayoutConfig());
+            Qt.callLater(() => {
+                NiriService.generateNiriLayoutConfig();
+                HyprlandService.generateLayoutConfig();
+                DwlService.generateLayoutConfig();
+            });
         }
     }
 

quickshell/Services/DwlService.qml

@@ -13,6 +13,9 @@ Singleton {
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation))
     readonly property string mangoDmsDir: configDir + "/mango/dms"
     readonly property string outputsPath: mangoDmsDir + "/outputs.conf"
+    readonly property string layoutPath: mangoDmsDir + "/layout.conf"
+
+    property int _lastGapValue: -1
 
     property bool dwlAvailable: false
     property var outputs: ({})
@@ -29,6 +32,27 @@ Singleton {
 
     signal stateChanged
 
+    Connections {
+        target: SettingsData
+        function onBarConfigsChanged() {
+            if (!CompositorService.isDwl)
+                return;
+            const newGaps = Math.max(4, (SettingsData.barConfigs[0]?.spacing ?? 4));
+            if (newGaps === root._lastGapValue)
+                return;
+            root._lastGapValue = newGaps;
+            generateLayoutConfig();
+        }
+    }
+
+    Connections {
+        target: CompositorService
+        function onIsDwlChanged() {
+            if (CompositorService.isDwl)
+                generateLayoutConfig();
+        }
+    }
+
     Connections {
         target: DMSService
         function onCapabilitiesReceived() {
@@ -49,12 +73,12 @@ Singleton {
     }
 
     Component.onCompleted: {
-        if (DMSService.dmsAvailable) {
+        if (DMSService.dmsAvailable)
             checkCapabilities();
-        }
-        if (dwlAvailable) {
+        if (dwlAvailable)
             refreshOutputScales();
-        }
+        if (CompositorService.isDwl)
+            Qt.callLater(generateLayoutConfig);
     }
 
     function checkCapabilities() {
@@ -323,6 +347,37 @@ Singleton {
         });
     }
 
+    function generateLayoutConfig() {
+        if (!CompositorService.isDwl)
+            return;
+
+        const defaultRadius = typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12;
+        const defaultGaps = typeof SettingsData !== "undefined" ? Math.max(4, (SettingsData.barConfigs[0]?.spacing ?? 4)) : 4;
+        const defaultBorderSize = 2;
+
+        const cornerRadius = (typeof SettingsData !== "undefined" && SettingsData.mangoLayoutRadiusOverride >= 0) ? SettingsData.mangoLayoutRadiusOverride : defaultRadius;
+        const gaps = (typeof SettingsData !== "undefined" && SettingsData.mangoLayoutGapsOverride >= 0) ? SettingsData.mangoLayoutGapsOverride : defaultGaps;
+        const borderSize = (typeof SettingsData !== "undefined" && SettingsData.mangoLayoutBorderSize >= 0) ? SettingsData.mangoLayoutBorderSize : defaultBorderSize;
+
+        let content = `# Auto-generated by DMS - do not edit manually
+border_radius=${cornerRadius}
+gappih=${gaps}
+gappiv=${gaps}
+gappoh=${gaps}
+gappov=${gaps}
+borderpx=${borderSize}
+`;
+
+        Proc.runCommand("mango-write-layout", ["sh", "-c", `mkdir -p "${mangoDmsDir}" && cat > "${layoutPath}" << 'EOF'\n${content}EOF`], (output, exitCode) => {
+            if (exitCode !== 0) {
+                console.warn("DwlService: Failed to write layout config:", output);
+                return;
+            }
+            console.info("DwlService: Generated layout config at", layoutPath);
+            reloadConfig();
+        });
+    }
+
     function transformToMango(transform) {
         switch (transform) {
         case "Normal":

quickshell/Services/HyprlandService.qml

@@ -12,6 +12,35 @@ Singleton {
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation))
     readonly property string hyprDmsDir: configDir + "/hypr/dms"
     readonly property string outputsPath: hyprDmsDir + "/outputs.conf"
+    readonly property string layoutPath: hyprDmsDir + "/layout.conf"
+
+    property int _lastGapValue: -1
+
+    Component.onCompleted: {
+        if (CompositorService.isHyprland)
+            Qt.callLater(generateLayoutConfig);
+    }
+
+    Connections {
+        target: SettingsData
+        function onBarConfigsChanged() {
+            if (!CompositorService.isHyprland)
+                return;
+            const newGaps = Math.max(4, (SettingsData.barConfigs[0]?.spacing ?? 4));
+            if (newGaps === root._lastGapValue)
+                return;
+            root._lastGapValue = newGaps;
+            generateLayoutConfig();
+        }
+    }
+
+    Connections {
+        target: CompositorService
+        function onIsHyprlandChanged() {
+            if (CompositorService.isHyprland)
+                generateLayoutConfig();
+        }
+    }
 
     function getOutputIdentifier(output, outputName) {
         if (SettingsData.displayNameMode === "model" && output.make && output.model)
@@ -132,6 +161,41 @@ Singleton {
         });
     }
 
+    function generateLayoutConfig() {
+        if (!CompositorService.isHyprland)
+            return;
+
+        const defaultRadius = typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12;
+        const defaultGaps = typeof SettingsData !== "undefined" ? Math.max(4, (SettingsData.barConfigs[0]?.spacing ?? 4)) : 4;
+        const defaultBorderSize = 2;
+
+        const cornerRadius = (typeof SettingsData !== "undefined" && SettingsData.hyprlandLayoutRadiusOverride >= 0) ? SettingsData.hyprlandLayoutRadiusOverride : defaultRadius;
+        const gaps = (typeof SettingsData !== "undefined" && SettingsData.hyprlandLayoutGapsOverride >= 0) ? SettingsData.hyprlandLayoutGapsOverride : defaultGaps;
+        const borderSize = (typeof SettingsData !== "undefined" && SettingsData.hyprlandLayoutBorderSize >= 0) ? SettingsData.hyprlandLayoutBorderSize : defaultBorderSize;
+
+        let content = `# Auto-generated by DMS - do not edit manually
+
+general {
+    gaps_in = ${gaps}
+    gaps_out = ${gaps}
+    border_size = ${borderSize}
+}
+
+decoration {
+    rounding = ${cornerRadius}
+}
+`;
+
+        Proc.runCommand("hypr-write-layout", ["sh", "-c", `mkdir -p "${hyprDmsDir}" && cat > "${layoutPath}" << 'EOF'\n${content}EOF`], (output, exitCode) => {
+            if (exitCode !== 0) {
+                console.warn("HyprlandService: Failed to write layout config:", output);
+                return;
+            }
+            console.info("HyprlandService: Generated layout config at", layoutPath);
+            reloadConfig();
+        });
+    }
+
     function transformToHyprland(transform) {
         switch (transform) {
         case "Normal":

quickshell/Services/NiriService.qml

@@ -1012,9 +1012,11 @@ Singleton {
 
         const defaultRadius = typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12;
         const defaultGaps = typeof SettingsData !== "undefined" ? Math.max(4, (SettingsData.barConfigs[0]?.spacing ?? 4)) : 4;
+        const defaultBorderSize = 2;
 
         const cornerRadius = (typeof SettingsData !== "undefined" && SettingsData.niriLayoutRadiusOverride >= 0) ? SettingsData.niriLayoutRadiusOverride : defaultRadius;
         const gaps = (typeof SettingsData !== "undefined" && SettingsData.niriLayoutGapsOverride >= 0) ? SettingsData.niriLayoutGapsOverride : defaultGaps;
+        const borderSize = (typeof SettingsData !== "undefined" && SettingsData.niriLayoutBorderSize >= 0) ? SettingsData.niriLayoutBorderSize : defaultBorderSize;
 
         const dmsWarning = `// ! DO NOT EDIT !
         // ! AUTO-GENERATED BY DMS !
@@ -1027,11 +1029,11 @@ Singleton {
         gaps ${gaps}
 
         border {
-        width 2
+        width ${borderSize}
         }
 
         focus-ring {
-        width 2
+        width ${borderSize}
         }
         }
         window-rule {