all repos — nixfiles @ 7d285592d8726288fd6cda66e0735ee6c8bbe007

System and user configuration, managed by nix and home-manager

kitty: simplify shell integration configuration
Alan Pearce alan@alanpearce.eu
Mon, 09 Oct 2023 20:23:57 +0200
commit

7d285592d8726288fd6cda66e0735ee6c8bbe007

parent

740eaab14520a770c859861a3e8545958e923b26

2 files changed, 7 insertions(+), 15 deletions(-)

jump to
M user/settings/fish.nix → user/settings/fish.nix
@@ -38,11 +38,6 @@ interactiveShellInit = ''       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";
M user/settings/kitty.nix → user/settings/kitty.nix
@@ -1,9 +1,6 @@ { pkgs
 , ...
 }:
-let
-  inherit (pkgs) stdenv;
-in
 {
   programs.kitty = {
     enable = true;
@@ -12,14 +9,14 @@ package = pkgs.recursive;       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
-  '';
 }