punkfairie/rose-pine-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(home-manager/kitty): use new themeFile option on 24.11 (#337)

Browse source 
* fix(home-manager/kitty): use new `themeFile` option on 24.11

* docs: remove kitty from IFD section in faq

latest home-manager no longer uses IFD in the kitty module

* chore: update home-manager dev flake input

---------

Co-authored-by: seth <getchoo@tuta.io>
This commit is contained in:
oli 2024-09-21 21:28:29 +01:00 committed by GitHub
parent faea883811
commit f91de989e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dev/flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726785354, "lastModified": 1726902823,
"narHash": "sha256-SLorVhoorZwjM1aS04bBX4fufEXIfkMdAGkj9bu2QAQ=", "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1786e2afdbc48e9038f7cff585069736e1d0ed44", "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
docs/src/faq.md
View file

@ -23,7 +23,6 @@
cava.catppuccin.enable = false; cava.catppuccin.enable = false;
gh-dash.catppuccin.enable = false; gh-dash.catppuccin.enable = false;
imv.catppuccin.enable = false; imv.catppuccin.enable = false;
kitty.catppuccin.enable = false; # IFD is introduced by home-manager
swaylock.catppuccin.enable = false; swaylock.catppuccin.enable = false;
}; };

6
modules/home-manager/kitty.nix
View file

@ -3,9 +3,13 @@ let
inherit (lib) ctp; inherit (lib) ctp;
cfg = config.programs.kitty.catppuccin; cfg = config.programs.kitty.catppuccin;
enable = cfg.enable && config.programs.kitty.enable; enable = cfg.enable && config.programs.kitty.enable;
# TODO: Remove after 24.11 is stable
# https://github.com/nix-community/home-manager/pull/5750
attrName = if (lib.versionAtLeast ctp.getModuleRelease "24.11") then "themeFile" else "theme";
in in
{ {
options.programs.kitty.catppuccin = ctp.mkCatppuccinOpt { name = "kitty"; }; options.programs.kitty.catppuccin = ctp.mkCatppuccinOpt { name = "kitty"; };
config.programs.kitty = lib.mkIf enable { theme = "Catppuccin-${ctp.mkUpper cfg.flavor}"; }; config = lib.mkIf enable { programs.kitty.${attrName} = "Catppuccin-${ctp.mkUpper cfg.flavor}"; };
} }