From 46a05c68371bdf2a59a8bd414672bd8eaa7d1c38 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 16 Feb 2023 23:26:06 +0100
Subject: [PATCH] use modern terminal (finally)

---
 nixos/modules/programs/shell-zsh.nix     | 47 ++++++++++++------------
 nixos/system/desktop/home-manager/i3.nix | 47 ++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/programs/shell-zsh.nix b/nixos/modules/programs/shell-zsh.nix
index d27f9da..af9d10e 100644
--- a/nixos/modules/programs/shell-zsh.nix
+++ b/nixos/modules/programs/shell-zsh.nix
@@ -118,34 +118,34 @@ in
 
         # vi mode
         # -------
-        POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND="black"
-        POWERLEVEL9K_VI_MODE_INSERT_BACKGROUND="blue"
-        POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND="black"
-        POWERLEVEL9K_VI_MODE_NORMAL_BACKGROUND="yellow"
+        #POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND="black"
+        #POWERLEVEL9K_VI_MODE_INSERT_BACKGROUND="blue"
+        #POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND="black"
+        #POWERLEVEL9K_VI_MODE_NORMAL_BACKGROUND="yellow"
 
         # context
         # -------
-        POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND="green"
-        POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND="008"
-        POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND="008"
-        POWERLEVEL9K_CONTEXT_ROOT_BACKGROUND="red"
-        POWERLEVEL9K_CONTEXT_REMOTE_FOREGROUND="008"
-        POWERLEVEL9K_CONTEXT_REMOTE_BACKGROUND="red"
+        #POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND="green"
+        #POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND="008"
+        #POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND="008"
+        #POWERLEVEL9K_CONTEXT_ROOT_BACKGROUND="red"
+        #POWERLEVEL9K_CONTEXT_REMOTE_FOREGROUND="008"
+        #POWERLEVEL9K_CONTEXT_REMOTE_BACKGROUND="red"
 
         # dir
         # ---
-        POWERLEVEL9K_DIR_HOME_FOREGROUND="black"
-        POWERLEVEL9K_DIR_HOME_BACKGROUND="yellow"
-        POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND="black"
-        POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND="yellow"
-        POWERLEVEL9K_DIR_DEFAULT_FOREGROUND="black"
-        POWERLEVEL9K_DIR_DEFAULT_BACKGROUND="green"
+        #POWERLEVEL9K_DIR_HOME_FOREGROUND="black"
+        #POWERLEVEL9K_DIR_HOME_BACKGROUND="yellow"
+        #POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND="black"
+        #POWERLEVEL9K_DIR_HOME_SUBFOLDER_BACKGROUND="yellow"
+        #POWERLEVEL9K_DIR_DEFAULT_FOREGROUND="black"
+        #POWERLEVEL9K_DIR_DEFAULT_BACKGROUND="green"
 
         # root_indicator
         # --------------
-        POWERLEVEL9K_ROOT_ICON="#"
-        POWERLEVEL9K_ROOT_INDICATOR_FOREGROUND="black"
-        POWERLEVEL9K_ROOT_INDICATOR_BACKGROUND="red"
+        #POWERLEVEL9K_ROOT_ICON="#"
+        #POWERLEVEL9K_ROOT_INDICATOR_FOREGROUND="black"
+        #POWERLEVEL9K_ROOT_INDICATOR_BACKGROUND="red"
 
         # background_jobs
         # ---------------
@@ -153,13 +153,13 @@ in
 
         # status
         # ------
-        POWERLEVEL9K_STATUS_OK_BACKGROUND="008"
-        POWERLEVEL9K_STATUS_ERROR_BACKGROUND="008"
+        #POWERLEVEL9K_STATUS_OK_BACKGROUND="008"
+        #POWERLEVEL9K_STATUS_ERROR_BACKGROUND="008"
 
         # time
         # ----
-        POWERLEVEL9K_TIME_FOREGROUND="008"
-        POWERLEVEL9K_TIME_BACKGROUND="006"
+        #POWERLEVEL9K_TIME_FOREGROUND="008"
+        #POWERLEVEL9K_TIME_BACKGROUND="006"
 
 
         # jail indicator
@@ -168,7 +168,6 @@ in
         POWERLEVEL9K_CUSTOM_JAIL_BACKGROUND="red"
         POWERLEVEL9K_CUSTOM_JAIL_FOREGROUND="black"
 
-
       '';
   };
 }
diff --git a/nixos/system/desktop/home-manager/i3.nix b/nixos/system/desktop/home-manager/i3.nix
index b411d07..789cc9f 100644
--- a/nixos/system/desktop/home-manager/i3.nix
+++ b/nixos/system/desktop/home-manager/i3.nix
@@ -39,6 +39,7 @@ in
 {
   home-manager.users.mainUser = {
 
+
     programs.i3status-rust = {
       enable = true;
       bars = {
@@ -79,6 +80,51 @@ in
 
     };
 
+    programs.kitty = {
+      enable = true;
+      # kitty +kitten themes
+      theme = "Gruvbox Light Hard";
+      settings = {
+        font_family = "JetBrains Mono";
+        bold_font = "auto";
+        italic_font = "auto";
+        bold_italic_font = "auto";
+        font_size = 11;
+      };
+    };
+
+    programs.alacritty = {
+      enable = true;
+      settings = {
+        import =
+          let
+            themes = pkgs.fetchFromGitHub {
+              owner = "alacritty";
+              repo = "alacritty-theme";
+              rev = "024c5c0dfb65197d5796e29e307b321af9a5e198";
+              sha256 = "sha256-zXyGXZSmmTup5o7Dx6he+57vSFpygR+GSD+3PTxDbVk=";
+            };
+          in
+          [ "${themes}/themes/gruvbox_light.yaml" ];
+        font = {
+          normal = {
+            family = "JetBrains Mono";
+            style = "Regular";
+          };
+          bold = {
+            family = "JetBrains Mono";
+            style = "Bold";
+          };
+          italic = {
+            family = "JetBrains Mono";
+            style = "Italic";
+          };
+          size = 6.0;
+        };
+      };
+    };
+
+
     xsession.windowManager.i3 = {
       enable = true;
       extraConfig = ''
@@ -86,6 +132,7 @@ in
       '';
       config = {
         modifier = "Mod4";
+        terminal = "alacritty";
         startup =
           let
             height = config.configuration.desktop.height;