From 600ba660c9634baa9b35793a810137c27897b2ef Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 9 Oct 2024 11:47:29 +0200
Subject: [PATCH] Add compatibility workarounds for 24.05

---
 home/modules/programs/my-kitty/default.nix | 14 +++++++++++---
 modules/common/linux/default.nix           |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/home/modules/programs/my-kitty/default.nix b/home/modules/programs/my-kitty/default.nix
index 298c53b..a1c03c0 100644
--- a/home/modules/programs/my-kitty/default.nix
+++ b/home/modules/programs/my-kitty/default.nix
@@ -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
diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix
index 5029847..39b69a0 100644
--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@@ -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;