Add compatibility workarounds for 24.05
This commit is contained in:
parent
55397974b4
commit
600ba660c9
|
@ -2,10 +2,20 @@
|
|||
|
||||
let
|
||||
cfg = config.nki.programs.kitty;
|
||||
|
||||
theme = { lib, options, config, ... }: {
|
||||
programs.kitty = lib.mkIf config.nki.programs.kitty.enable (
|
||||
if builtins.hasAttr "themeFile" options.programs.kitty then {
|
||||
themeFile = "ayu_light";
|
||||
} else {
|
||||
theme = "Ayu Light";
|
||||
}
|
||||
);
|
||||
};
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
imports = [ ./darwin.nix ./linux.nix ./tabs.nix ];
|
||||
imports = [ theme ./darwin.nix ./linux.nix ./tabs.nix ];
|
||||
|
||||
options.nki.programs.kitty = {
|
||||
enable = mkEnableOption "Enable kitty";
|
||||
|
@ -50,8 +60,6 @@ with lib;
|
|||
font.name = "Fantasque Sans Mono";
|
||||
font.size = cfg.fontSize;
|
||||
|
||||
themeFile = "ayu_light";
|
||||
|
||||
settings =
|
||||
let
|
||||
# Background color and transparency
|
||||
|
|
|
@ -38,7 +38,7 @@ let
|
|||
};
|
||||
|
||||
accounts = { pkgs, ... }: mkIf (config.common.linux.enable && !pkgs.stdenv.isAarch64) {
|
||||
environment.systemPackages = with pkgs; [ glib gnome-control-center ];
|
||||
environment.systemPackages = [ pkgs.glib (pkgs.gnome-control-center or pkgs.gnome.gnome-control-center) ];
|
||||
services.accounts-daemon.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
# programs.evolution.enable = true;
|
||||
|
|
Loading…
Reference in a new issue