fix(modules/home/base16-gtk): working templating

This commit is contained in:
Kat Inskip 2022-07-30 13:53:55 -07:00
parent 4fac6adfb5
commit 3f2422b20f
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
2 changed files with 10 additions and 14 deletions

View file

@ -117,10 +117,10 @@ in {
''; '';
configForSchemes = mapAttrs configForScheme config.base16.schemes; configForSchemes = mapAttrs configForScheme config.base16.schemes;
configFilesForSchemes = mapAttrs (k: v: pkgs.writeText "oomox-config-${k}" v) configForSchemes; configFilesForSchemes = mapAttrs (k: v: pkgs.writeText "oomox-config-${k}" v) configForSchemes;
iconPackageForScheme = name: schemeConfigFile: let iconPackageForScheme = schemeName: schemeConfigFile: let
schemeConfig = cfg.${name} or cfg.default; schemeConfig = cfg.${schemeName} or cfg.default;
in with pkgs; mkDerivation rec { in with pkgs; mkDerivation rec {
inherit name; name = "icons-${cfg.${schemeName}.icon_style or cfg.default.icon_style}-${schemeName}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "themix-project"; owner = "themix-project";
repo = "oomox"; repo = "oomox";
@ -136,19 +136,15 @@ in {
mkdir -p ./.icons mkdir -p ./.icons
patchShebangs plugins/${iconPathSelector schemeConfig.icon_style} patchShebangs plugins/${iconPathSelector schemeConfig.icon_style}
plugins/${iconPathSelector schemeConfig.icon_style} ${schemeConfigFile} \ plugins/${iconPathSelector schemeConfig.icon_style} ${schemeConfigFile} \
-o $name-${schemeConfig.icon_style} -o ${schemeConfig.icon_style}-$name
mkdir -p $out/share/icons/${schemeConfig.icon_style}-$name mkdir -p $out/share/icons/${schemeConfig.icon_style}-$name
mv ./.icons/* $out/share/icons/${schemeConfig.icon_style}-$name mv ./.icons/* $out/share/icons
mkdir -p $out/share/themes/${schemeConfig.theme_style}-$name
patchShebangs plugins/theme_${schemeConfig.theme_style}
plugins/${themePathSelector schemeConfig.theme_style} \
--hidpi False --target $out/share/themes --output $name-${schemeConfig.theme_style} ${schemeConfigFile}
''; '';
}; };
themePackageForScheme = name: schemeConfigFile: let themePackageForScheme = schemeName: schemeConfigFile: let
schemeConfig = cfg.${name} or cfg.default; schemeConfig = cfg.${schemeName} or cfg.default;
in with pkgs; mkDerivation rec { in with pkgs; mkDerivation rec {
inherit name; name = "theme-${cfg.${schemeName}.theme_style or cfg.default.theme_style}-${schemeName}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "themix-project"; owner = "themix-project";
repo = "oomox"; repo = "oomox";
@ -164,7 +160,7 @@ in {
mkdir -p $out/share/themes/${schemeConfig.theme_style}-$name mkdir -p $out/share/themes/${schemeConfig.theme_style}-$name
patchShebangs plugins/theme_${schemeConfig.theme_style} patchShebangs plugins/theme_${schemeConfig.theme_style}
plugins/${themePathSelector schemeConfig.theme_style} \ plugins/${themePathSelector schemeConfig.theme_style} \
--hidpi False --target $out/share/themes --output $name-${schemeConfig.theme_style} ${schemeConfigFile} --hidpi False -t $out/share/themes -m all --output ${schemeConfig.theme_style}-$name ${schemeConfigFile}
''; '';
}; };
themePackagesForSchemes = mapAttrs (k: v: themePackageForScheme k v) configFilesForSchemes; themePackagesForSchemes = mapAttrs (k: v: themePackageForScheme k v) configFilesForSchemes;

2
tf

@ -1 +1 @@
Subproject commit e0480fd57f0d85814aec8a16c9a1d637283da4e3 Subproject commit f16be2a91179d35803e30d3f4a8233156a8faa3f