Optimized some specialArgs and module argument use

This commit is contained in:
Emmet 2024-01-18 15:36:52 -06:00
parent 2d75530b6d
commit 18c8365f40
76 changed files with 282 additions and 284 deletions

View file

@ -1,13 +1,13 @@
{ config, lib, pkgs, theme, font, fontPkg, wmType, ... }:
{ config, lib, pkgs, userSettings, ... }:
let
themePath = "../../../themes"+("/"+theme+"/"+theme)+".yaml";
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../themes"+("/"+theme)+"/polarity.txt"));
backgroundUrl = builtins.readFile (./. + "../../../themes"+("/"+theme)+"/backgroundurl.txt");
backgroundSha256 = builtins.readFile (./. + "../../../themes/"+("/"+theme)+"/backgroundsha256.txt");
themePath = "../../../themes"+("/"+userSettings.theme+"/"+userSettings.theme)+".yaml";
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
backgroundUrl = builtins.readFile (./. + "../../../themes"+("/"+userSettings.theme)+"/backgroundurl.txt");
backgroundSha256 = builtins.readFile (./. + "../../../themes/"+("/"+userSettings.theme)+"/backgroundsha256.txt");
in
{
home.file.".currenttheme".text = theme;
home.file.".currenttheme".text = userSettings.theme;
stylix.autoEnable = false;
stylix.polarity = themePolarity;
stylix.image = pkgs.fetchurl {
@ -18,16 +18,16 @@ in
stylix.fonts = {
monospace = {
name = font;
package = fontPkg;
name = userSettings.font;
package = userSettings.fontPkg;
};
serif = {
name = font;
package = fontPkg;
name = userSettings.font;
package = userSettings.fontPkg;
};
sansSerif = {
name = font;
package = fontPkg;
name = userSettings.font;
package = userSettings.fontPkg;
};
emoji = {
name = "Noto Color Emoji";
@ -72,8 +72,8 @@ in
};
stylix.targets.kitty.enable = true;
stylix.targets.gtk.enable = true;
stylix.targets.rofi.enable = if (wmType == "x11") then true else false;
stylix.targets.feh.enable = if (wmType == "x11") then true else false;
stylix.targets.rofi.enable = if (userSettings.wmType == "x11") then true else false;
stylix.targets.feh.enable = if (userSettings.wmType == "x11") then true else false;
programs.feh.enable = true;
home.file.".fehbg-stylix".text = ''
#!/bin/sh