From 489833b201a84488c6b4371a261fdbcafa6abcb6 Mon Sep 17 00:00:00 2001 From: awwpotato <153149335+awwpotato@users.noreply.github.com> Date: Sun, 2 Mar 2025 15:48:43 -0800 Subject: [PATCH] treewide: give mustache files correct file extensions (#946) makes the filetype of the file more clear and makes it possible for editorconfig (#945) to work for these files --- ...ase16-stylix.mustache => base16-stylix.tmTheme.mustache} | 0 modules/bat/hm.nix | 2 +- modules/firefox/hm.nix | 2 +- .../{userChrome.mustache => userChrome.css.mustache} | 0 modules/gedit/hm.nix | 2 +- modules/gedit/{template.mustache => template.xml.mustache} | 0 modules/gnome-text-editor/common.nix | 2 +- modules/gnome/{colors.mustache => colors.scss.mustache} | 0 modules/gnome/theme.nix | 2 +- modules/gtk/{gtk.mustache => gtk.css.mustache} | 0 modules/gtk/hm.nix | 2 +- modules/halloy/hm.nix | 2 +- .../halloy/{template.mustache => template.toml.mustache} | 0 modules/qt/hm.nix | 6 ++++-- modules/qt/{kvantum-svg.mustache => kvantum.svg.mustache} | 0 modules/yazi/hm.nix | 2 +- 16 files changed, 12 insertions(+), 10 deletions(-) rename modules/bat/{base16-stylix.mustache => base16-stylix.tmTheme.mustache} (100%) rename modules/firefox/{userChrome.mustache => userChrome.css.mustache} (100%) rename modules/gedit/{template.mustache => template.xml.mustache} (100%) rename modules/gnome/{colors.mustache => colors.scss.mustache} (100%) rename modules/gtk/{gtk.mustache => gtk.css.mustache} (100%) rename modules/halloy/{template.mustache => template.toml.mustache} (100%) rename modules/qt/{kvantum-svg.mustache => kvantum.svg.mustache} (100%) diff --git a/modules/bat/base16-stylix.mustache b/modules/bat/base16-stylix.tmTheme.mustache similarity index 100% rename from modules/bat/base16-stylix.mustache rename to modules/bat/base16-stylix.tmTheme.mustache diff --git a/modules/bat/hm.nix b/modules/bat/hm.nix index 64ba7550..074831c6 100644 --- a/modules/bat/hm.nix +++ b/modules/bat/hm.nix @@ -8,7 +8,7 @@ # This theme is reused for yazi. Changes to the template # will need to be applied to modules/yazi/hm.nix themes."base16-stylix".src = config.lib.stylix.colors { - template = ./base16-stylix.mustache; + template = ./base16-stylix.tmTheme.mustache; extension = ".tmTheme"; }; diff --git a/modules/firefox/hm.nix b/modules/firefox/hm.nix index c3f93de6..6be1c037 100644 --- a/modules/firefox/hm.nix +++ b/modules/firefox/hm.nix @@ -95,7 +95,7 @@ in userChrome = let template = config.lib.stylix.colors { - template = ./userChrome.mustache; + template = ./userChrome.css.mustache; extension = "css"; }; in diff --git a/modules/firefox/userChrome.mustache b/modules/firefox/userChrome.css.mustache similarity index 100% rename from modules/firefox/userChrome.mustache rename to modules/firefox/userChrome.css.mustache diff --git a/modules/gedit/hm.nix b/modules/gedit/hm.nix index 03041d21..7281c7a0 100644 --- a/modules/gedit/hm.nix +++ b/modules/gedit/hm.nix @@ -2,7 +2,7 @@ let style = config.lib.stylix.colors { - template = ./template.mustache; + template = ./template.xml.mustache; extension = "xml"; }; diff --git a/modules/gedit/template.mustache b/modules/gedit/template.xml.mustache similarity index 100% rename from modules/gedit/template.mustache rename to modules/gedit/template.xml.mustache diff --git a/modules/gnome-text-editor/common.nix b/modules/gnome-text-editor/common.nix index 3fc8d3f2..8d72ecc7 100644 --- a/modules/gnome-text-editor/common.nix +++ b/modules/gnome-text-editor/common.nix @@ -2,7 +2,7 @@ let style = config.lib.stylix.colors { - template = ../gedit/template.mustache; + template = ../gedit/template.xml.mustache; extension = "xml"; }; in diff --git a/modules/gnome/colors.mustache b/modules/gnome/colors.scss.mustache similarity index 100% rename from modules/gnome/colors.mustache rename to modules/gnome/colors.scss.mustache diff --git a/modules/gnome/theme.nix b/modules/gnome/theme.nix index c4bd8c90..9fb45e8d 100644 --- a/modules/gnome/theme.nix +++ b/modules/gnome/theme.nix @@ -8,7 +8,7 @@ let colorsScss = colors { - template = ./colors.mustache; + template = ./colors.scss.mustache; extension = "scss"; }; diff --git a/modules/gtk/gtk.mustache b/modules/gtk/gtk.css.mustache similarity index 100% rename from modules/gtk/gtk.mustache rename to modules/gtk/gtk.css.mustache diff --git a/modules/gtk/hm.nix b/modules/gtk/hm.nix index e3e8d596..3a6fb22c 100644 --- a/modules/gtk/hm.nix +++ b/modules/gtk/hm.nix @@ -10,7 +10,7 @@ let cfg = config.stylix.targets.gtk; baseCss = config.lib.stylix.colors { - template = ./gtk.mustache; + template = ./gtk.css.mustache; extension = "css"; }; diff --git a/modules/halloy/hm.nix b/modules/halloy/hm.nix index 88aefd8a..2fe47aeb 100644 --- a/modules/halloy/hm.nix +++ b/modules/halloy/hm.nix @@ -2,7 +2,7 @@ let themeFile = config.lib.stylix.colors { - template = ./template.mustache; + template = ./template.toml.mustache; extension = ".toml"; }; in diff --git a/modules/halloy/template.mustache b/modules/halloy/template.toml.mustache similarity index 100% rename from modules/halloy/template.mustache rename to modules/halloy/template.toml.mustache diff --git a/modules/qt/hm.nix b/modules/qt/hm.nix index 4f8d4fad..1d690664 100644 --- a/modules/qt/hm.nix +++ b/modules/qt/hm.nix @@ -42,7 +42,7 @@ extension = ".kvconfig"; }; svg = config.lib.stylix.colors { - template = ./kvantum-svg.mustache; + template = ./kvantum.svg.mustache; extension = "svg"; }; in @@ -88,7 +88,9 @@ (lib.mkIf (config.qt.style.name == "kvantum") { "Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini { }).generate "kvantum.kvconfig" - { General.theme = "Base16Kvantum"; }; + { + General.theme = "Base16Kvantum"; + }; "Kvantum/Base16Kvantum".source = "${kvantumPackage}/share/Kvantum/Base16Kvantum"; diff --git a/modules/qt/kvantum-svg.mustache b/modules/qt/kvantum.svg.mustache similarity index 100% rename from modules/qt/kvantum-svg.mustache rename to modules/qt/kvantum.svg.mustache diff --git a/modules/yazi/hm.nix b/modules/yazi/hm.nix index 1db383b7..ac997f1b 100644 --- a/modules/yazi/hm.nix +++ b/modules/yazi/hm.nix @@ -23,7 +23,7 @@ # Reusing bat themes, since it's suggested in the stying guide # https://yazi-rs.github.io/docs/configuration/theme#manager syntect_theme = config.lib.stylix.colors { - template = ../bat/base16-stylix.mustache; + template = ../bat/base16-stylix.tmTheme.mustache; extension = ".tmTheme"; };