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
2026-01-24 21:42:51 -05:00 · 2026-01-05 11:25:13 -05:00
parent 4005a55bf2
commit 64310854a6
49 changed files with 1017 additions and 207 deletions
--- a/quickshell/matugen/configs/alacritty.toml
+++ b/quickshell/matugen/configs/alacritty.toml
@@ -1,3 +1,3 @@
 [templates.dmsalacritty]
 input_path = 'SHELL_DIR/matugen/templates/alacritty.toml'
-output_path = '~/.config/alacritty/dank-theme.toml'
+output_path = 'CONFIG_DIR/alacritty/dank-theme.toml'
--- a/quickshell/matugen/configs/dgop.toml
+++ b/quickshell/matugen/configs/dgop.toml
@@ -1,3 +1,3 @@
 [templates.dmsdgop]
 input_path = 'SHELL_DIR/matugen/templates/dgop.json'
-output_path = '~/.config/dgop/colors.json'
+output_path = 'CONFIG_DIR/dgop/colors.json'
--- a/quickshell/matugen/configs/equibop.toml
+++ b/quickshell/matugen/configs/equibop.toml
@@ -1,3 +1,3 @@
 [templates.dmsequibop]
 input_path = 'SHELL_DIR/matugen/templates/vesktop.css'
-output_path = '~/.config/equibop/themes/dank-discord.css'
+output_path = 'CONFIG_DIR/equibop/themes/dank-discord.css'
--- a/quickshell/matugen/configs/firefox.toml
+++ b/quickshell/matugen/configs/firefox.toml
@@ -1,3 +1,3 @@
 [templates.dmsfirefox]
 input_path = 'SHELL_DIR/matugen/templates/firefox-userchrome.css'
-output_path = '~/.config/DankMaterialShell/firefox.css'
+output_path = 'CONFIG_DIR/DankMaterialShell/firefox.css'
--- a/quickshell/matugen/configs/foot.toml
+++ b/quickshell/matugen/configs/foot.toml
@@ -1,3 +1,3 @@
 [templates.dmsfoot]
 input_path = 'SHELL_DIR/matugen/templates/foot.ini'
-output_path = '~/.config/foot/dank-colors.ini'
+output_path = 'CONFIG_DIR/foot/dank-colors.ini'
--- a/quickshell/matugen/configs/ghostty.toml
+++ b/quickshell/matugen/configs/ghostty.toml
@@ -1,3 +1,3 @@
 [templates.dmsghostty]
 input_path = 'SHELL_DIR/matugen/templates/ghostty.conf'
-output_path = '~/.config/ghostty/themes/dankcolors'
+output_path = 'CONFIG_DIR/ghostty/themes/dankcolors'
--- a/quickshell/matugen/configs/gtk3-dark.toml
+++ b/quickshell/matugen/configs/gtk3-dark.toml
@@ -1,7 +1,7 @@
 [templates.dmsgtk3]
 input_path = 'SHELL_DIR/matugen/templates/gtk-colors.css'
-output_path = '~/.config/gtk-3.0/dank-colors.css'
+output_path = 'CONFIG_DIR/gtk-3.0/dank-colors.css'

 [templates.dmsgtk4]
 input_path = 'SHELL_DIR/matugen/templates/gtk-colors.css'
-output_path = '~/.config/gtk-4.0/dank-colors.css'
+output_path = 'CONFIG_DIR/gtk-4.0/dank-colors.css'
--- a/quickshell/matugen/configs/gtk3-light.toml
+++ b/quickshell/matugen/configs/gtk3-light.toml
@@ -1,7 +1,7 @@
 [templates.dmsgtk3]
 input_path = 'SHELL_DIR/matugen/templates/gtk-light-colors.css'
-output_path = '~/.config/gtk-3.0/dank-colors.css'
+output_path = 'CONFIG_DIR/gtk-3.0/dank-colors.css'

 [templates.dmsgtk4]
 input_path = 'SHELL_DIR/matugen/templates/gtk-colors.css'
