From 61e36587ec35110244a9eb03509b65b8450ec929 Mon Sep 17 00:00:00 2001
From: uku <uku3lig@gmail.com>
Date: Wed, 10 Jan 2024 18:23:27 +0100
Subject: [PATCH] switch to alacritty

---
 programs/alacritty.nix | 22 ++++++++++++++++++++++
 programs/fish.nix      |  5 +----
 programs/hyprland.nix  |  2 +-
 programs/kitty.nix     | 18 ------------------
 4 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 programs/alacritty.nix
 delete mode 100644 programs/kitty.nix

diff --git a/programs/alacritty.nix b/programs/alacritty.nix
new file mode 100644
index 0000000..67ee499
--- /dev/null
+++ b/programs/alacritty.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  hm.programs.alacritty = let
+    theme = pkgs.fetchurl {
+      url = "https://raw.githubusercontent.com/catppuccin/alacritty/ce476fb41f307d90f841c1a4fd7f0727c21248b2/catppuccin-macchiato.toml";
+      hash = "sha256-m0Y8OBD9Pgjw9ARwjeD8a+JIQRDboVVCywQS8/ZBAcc=";
+    };
+
+    themeAttr = builtins.fromTOML (builtins.readFile theme);
+  in {
+    enable = true;
+    settings = lib.recursiveUpdate themeAttr {
+      font = {
+        normal.family = "Iosevka Nerd Font";
+        size = 12;
+      };
+    };
+  };
+}
diff --git a/programs/fish.nix b/programs/fish.nix
index f15ec0d..d748ab1 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -15,9 +15,6 @@
       ${lib.getExe nix-your-shell} fish | source
     '';
 
-    functions = {
-      fish_greeting = "";
-      kssh = "${lib.getExe pkgs.kitty} +kitten ssh $argv";
-    };
+    functions.fish_greeting = "";
   };
 }
diff --git a/programs/hyprland.nix b/programs/hyprland.nix
index 97abaca..a1cbbca 100644
--- a/programs/hyprland.nix
+++ b/programs/hyprland.nix
@@ -104,7 +104,7 @@
 
           bind =
             [
-              "$mod, Return, exec, ${getExe kitty}"
+              "$mod, Return, exec, ${getExe alacritty}"
               "$mod SHIFT, A, killactive,"
               "$mod SHIFT, E, exit,"
               "$mod SHIFT, Space, togglefloating,"
diff --git a/programs/kitty.nix b/programs/kitty.nix
deleted file mode 100644
index 1ee4966..0000000
--- a/programs/kitty.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  hm.programs.kitty = {
-    enable = true;
-    font = {
-      name = "Iosevka Nerd Font";
-      size = 12;
-    };
-    shellIntegration.enableFishIntegration = true;
-    theme = "Catppuccin-Macchiato";
-
-    extraConfig = ''
-      tab_bar_edge bottom
-      tab_bar_style powerline
-      tab_powerline_style slanted
-      tab_title_template {title}{' :{}:'.format(num_windows) if num_windows > 1 else '\'
-    '';
-  };
-}