From ee394352615ae01415bf1249b6cd616301cb26e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Thu, 2 Jun 2022 18:07:12 +0200
Subject: [PATCH] :rocket: switch to emacs pgtk

---
 modules/cli/default.nix   | 4 +---
 modules/editors/emacs.nix | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 7dbfe0f..5ed655b 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -12,9 +12,7 @@
     ./spotify.nix
     ./yubikey.nix
   ];
-  modules.cli.shell = let
-    # HACK to fix 24bit color support with kitty
-    editor = "TERM=kitty-direct emacsclient -t -a 'emacs -t'";
+  modules.cli.shell = let editor = "emacsclient -t -a 'emacs -t'";
   in {
     name = "fish";
     abbreviations = {
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index a1601b7..9514f06 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -3,7 +3,7 @@
 with lib;
 let
   myEmacs = with pkgs;
-    ((emacsPackagesFor emacsNativeComp).emacsWithPackages
+    ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages
       (epkgs: [ epkgs.vterm ]));
   cfg = config.modules.editors.emacs;
 in {