-output_path = '~/.config/gtk-4.0/dank-colors.css'
+output_path = 'CONFIG_DIR/gtk-4.0/dank-colors.css'
--- a/quickshell/matugen/configs/hyprland.toml
+++ b/quickshell/matugen/configs/hyprland.toml
@@ -0,0 +1,3 @@
+[templates.dmshyprland]
+input_path = 'SHELL_DIR/matugen/templates/hypr-colors.conf'
+output_path = 'CONFIG_DIR/hypr/dms/colors.conf'
--- a/quickshell/matugen/configs/kcolorscheme.toml
+++ b/quickshell/matugen/configs/kcolorscheme.toml
@@ -1,11 +1,11 @@
 [templates.dmskcolorscheme]
 input_path = 'SHELL_DIR/matugen/templates/kcolorscheme.colors'
-output_path = '~/.local/share/color-schemes/DankMatugen.colors'
+output_path = 'DATA_DIR/color-schemes/DankMatugen.colors'

 [templates.dmslightkcolorscheme]
 input_path = 'SHELL_DIR/matugen/templates/light-kcolorscheme.colors'
-output_path = '~/.local/share/color-schemes/DankMatugenLight.colors'
+output_path = 'DATA_DIR/color-schemes/DankMatugenLight.colors'

 [templates.dmsdarkkcolorscheme]
 input_path = 'SHELL_DIR/matugen/templates/dark-kcolorscheme.colors'
-output_path = '~/.local/share/color-schemes/DankMatugenDark.colors'
+output_path = 'DATA_DIR/color-schemes/DankMatugenDark.colors'
--- a/quickshell/matugen/configs/kitty.toml
+++ b/quickshell/matugen/configs/kitty.toml
@@ -1,7 +1,7 @@
 [templates.dmskitty]
 input_path = 'SHELL_DIR/matugen/templates/kitty.conf'
-output_path = '~/.config/kitty/dank-theme.conf'
+output_path = 'CONFIG_DIR/kitty/dank-theme.conf'

 [templates.dmskittytabs]
 input_path = 'SHELL_DIR/matugen/templates/kitty-tabs.conf'
-output_path = '~/.config/kitty/dank-tabs.conf'
+output_path = 'CONFIG_DIR/kitty/dank-tabs.conf'
--- a/quickshell/matugen/configs/mangowc.toml
+++ b/quickshell/matugen/configs/mangowc.toml
@@ -0,0 +1,3 @@
+[templates.dmsmango]
+input_path = 'SHELL_DIR/matugen/templates/mango-colors.conf'
+output_path = 'CONFIG_DIR/mango/dms/colors.conf'
--- a/quickshell/matugen/configs/neovim.toml
+++ b/quickshell/matugen/configs/neovim.toml
@@ -1,3 +1,3 @@
 [templates.dmsneovim]
 input_path = 'SHELL_DIR/matugen/templates/neovim.lua'
-output_path = '~/.config/nvim/lua/plugins/dankcolors.lua'
+output_path = 'CONFIG_DIR/nvim/lua/plugins/dankcolors.lua'
--- a/quickshell/matugen/configs/niri.toml
+++ b/quickshell/matugen/configs/niri.toml
@@ -1,3 +1,3 @@
 [templates.dmsniri]
 input_path = 'SHELL_DIR/matugen/templates/niri-colors.kdl'
-output_path = '~/.config/niri/dms/colors.kdl'
+output_path = 'CONFIG_DIR/niri/dms/colors.kdl'
--- a/quickshell/matugen/configs/pywalfox.toml
+++ b/quickshell/matugen/configs/pywalfox.toml
@@ -1,4 +1,4 @@
 [templates.dmspywalfox]
 input_path = 'SHELL_DIR/matugen/templates/pywalfox-colors.json'
-output_path = '~/.cache/wal/dank-pywalfox.json'
+output_path = 'CACHE_DIR/wal/dank-pywalfox.json'
 post_hook = 'sh -c "command -v pywalfox && test -f ~/.cache/wal/colors.json && pywalfox update"'
