diff --git a/hosts/nero/configuration.nix b/hosts/nero/configuration.nix
index 58016f9..23099fc 100644
--- a/hosts/nero/configuration.nix
+++ b/hosts/nero/configuration.nix
@@ -4,7 +4,10 @@
   ...
 }:
 let
-  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  unstable = import inputs.nixpkgs-unstable {
+    system = pkgs.stdenv.hostPlatform.system;
+    config.allowUnfree = true;
+  };
 
   wivrn-overlay = _final: _prev: {
     inherit (unstable) wivrn;
@@ -25,15 +28,17 @@ in
 
   boot = {
     kernelParams = [
-      "vfio-pci.ids=10de:2782,10de:22bc"
       "video=DP-2:1152x864@75"
-      "amdgpu.dcfeaturemask=0x402"
     ];
   };
 
   networking.hostName = "nero";
 
   services = {
+    xserver = {
+      videoDrivers = [ "nvidia" ];
+    };
+
     flatpak = {
       packages = [
         {
@@ -76,18 +81,6 @@ in
       openFirewall = true;
       autoStart = true;
     };
-
-    sunshine = {
-      enable = true;
-      autoStart = true;
-      capSysAdmin = true;
-      openFirewall = true;
-
-      settings = {
-        encoder = "vulkan";
-        output_name = 3;
-      };
-    };
   };
 
   programs = {
@@ -140,11 +133,11 @@ in
       lsfg-vk-ui
 
       unstable.qbittorrent
+      unstable.aseprite
 
       inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default
       inputs.xivlauncher-rb.packages.${pkgs.stdenv.hostPlatform.system}.default
 
-      (callPackage ../../packages/aseprite/package.nix { })
       (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { inherit unstable; })
       (callPackage ../../packages/undertale-mod-tool/package.nix { })
     ];
diff --git a/hosts/nero/hardware.nix b/hosts/nero/hardware.nix
index 13d8678..a389305 100644
--- a/hosts/nero/hardware.nix
+++ b/hosts/nero/hardware.nix
@@ -79,6 +79,15 @@
   hardware = {
     bluetooth.enable = true;
     cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    graphics.extraPackages = with pkgs; [ mesa.opencl ];
+
+    nvidia = {
+      open = true;
+      modesetting.enable = true;
+    };
+
+    graphics = {
+      enable = true;
+      extraPackages = with pkgs; [ mesa.opencl ];
+    };
   };
 }
diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix
index 6666192..d80d4cb 100644
--- a/hosts/shared/nixos-pc.nix
+++ b/hosts/shared/nixos-pc.nix
@@ -19,10 +19,6 @@ in
 
     consoleLogLevel = 3;
 
-    #kernelPackages =
-    #  inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-bore-lto-x86_64-v3;
-    kernelPackages = pkgs.linuxPackages_latest;
-
     extraModulePackages = [ config.boot.kernelPackages.kvmfr ];
 
     kernelParams = [