From fc7ff7f45037aeb3d92b1fe2d05bee1ea74d5c6e Mon Sep 17 00:00:00 2001
From: Riley Apeldoorn <me@riley.lgbt>
Date: Sun, 15 May 2022 21:01:45 +0200
Subject: [PATCH] Change terminal from `alacritty` to `kitty`

---
 modules/fonts.nix          |  2 +-
 modules/gui/terminal.nix   | 59 ++++++++++++++++++--------------------
 modules/gui/wm/default.nix |  2 +-
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/modules/fonts.nix b/modules/fonts.nix
index 14cd8b5..a3ac468 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -20,7 +20,7 @@
 			enable = true;
 			defaultFonts = {
 				monospace = [
-    				"Fira Mono"
+    				"Fira Code"
     				"Source Code Pro"
     				"Noto Color Emoji"
 				];
diff --git a/modules/gui/terminal.nix b/modules/gui/terminal.nix
index efd6abd..0701be8 100644
--- a/modules/gui/terminal.nix
+++ b/modules/gui/terminal.nix
@@ -2,44 +2,41 @@
 
 with lib; (mkIf config.riley.gui {
 	home-manager.users."riley" = {
-		programs.alacritty = {
+
+		# Kitty lets me use cool ligatures
+    	programs.kitty = {
 			enable = true;
-			settings = {
 
-				window.padding = { x = 8; y = 8; };
+			font = {
+    			name = "Fira Code Medium";
+    			size = 11;
+			};
+			
+			settings = with config.riley.theme.hex; {
+    			
+				background = background.primary;
+				foreground = foreground.primary;
 
-				font = {
-    				normal = { family = "Fira Code"; style = "Regular"; };
-    				bold   = { family = "Fira Code"; style = "Medium"; };
-				};
+				color1  = red.normal;
+				color9  = red.bright;
 
-    			colors = with config.riley.theme.hex; {
+				color2  = green.normal;
+				color10 = green.bright;
 
-        				primary = {
-            				background = background.primary;
-            				foreground = foreground.primary;
-        				};
+				color3  = yellow.normal;
+				color11 = yellow.bright;
 
-        				normal = {
-							red     = red.normal;
-							green   = green.normal;
-							blue    = blue.normal;
-							magenta = purple.normal;
-							yellow  = yellow.normal;
-							cyan    = cyan.normal;
-        				};
+				color4  = blue.normal;
+				color12 = blue.bright;
 
-        				bright = {
-							red     = red.bright;
-							green   = green.bright;
-							blue    = blue.bright;
-							magenta = purple.bright;
-							yellow  = yellow.bright;
-							cyan    = cyan.bright;
-        				};
-        			};
-    			};
+				color5  = purple.normal;
+				color13 = purple.bright;
 
-    		};
+				color6  = cyan.normal;
+				color14 = cyan.bright;
+
+			};
+    	};
+    	
 	};
 })
diff --git a/modules/gui/wm/default.nix b/modules/gui/wm/default.nix
index d7eb7fc..4752aa2 100644
--- a/modules/gui/wm/default.nix
+++ b/modules/gui/wm/default.nix
@@ -3,7 +3,7 @@
 let scripts     = (import ./scripts.nix { inherit pkgs; });
     theme       = config.riley.theme.hex;
 	modifier	= "Mod4";
-	terminal    = "${pkgs.alacritty}/bin/alacritty";
+	terminal    = "${pkgs.kitty}/bin/kitty";
 	keybindings = (import ./keybinds.nix {
 
     	inherit modifier lib pkgs config scripts;