From c74d003a57fe2b9f7ede34e3abcebb67b47be076 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 30 Oct 2022 20:15:32 -0400
Subject: [PATCH] change alacritty scrollback keybind to match kitty

add fonts for kitty
---
 modules/applications/alacritty.nix | 4 ++--
 modules/applications/default.nix   | 1 +
 modules/darwin/fonts.nix           | 5 +++++
 modules/graphical/fonts.nix        | 1 +
 windows/alacritty.yml              | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/applications/alacritty.nix b/modules/applications/alacritty.nix
index 8f95551..2c93b60 100644
--- a/modules/applications/alacritty.nix
+++ b/modules/applications/alacritty.nix
@@ -34,8 +34,8 @@
               chars = "\\x11F";
             }
             {
-              key = "K";
-              mods = "Control";
+              key = "H";
+              mods = "Control|Shift";
               mode = "~Vi";
               action = "ToggleViMode";
             }
diff --git a/modules/applications/default.nix b/modules/applications/default.nix
index 6d0ca0a..ee01e55 100644
--- a/modules/applications/default.nix
+++ b/modules/applications/default.nix
@@ -6,6 +6,7 @@
     ./calibre.nix
     ./discord.nix
     ./firefox.nix
+    ./kitty.nix
     ./media.nix
     ./obsidian.nix
     ./qbittorrent.nix
diff --git a/modules/darwin/fonts.nix b/modules/darwin/fonts.nix
index 20ea0dc..874457a 100644
--- a/modules/darwin/fonts.nix
+++ b/modules/darwin/fonts.nix
@@ -9,6 +9,11 @@
       font.normal.family = "FiraCode Nerd Font Mono";
     };
 
+    programs.kitty.font = {
+      package = pkgs.nerdfonts;
+      name = "FiraCode";
+    };
+
   };
 
 }
diff --git a/modules/graphical/fonts.nix b/modules/graphical/fonts.nix
index ae81955..55d6245 100644
--- a/modules/graphical/fonts.nix
+++ b/modules/graphical/fonts.nix
@@ -21,6 +21,7 @@ in {
       services.polybar.config."bar/main".font-0 = "Hack Nerd Font:size=10;2";
       programs.rofi.font = "Hack Nerd Font 14";
       programs.alacritty.settings.font.normal.family = fontName;
+      programs.kitty.font.name = fontName;
     };
 
   };
diff --git a/windows/alacritty.yml b/windows/alacritty.yml
index fedf71d..4edb4d4 100644
--- a/windows/alacritty.yml
+++ b/windows/alacritty.yml
@@ -723,7 +723,7 @@ key_bindings:
   - { key: L, mods: Control|Shift, chars: "\x1F" }
   # Used for searching nixpkgs in fish_user_key_bindings
   - { key: N, mods: Control|Shift, chars: "\x11F" }
-  - { key: K, mods: Control, mode: ~Vi, action: ToggleViMode }
+  - { key: H, mods: Control|Shift, mode: ~Vi, action: ToggleViMode }
   - { key: Return, mode: Vi, action: ToggleViMode }
   # Used to enable $ keybind in Vi mode
   - { key: 5, mods: Shift, mode: Vi|~Search, action: Last }