From 7d285592d8726288fd6cda66e0735ee6c8bbe007 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 9 Oct 2023 20:23:57 +0200
Subject: kitty: simplify shell integration configuration

---
 user/settings/fish.nix  |  5 -----
 user/settings/kitty.nix | 17 +++++++----------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/user/settings/fish.nix b/user/settings/fish.nix
index be68432e..c00e4fd1 100644
--- a/user/settings/fish.nix
+++ b/user/settings/fish.nix
@@ -38,11 +38,6 @@
       bind \es __ghq_repository_search
       fzf_configure_bindings --directory=\cx\cf
     '';
-    shellInit = ''
-      if test -n $KITTY_INSTALLATION_DIR
-        set -x KITTY_SHELL_INTEGRATION no-cursor
-      end
-    '';
     shellAliases = {
       hist-freq-lines = lib.mkForce "history | sort | uniq -c | sort -gr | head -n100 | less";
       hist-freq-commands = lib.mkForce "history | cut -d' ' -f 1 | sort | uniq -c | sort -gr | head -n100 | less";
diff --git a/user/settings/kitty.nix b/user/settings/kitty.nix
index 6027d877..814ce54c 100644
--- a/user/settings/kitty.nix
+++ b/user/settings/kitty.nix
@@ -1,9 +1,6 @@
 { pkgs
 , ...
 }:
-let
-  inherit (pkgs) stdenv;
-in
 {
   programs.kitty = {
     enable = true;
@@ -12,14 +9,14 @@ in
       name = "Rec Mono SemiCasual";
       size = 15;
     };
-    theme = "Alabaster";
     shellIntegration = {
-      mode = "enabled";
+      mode = "no-cursor";
     };
+    settings = {
+      macos_option_as_alt = "left";
+    };
+    extraConfig = ''
+      include ~/.config/kitty/theme.conf
+    '';
   };
-  programs.fish.shellInit = ''
-    if test -n $KITTY_INSTALLATION_DIR
-      set -x KITTY_SHELL_INTEGRATION no-cursor
-    end
-  '';
 }
-- 
cgit 1.4.1