From a59facdb0a684dc7166ec52012298be227b16aab Mon Sep 17 00:00:00 2001
From: randogoth <kflux@posteo.de>
Date: Wed, 4 Feb 2026 21:55:34 +0200
Subject: [PATCH] Revert "fix(ghostty): add cairo wrapper and make it the
 default terminal"

This reverts commit 2e58a2d4ad82278d08f652fa28c2e592ccf69c54.
---
 modules/desktop/desktop-entries.nix | 4 ++--
 modules/desktop/gnome-minimal.nix   | 2 +-
 modules/system/packages.nix         | 7 -------
 modules/system/shell.nix            | 6 ++----
 templates/home-home.nix             | 6 +++---
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/modules/desktop/desktop-entries.nix b/modules/desktop/desktop-entries.nix
index ef8f253..1db26e5 100644
--- a/modules/desktop/desktop-entries.nix
+++ b/modules/desktop/desktop-entries.nix
@@ -29,7 +29,7 @@ let
     name = "com.mitchellh.ghostty";
     desktopName = "Terminal";
     genericName = "Terminal Emulator";
-    exec = "ghostty-cairo";
+    exec = "ghostty";
     icon = "com.mitchellh.ghostty";
     categories = [
       "System"
@@ -37,7 +37,7 @@ let
       "Utility"
     ];
     terminal = false;
-    comment = "Terminal (Cairo renderer fallback)";
+    comment = "Fast GPU-accelerated terminal";
   };
 in
 {
diff --git a/modules/desktop/gnome-minimal.nix b/modules/desktop/gnome-minimal.nix
index 4825909..5c9e9ea 100644
--- a/modules/desktop/gnome-minimal.nix
+++ b/modules/desktop/gnome-minimal.nix
@@ -50,7 +50,7 @@ in
 
           "org/gnome/shell/extensions/logo-menu" = {
             menu-button-icon-image = lib.gvariant.mkInt32 51;
-            menu-button-terminal = "ghostty-cairo";
+            menu-button-terminal = "ghostty";
             menu-button-system-monitor = "missioncenter";
             menu-button-extensions-app = "com.mattjakeman.ExtensionManager.desktop";
             hide-softwarecentre = true;
diff --git a/modules/system/packages.nix b/modules/system/packages.nix
index 00a38be..e738730 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -1,11 +1,5 @@
 { lib, pkgs, ... }:
 
-let
-  ghosttyCairo = pkgs.writeShellScriptBin "ghostty-cairo" ''
-    export GSK_RENDERER=cairo
-    exec ghostty "$@"
-  '';
-in
 {
   # Baseline system tools available everywhere; users run Home Manager standalone.
   config.environment.systemPackages = lib.mkAfter [
@@ -17,7 +11,6 @@ in
     pkgs.fastfetch
     pkgs.flatpak
     pkgs.ghostty
-    ghosttyCairo
     pkgs.git
     pkgs.home-manager
     pkgs.just
diff --git a/modules/system/shell.nix b/modules/system/shell.nix
index da80556..86e7b49 100644
--- a/modules/system/shell.nix
+++ b/modules/system/shell.nix
@@ -24,11 +24,9 @@ in
   ];
 
   # Use Ghostty as the default terminal emulator.
-  # On some machines Ghostty may fail to acquire an OpenGL context; `ghostty-cairo`
-  # forces GTK4's Cairo renderer (CPU) and is more hardware-agnostic.
   environment.sessionVariables = {
-    TERMINAL = "ghostty-cairo";
-    DEFAULT_TERMINAL = "ghostty-cairo";
+    TERMINAL = "${pkgs.ghostty}/bin/ghostty";
+    DEFAULT_TERMINAL = "${pkgs.ghostty}/bin/ghostty";
   };
 
   programs.bash = {
diff --git a/templates/home-home.nix b/templates/home-home.nix
index 9f78f5e..e59fd49 100644
--- a/templates/home-home.nix
+++ b/templates/home-home.nix
@@ -97,7 +97,7 @@
 
       [no-cd]
       switch:
-          home-manager switch --flake ~/.config/home-manager#$USER
+home-manager switch --flake ~/.config/home-manager#$USER
 
       [no-cd]
       rebuild:
@@ -111,8 +111,8 @@
 
   home.sessionVariables = {
     # you can change the default terminal and editor here
-    TERMINAL = "ghostty-cairo";
-    DEFAULT_TERMINAL = "ghostty-cairo";
+    TERMINAL = "${pkgs.ghostty}/bin/ghostty";
+    DEFAULT_TERMINAL = "${pkgs.ghostty}/bin/ghostty";
     EDITOR = "micro";
     DBX_CONTAINER_HOME_PREFIX = "$HOME/distrobox";
   };