diff --git a/home-manager/becky-dingleberry.nix b/home-manager/becky-dingleberry.nix
index c8604ef..53a81de 100644
--- a/home-manager/becky-dingleberry.nix
+++ b/home-manager/becky-dingleberry.nix
@@ -72,6 +72,27 @@ in
     viu
   ];
 
+  xdg.configFile = lib.mkMerge [
+    {
+      "ghostty/config" = {
+        text = ''
+          font-size = 10
+          theme = catppuccin-mocha
+          window-height = 9999
+          window-width = 9999
+        '';
+      };
+    }
+  ];
+
+  # TODO: Manual ghostty injection
+  programs.bat.syntaxes.ghostty = {
+    src = pkgs.ghostty;
+    file = "share/bat/syntaxes/ghostty.sublime-syntax";
+  };
+
+  programs.vim.plugins = lib.mkMerge [ pkgs.ghostty.vim ];
+
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
@@ -101,23 +122,24 @@ in
     };
   };
 
-  programs.ghostty = {
-    enable = true;
+  # Can't use the nixgl wrapper due to GTK libraries
+  # programs.ghostty = {
+  #   enable = true;
 
-    installBatSyntax = true;
-    installVimSyntax = true;
-    enableZshIntegration = true;
+  #   installBatSyntax = true;
+  #   installVimSyntax = true;
+  #   enableZshIntegration = true;
 
-    package = config.lib.nixGL.wrap pkgs.ghostty;
+  #   package = config.lib.nixGL.wrap pkgs.ghostty;
 
-    settings = {
-      theme = "catppuccin-mocha";
-      font-size = 10;
-      window-width = 9999;
-      window-height = 9999;
-      keybind = [ ];
-    };
-  };
+  #   settings = {
+  #     theme = "catppuccin-mocha";
+  #     font-size = 10;
+  #     window-width = 9999;
+  #     window-height = 9999;
+  #     keybind = [ ];
+  #   };
+  # };
 
   programs.htop = {
     enable = true;
@@ -191,11 +213,6 @@ in
     enableZshIntegration = true;
   };
 
-  # programs.spotify-player = {
-  #   enable = true;
-  #   package = config.lib.nixGL.wrap pkgs.spotify-player;
-  # };
-
   # TODO: Configure
   # programs.ssh = {
   #   enable = true;
@@ -248,6 +265,11 @@ in
 
       source <(kubectl completion zsh)
       complete -C '/usr/local/bin/aws_completer' aws
+
+      # Manual ghostty injection
+      if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then
+        source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration
+      fi
     '';
   };