diff --git a/hosts/enka/hardware.nix b/hosts/enka/hardware.nix
index 8b33753..b241054 100644
--- a/hosts/enka/hardware.nix
+++ b/hosts/enka/hardware.nix
@@ -17,14 +17,9 @@ systemConfiguration {
     "xhci_pci"
   ];
 
-  boot.kernelModules = [ "kvm-intel" ];
-
-  imports = [ hardware.nixosModules.common-gpu-nvidia ];
-
-  hardware.nvidia.prime = {
-    intelBusId  = "PCI:0:2:0";
-    nvidiaBusId = "PCI:1:0:0";
-  };
+  boot.kernelModules = [
+    "kvm-intel"
+  ];
 
   fileSystems."/" = {
     device  = "/dev/disk/by-label/root";
diff --git a/hosts/enka/nvidia.nix b/hosts/enka/nvidia.nix
new file mode 100644
index 0000000..bdf65f8
--- /dev/null
+++ b/hosts/enka/nvidia.nix
@@ -0,0 +1,34 @@
+
+{ hardware, lib, ... }: with lib;
+
+systemConfiguration {
+  imports = [ hardware.nixosModules.common-gpu-nvidia ];
+
+  boot.kernelParams = [ "nvidia-drm.fbdev=1" ];
+
+  boot.kernelModules = [
+    "nvidia"
+    "nvidia_drm"
+    "nvidia_modeset"
+    "nvidia_uvm"
+  ];
+
+  hardware.nvidia = {
+    open            = false;
+    powerManagement = enabled;
+
+    prime = {
+      intelBusId  = "PCI:0:2:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+
+  environment.sessionVariables = {
+    GBM_BACKEND               = "nvidia-drm";
+    LIBVA_DRIVER_NAME         = "nvidia";
+    NVD_BACKEND               = "direct";
+    XDG_SESSION_TYPE          = "wayland";
+    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+  };
+}
+
diff --git a/modules/tailscale.nix b/modules/tailscale.nix
index 3c33e9f..e412ed1 100644
--- a/modules/tailscale.nix
+++ b/modules/tailscale.nix
@@ -15,8 +15,5 @@ in systemConfiguration {
     useRoutingFeatures = "both";
   };
 
-  # Breaks with tailscale.
-  systemd.services.NetworkManager-wait-online = disabled;
-
   networking.firewall.trustedInterfaces = [ interface ];
 }