--- a/quickshell/matugen/configs/qt5ct.toml
+++ b/quickshell/matugen/configs/qt5ct.toml
@@ -1,3 +1,3 @@
 [templates.dmsqt5ct]
 input_path = 'SHELL_DIR/matugen/templates/qtct-colors.conf'
-output_path = '~/.config/qt5ct/colors/matugen.conf'
+output_path = 'CONFIG_DIR/qt5ct/colors/matugen.conf'
--- a/quickshell/matugen/configs/qt6ct.toml
+++ b/quickshell/matugen/configs/qt6ct.toml
@@ -1,3 +1,3 @@
 [templates.dmsqt6ct]
 input_path = 'SHELL_DIR/matugen/templates/qtct-colors.conf'
-output_path = '~/.config/qt6ct/colors/matugen.conf'
+output_path = 'CONFIG_DIR/qt6ct/colors/matugen.conf'
--- a/quickshell/matugen/configs/vesktop.toml
+++ b/quickshell/matugen/configs/vesktop.toml
@@ -1,3 +1,3 @@
 [templates.dmsvesktop]
 input_path = 'SHELL_DIR/matugen/templates/vesktop.css'
-output_path = '~/.config/vesktop/themes/dank-discord.css'
+output_path = 'CONFIG_DIR/vesktop/themes/dank-discord.css'
--- a/quickshell/matugen/configs/wezterm.toml
+++ b/quickshell/matugen/configs/wezterm.toml
@@ -1,3 +1,3 @@
 [templates.dmswezterm]
 input_path = 'SHELL_DIR/matugen/templates/wezterm.toml'
-output_path = '~/.config/wezterm/colors/dank-theme.toml'
+output_path = 'CONFIG_DIR/wezterm/colors/dank-theme.toml'
--- a/quickshell/matugen/configs/zenbrowser.toml
+++ b/quickshell/matugen/configs/zenbrowser.toml
@@ -1,3 +1,3 @@
 [templates.dmszenbrowser]
 input_path = 'SHELL_DIR/matugen/templates/zen-userchrome.css'
-output_path = '~/.config/DankMaterialShell/zen.css'
+output_path = 'CONFIG_DIR/DankMaterialShell/zen.css'
--- a/quickshell/matugen/templates/hypr-colors.conf
+++ b/quickshell/matugen/templates/hypr-colors.conf
@@ -0,0 +1,25 @@
+# ! Auto-generated file. Do not edit directly.
+# Remove source = ./dms/colors.conf from your config to override.
+
+$primary  = rgb({{colors.primary.default.hex_stripped}})
+$outline  = rgb({{colors.outline.default.hex_stripped}})
+$error    = rgb({{colors.error.default.hex_stripped}})
+
+general {
+  col.active_border   = $primary
+  col.inactive_border = $outline
+}
+
+group {
+  col.border_active   = $primary
+  col.border_inactive = $outline
+  col.border_locked_active   = $error
+  col.border_locked_inactive = $outline
+
+  groupbar {
+    col.active         = $primary
+    col.inactive       = $outline
+    col.locked_active   = $error
+    col.locked_inactive = $outline
+  }
+}
--- a/quickshell/matugen/templates/mango-colors.conf
+++ b/quickshell/matugen/templates/mango-colors.conf
@@ -0,0 +1,6 @@
+# ! Auto-generated file. Do not edit directly.
+# Remove source = ./dms/colors.conf from your config to override.
+
+bordercolor = 0x{{colors.outline.default.hex_stripped}}ff
+focuscolor  = 0x{{colors.primary.default.hex_stripped}}ff
+urgentcolor = 0x{{colors.error.default.hex_stripped}}ff
--- a/quickshell/matugen/templates/niri-colors.kdl
+++ b/quickshell/matugen/templates/niri-colors.kdl
@@ -1,3 +1,6 @@
+// ! Auto-generated file. Do not edit directly.
+// Remove `include "dms/colors.kdl"` from your config to override.
+
 layout {
    background-color "transparent"