diff --git a/configuration.nix b/configuration.nix
index 7b7d8767..bf87d278 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,7 +19,7 @@
     ];
 
   # Allow unfree packages
-  nixpkgs.config.allowUnfree = true; 
+  nixpkgs.config.allowUnfree = true;
 
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
diff --git a/hosts/nixos-laptop/configuration.nix b/hosts/nixos-laptop/configuration.nix
index 1007037c..ed3e84ec 100644
--- a/hosts/nixos-laptop/configuration.nix
+++ b/hosts/nixos-laptop/configuration.nix
@@ -19,6 +19,8 @@
     opengl.enable = true;
     opengl.driSupport32Bit = true;
     opengl.driSupport = true;
+    
+    opengl.extraPackages = with pkgs; [nvidia-vaapi-driver];
 
     nvidia = { 
       open = true;
@@ -35,11 +37,18 @@
     };
   };
 
-  # Enable nVidia graphics
-  services.xserver.videoDrivers = [ "nvidia" ];
+  environment.variables = {
+    GBM_BACKEND = "nvidia-drm";
+    LIBVA_DRIVER_NAME = "nvidia";
+    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+  };
 
   environment.systemPackages = with pkgs; [ 
     # Fingerprint software
     fprintd 
+    # nVidia graphcis options
+    vulkan-loader
+    vulkan-validation-layers
+    vulkan-tools
   ];
 }