LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #621 from emsquid/patch-3

Browse Source 
fix(nix): use theme = "" instead of null
This commit is contained in:
orangc
2024-12-25 09:10:32 +03:00
committed by GitHub
parent 38bbcf96ef e9e888f844
commit c5e7a9b7d6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nix/module.nix
View File

@@ -70,7 +70,7 @@ in
theme = mkOption { theme = mkOption {
type = types.str; type = types.str;
default = null; default = "";
example = "catppuccin_mocha"; example = "catppuccin_mocha";
description = "Theme to import (see ./themes/*.json)"; description = "Theme to import (see ./themes/*.json)";
}; };
@@ -235,7 +235,7 @@ in
}; };
xdg.configFile.hyprpanel = let xdg.configFile.hyprpanel = let
theme = if cfg.theme != null then builtins.fromJSON (builtins.readFile ../themes/${cfg.theme}.json) else {}; theme = if cfg.theme != "" then builtins.fromJSON (builtins.readFile ../themes/${cfg.theme}.json) else {};
flatSet = flattenAttrs (lib.attrsets.recursiveUpdate cfg.settings theme) ""; flatSet = flattenAttrs (lib.attrsets.recursiveUpdate cfg.settings theme) "";
mergeSet = if cfg.layout == null then flatSet else flatSet // cfg.layout; mergeSet = if cfg.layout == null then flatSet else flatSet // cfg.layout;
in { in {