diff --git a/flake.lock b/flake.lock
index ab235a8..5cba7a0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -364,15 +364,15 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1783284634,
-        "narHash": "sha256-COKtJ+SAIHYsMIheVWCn2e4IrBncdivwxcZLAf7IlNI=",
-        "owner": "ghostty-org",
+        "lastModified": 1783580960,
+        "narHash": "sha256-41eBs4g66qLFEa6esgaCAs1hp1et5551Tqs/jriyI3c=",
+        "owner": "moons-14",
         "repo": "ghostty",
-        "rev": "b213a72c03b427607b43c89ff4223a7baa079fe8",
+        "rev": "6260e9da0baba6c94c3e8f537558bc69085229b9",
         "type": "github"
       },
       "original": {
-        "owner": "ghostty-org",
+        "owner": "moons-14",
         "repo": "ghostty",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index b45cc3d..ec39d72 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,9 @@
     };
 
     # Terminal
-    ghostty.url = "github:ghostty-org/ghostty";
+    ghostty = {
+      url = "github:moons-14/ghostty";
+    };
 
     # Shell / Launcher
     vicinae.url = "github:vicinaehq/vicinae";
diff --git a/modules/applications/ghostty/home.nix b/modules/applications/ghostty/home.nix
index 02fdc1a..28f4668 100644
--- a/modules/applications/ghostty/home.nix
+++ b/modules/applications/ghostty/home.nix
@@ -1,10 +1,16 @@
 {
+  pkgs,
   lib,
   config,
+  inputs,
   ...
 }:
 let
   cfg = config.my.applications.ghostty.homeManager;
+
+  system = pkgs.stdenv.hostPlatform.system;
+
+  ghosttyPkg = inputs.ghostty.packages.${system}.ghostty-releasefast;
 in
 {
   options.my.applications.ghostty.homeManager = {
@@ -19,6 +25,8 @@ in
           programs.ghostty = {
             enable = true;
 
+            package = ghosttyPkg;
+
             systemd.enable = true;
 
             settings = {
@@ -51,20 +59,14 @@ in
                 # Font size
                 "ctrl+shift+semicolon=increase_font_size:1"
                 "ctrl+shift+minus=decrease_font_size:1"
-
-                # Quick terminal
-                "global:super+space=toggle_quick_terminal"
               ];
 
               # Quick terminal
               quick-terminal-position = "top";
-
               quick-terminal-size = "100%";
 
               gtk-quick-terminal-layer = "overlay";
-
               quick-terminal-keyboard-interactivity = "exclusive";
-
               quick-terminal-autohide = false;
 
               quit-after-last-window-closed = false;
diff --git a/modules/applications/ghostty/system.nix b/modules/applications/ghostty/system.nix
index e975fa0..3791a3f 100644
--- a/modules/applications/ghostty/system.nix
+++ b/modules/applications/ghostty/system.nix
@@ -2,10 +2,15 @@
   pkgs,
   lib,
   config,
+  inputs,
   ...
 }:
 let
   cfg = config.my.applications.ghostty.system;
+
+  system = pkgs.stdenv.hostPlatform.system;
+
+  ghosttyPkg = inputs.ghostty.packages.${system}.ghostty-releasefast;
 in
 {
   options.my.applications.ghostty.system = {
@@ -13,9 +18,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      ghostty # A fast and minimal terminal emulator for Wayland
-      ghostty.terminfo # Terminfo database for ghostty
+    environment.systemPackages = [
+      ghosttyPkg # A fast and minimal terminal emulator for Wayland
+      ghosttyPkg.terminfo # Terminfo database for ghostty
     ];
   };
 }
diff --git a/modules/applications/niri/home.nix b/modules/applications/niri/home.nix
index 6d9458e..e969764 100644
--- a/modules/applications/niri/home.nix
+++ b/modules/applications/niri/home.nix
@@ -137,6 +137,13 @@ in
               ];
               hotkey-overlay.title = "Clipboard History";
             };
+            "Mod+Space" = {
+              action.spawn = [
+                "ghostty"
+                "+toggle-quick-terminal"
+              ];
+              hotkey-overlay.title = "Toggle Quick Terminal: ghostty";
+            };
 
             # Focus monitor
             "Mod+Shift+Left" = {