diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index 5c44327..51258c6 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -24,8 +24,12 @@ in
   home.username = "nki";
   home.homeDirectory = "/home/nki";
 
-  # No gpu terminal renderers...
-  programs.my-sway.terminal = "${pkgs.mate.mate-terminal}/bin/mate-terminal";
+  nki.programs.kitty.enable = true;
+  nki.programs.kitty.fontSize = 24;
+  programs.fish.shellInit = lib.mkAfter ''
+    set -eg MESA_GL_VERSION_OVERRIDE
+    set -eg MESA_GLSL_VERSION_OVERRIDE
+  '';
 
   # More packages
   home.packages = (with pkgs; [
diff --git a/overlay.nix b/overlay.nix
index 0186948..be6ea4c 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -22,17 +22,23 @@ let
   };
 
   overlay-aarch64-linux = final: prev:
+    let
+      optionalOverride = pkg: alt:
+        if prev.stdenv.isLinux && prev.stdenv.isAarch64 then alt else pkg;
+    in
     {
-      fd =
-        if prev.system == "aarch64-linux" then
-          prev.fd.overrideAttrs
-            (attrs:
-              {
-                preBuild = ''
-                  export JEMALLOC_SYS_WITH_LG_PAGE=16
-                '';
-              }) else prev.fd;
-
+      fd = optionalOverride prev.fd (prev.fd.overrideAttrs (attrs: {
+        preBuild = ''
+          export JEMALLOC_SYS_WITH_LG_PAGE=16
+        '';
+      }));
+      kitty = optionalOverride prev.kitty (final.writeShellApplication {
+        name = "kitty";
+        runtimeInputs = [ ];
+        text = ''
+          MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 ${prev.kitty}/bin/kitty "$@"
+        '';
+      });
     };
 
   overlay-asahi = inputs.nixos-m1.overlays.default;