From 65a3dcdc0862b0c256ccf67a1e182b8188eb0ccc Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Mon, 30 Jun 2025 08:32:12 +0200
Subject: [PATCH] Use ghostty as primary terminal

---
 homes/julian/aspi.nix                           |  4 ++--
 homes/julian/features/ghostty/default.nix       | 17 +++++++++++++++++
 homes/julian/features/hyprland/default.nix      |  2 +-
 .../julian/features/suites/desktop/default.nix  |  2 +-
 homes/julian/kardorf.nix                        |  4 ++--
 5 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 homes/julian/features/ghostty/default.nix

diff --git a/homes/julian/aspi.nix b/homes/julian/aspi.nix
index 0060839..f76a7d0 100644
--- a/homes/julian/aspi.nix
+++ b/homes/julian/aspi.nix
@@ -6,7 +6,7 @@
     ./features/direnv
     ./features/topgrade
     ./features/neovim
-    ./features/kitty
+    ./features/ghostty
     ./features/wezterm
     ./features/yazi
     ./features/emacs
@@ -20,7 +20,7 @@
 
   hostName = "aspi";
   is-nixos = true;
-  terminal = "kitty";
+  terminal = "ghostty";
 
   #  -------   ----------
   # | eDP-1 | | HDMI-A-1 |
diff --git a/homes/julian/features/ghostty/default.nix b/homes/julian/features/ghostty/default.nix
new file mode 100644
index 0000000..501bbfa
--- /dev/null
+++ b/homes/julian/features/ghostty/default.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  programs.ghostty = {
+    enable = true;
+    enableFishIntegration = true;
+    settings = {
+      theme = "catppuccin-mocha";
+      font-size = 12;
+      font-family = "DejaVu Sans";
+    };
+  };
+
+  home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "ghostty") "ghostty";
+}
diff --git a/homes/julian/features/hyprland/default.nix b/homes/julian/features/hyprland/default.nix
index 20687af..f7cd7f5 100644
--- a/homes/julian/features/hyprland/default.nix
+++ b/homes/julian/features/hyprland/default.nix
@@ -280,7 +280,7 @@ in {
           # opening applications
           "$mod, D, exec, wofi --show drun,run"
           "$mod, E, exec, pcmanfm"
-          "$mod, Return, exec, kitty"
+          "$mod, Return, exec, ghostty"
           "$mod, B, exec, firefox"
           "$mod, C, exec, qalculate-gtk"
 
diff --git a/homes/julian/features/suites/desktop/default.nix b/homes/julian/features/suites/desktop/default.nix
index 8e70fe4..44356e0 100644
--- a/homes/julian/features/suites/desktop/default.nix
+++ b/homes/julian/features/suites/desktop/default.nix
@@ -34,7 +34,7 @@
     # geogebra
     cheese
     handbrake
-    kitty # Terminal
+    # kitty # Terminal, already available as feature
     libnotify
     libreoffice
     mate.engrampa
diff --git a/homes/julian/kardorf.nix b/homes/julian/kardorf.nix
index e3edef1..ff91368 100644
--- a/homes/julian/kardorf.nix
+++ b/homes/julian/kardorf.nix
@@ -6,7 +6,7 @@
     ./features/direnv
     ./features/topgrade
     ./features/neovim
-    ./features/kitty
+    ./features/ghostty
     ./features/wezterm
     ./features/yazi
     ./features/emacs
@@ -21,7 +21,7 @@
 
   hostName = "kardorf";
   is-nixos = true;
-  terminal = "kitty";
+  terminal = "ghostty";
 
   #  ---------   ---------
   # | DVI-D-1 | | DVI-D-2 |