diff --git a/flake.nix b/flake.nix
index 3d8882b..4b25f17 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     _1password-shell-plugins.url = "github:1Password/shell-plugins";
+    nixgl = {
+      url = "github:nix-community/nixGL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -77,7 +81,10 @@
 
         home-manager = {
           useUserPackages = true;
-          extraSpecialArgs = { inherit inputs; };
+          extraSpecialArgs = { 
+            inherit inputs; 
+            nixgl-pkgs = inputs.nixgl.packages.${system};
+          };
           users = {
             ${config.user} = {
               imports = mkhomeManagerModules config;
diff --git a/homeManagerModules/ghostty.nix b/homeManagerModules/ghostty.nix
index f8ae8b6..6f3ffde 100644
--- a/homeManagerModules/ghostty.nix
+++ b/homeManagerModules/ghostty.nix
@@ -1,19 +1,13 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, nixgl-pkgs, ... }:
 {
   home.sessionVariables = lib.mkIf (config.enableShell && config.graphical) {
     TERMINAL = "ghostty";
   };
   
-  # https://github.com/nix-community/nixGL?tab=readme-ov-file#nix-channel-recommended
-  # nix-channel --add https://github.com/nix-community/nixGL/archive/main.tar.gz nixgl && nix-channel --update
-  nixGL.packages = import <nixgl> { inherit pkgs; };
-  nixGL.defaultWrapper = "mesa";
-  nixGL.installScripts = [ "mesa" ];
-
   programs.ghostty = lib.mkIf (config.enableShell && config.graphical) {
     enable = true;
     enableZshIntegration = true;
-    package = config.lib.nixGL.wrap pkgs.ghostty;
+    package = nixgl-pkgs.nixGLMesa pkgs.ghostty;
     settings = {
       # command = "TERM=xterm-256color /usr/bin/bash";
       font-size = 12;