diff --git a/nix/hm-module.nix b/nix/hm-module.nix index aae7fd2..ce34b6a 100644 --- a/nix/hm-module.nix +++ b/nix/hm-module.nix @@ -111,8 +111,6 @@ in }; config = lib.mkIf cfg.enable { - programs.nova-shell.theme = lib.mkIf stylixAvailable (lib.mkDefault stylixTheme); - home.packages = [ self.packages.${pkgs.stdenv.hostPlatform.system}.nova-shell-cli @@ -124,8 +122,11 @@ in (pkgs.formats.json { }).generate "nova-shell-modules.json" cfg.modules; xdg.configFile."nova-shell/theme.json".source = - (pkgs.formats.json { }).generate "nova-shell-theme.json" - cfg.theme; + let + stylixDefaults = if stylixAvailable then stylixTheme else { }; + finalTheme = lib.recursiveUpdate stylixDefaults cfg.theme; + in + (pkgs.formats.json { }).generate "nova-shell-theme.json" finalTheme; systemd.user.services.nova-shell = lib.mkIf cfg.systemd.enable { Unit = {