flavours: clean-up

diff --git a/dot-config/flavours/config.toml b/dot-config/flavours/config.toml
index f9b839f4333d9423a579ee346c8073ba20d5f09b..0226ad9d46e2dfed54ee1e66c647a7e875be9c31 100644 (file)
--- a/dot-config/flavours/config.toml
+++ b/dot-config/flavours/config.toml
@@ -14,15 +14,8 @@ hook = "sleep 0.5 && pkill -USR1 fish"
 [[item]]
 template = "fuzzel"
 subtemplate = "smooth"
-file = "~/.config/fuzzel/fuzzel-startmenu.ini"
-[[item]]
-template = "fuzzel"
-subtemplate = "smooth"
-file = "~/.config/fuzzel/fuzzel-centered.ini"
-[[item]]
-template = "fuzzel"
-subtemplate = "smooth"
-file = "~/.config/fuzzel/fuzzel-powermenu.ini"
+file = "~/.config/fuzzel/base16-colors.ini"
+rewrite = false
 
 [[item]]
 template = "hyprland"
@@ -46,10 +39,10 @@ rewrite = true
 
 [[item]]
 template = "kdeplasma"
-subtemplate = "default-cyan"
+subtemplate = "default-blue"
 file = "~/.local/share/color-schemes/base16.colors"
 rewrite = true
-hook = "plasma-apply-colorscheme Oxygen && plasma-apply-colorscheme base16"
+hook = "plasma-apply-colorscheme Noop && plasma-apply-colorscheme base16"
 
 [[item]]
 template = "konsole"
@@ -93,3 +86,8 @@ hook = "python3 ~/.config/flavours/templates/dircolors/scripts/gen_dircolors.py
 # hook = "chmod 755 ~/.config/flavours/templates/dircolors/scripts/gen_dircolors.py && eval 'dircolors <(python3 ~/.config/flavours/templates/dircolors/scripts/gen_dircolors.py)'"
 rewrite = true
 
+[[item]]
+template = "mako"
+file = "~/.config/mako/config"
+hook = "makoctl reload"
+

diff --git a/dot-config/flavours/templates/fuzzel/templates/smooth.mustache b/dot-config/flavours/templates/fuzzel/templates/smooth.mustache
index a17532b29a6b9f78cb56e5433db9f68f904eade8..f4d3e3e648abed686a405753f22e85d984404003 100644 (file)
--- a/dot-config/flavours/templates/fuzzel/templates/smooth.mustache
+++ b/dot-config/flavours/templates/fuzzel/templates/smooth.mustache
@@ -7,4 +7,4 @@ match={{base0D-hex}}ff
 selection={{base03-hex}}ff
 selection-text={{base06-hex}}ff
 selection-match={{base0D-hex}}ff
-border={{base0D-hex}}ff
+border={{base0C-hex}}ff

diff --git a/dot-config/flavours/templates/kdeplasma/templates/default-blue.mustache b/dot-config/flavours/templates/kdeplasma/templates/default-blue.mustache
index 28a229ff63f6d318e8190267072c1d8d0d22ef02..845dece1120248578c7c35a875d307630f3deb0b 100644 (file)
--- a/dot-config/flavours/templates/kdeplasma/templates/default-blue.mustache
+++ b/dot-config/flavours/templates/kdeplasma/templates/default-blue.mustache
@@ -48,8 +48,8 @@ ForegroundPositive={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}}
 ForegroundVisited={{base0E-rgb-r}},{{base0E-rgb-g}},{{base0E-rgb-b}}
 
 [Colors:Tooltip]
-BackgroundAlternate={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
-BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
+BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}}
+BackgroundNormal={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}}
 DecorationFocus={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}}
 DecorationHover={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}}
 ForegroundActive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}}
@@ -76,8 +76,8 @@ ForegroundPositive={{base0C-rgb-r}},{{base0C-rgb-g}},{{base0C-rgb-b}}
 ForegroundVisited={{base0E-rgb-r}},{{base0E-rgb-g}},{{base0E-rgb-b}}
 
 [Colors:Window]
-BackgroundAlternate={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
-BackgroundNormal={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
+BackgroundAlternate={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}}
+BackgroundNormal={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}}
 DecorationFocus={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}}
 DecorationHover={{base0D-rgb-r}},{{base0D-rgb-g}},{{base0D-rgb-b}}
 ForegroundActive={{base0B-rgb-r}},{{base0B-rgb-g}},{{base0B-rgb-b}}
@@ -98,9 +98,9 @@ shadeSortColumn=true
 contrast=4
 
 [WM]
-activeBackground={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
+activeBackground={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}}
 activeBlend={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
 activeForeground={{base06-rgb-r}},{{base06-rgb-g}},{{base06-rgb-b}}
-inactiveBackground={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
+inactiveBackground={{base01-rgb-r}},{{base01-rgb-g}},{{base01-rgb-b}}
 inactiveBlend={{base00-rgb-r}},{{base00-rgb-g}},{{base00-rgb-b}}
 inactiveForeground={{base05-rgb-r}},{{base05-rgb-g}},{{base05-rgb-b}}

diff --git a/dot-config/flavours/templates/mako/templates/config.yaml b/dot-config/flavours/templates/mako/templates/config.yaml
new file mode 100644 (file)
index 0000000..1832de5
--- /dev/null
+++ b/dot-config/flavours/templates/mako/templates/config.yaml
@@ -0,0 +1,3 @@
+default:
+    extension: .config
+    output: colors

diff --git a/dot-config/flavours/templates/mako/templates/default.mustache b/dot-config/flavours/templates/mako/templates/default.mustache
new file mode 100644 (file)
index 0000000..5a3492b
--- /dev/null
+++ b/dot-config/flavours/templates/mako/templates/default.mustache
@@ -0,0 +1,18 @@
+## Base16 {{scheme-name}}
+# Author: {{scheme-author}}
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#{{base00-hex}}
+text-color=#{{base05-hex}}
+border-color=#{{base0C-hex}}
+
+[urgency=low]
+background-color=#{{base00-hex}}
+text-color=#{{base0A-hex}}
+border-color=#{{base0C-hex}}
+
+[urgency=high]
+background-color=#{{base00-hex}}
+text-color=#{{base08-hex}}
+border-color=#{{base0C-hex}}