diff --git a/option/Wallpaper.nix b/option/Wallpaper.nix index 2f039de..3369e59 100644 --- a/option/Wallpaper.nix +++ b/option/Wallpaper.nix @@ -30,7 +30,13 @@ in }; style = lib.mkOption { default = style; - type = with lib.types; nullOr (oneOf [ path lines attrs ]); + type = + with lib.types; + nullOr (oneOf [ + path + lines + attrs + ]); }; }; } diff --git a/system/Stylix.nix b/system/Stylix.nix index aff4989..4a04601 100644 --- a/system/Stylix.nix +++ b/system/Stylix.nix @@ -4,33 +4,31 @@ let wallpaper = config.module.wallpaper; in { - config = lib.mkMerge [ + stylix = lib.mkMerge [ { - stylix = { - inherit (config.module.style) cursor; - enable = true; - autoEnable = true; - image = wallpaper.path; - polarity = "dark"; - fonts = with style.font; { - inherit - emoji - monospace - sansSerif - serif - ; - sizes = with size; { - inherit desktop terminal; - applications = application; - popups = popup; - }; - }; - opacity = with style.opacity; { + inherit (config.module.style) cursor; + enable = true; + autoEnable = true; + image = wallpaper.path; + polarity = "dark"; + fonts = with style.font; { + inherit + emoji + monospace + sansSerif + serif + ; + sizes = with size; { inherit desktop terminal; applications = application; - popups = popups; + popups = popup; }; }; + opacity = with style.opacity; { + inherit desktop terminal; + applications = application; + popups = popups; + }; } (lib.mkIf wallpaper.forceContrastText {