Skip to content

Commit

Permalink
Merge pull request Jas-SinghFSU#621 from emsquid/patch-3
Browse files Browse the repository at this point in the history
fix(nix): use theme = "" instead of null
  • Loading branch information
orangci authored Dec 25, 2024
2 parents 38bbcf9 + e9e888f commit c5e7a9b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nix/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ in

theme = mkOption {
type = types.str;
default = null;
default = "";
example = "catppuccin_mocha";
description = "Theme to import (see ./themes/*.json)";
};
Expand Down Expand Up @@ -235,7 +235,7 @@ in
};

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) "";
mergeSet = if cfg.layout == null then flatSet else flatSet // cfg.layout;
in {
Expand Down

0 comments on commit c5e7a9b

Please sign in to comment.