diff --git a/hosts/architect/sunshine.nix b/hosts/architect/sunshine.nix
index bc9d70d..74801e0 100644
--- a/hosts/architect/sunshine.nix
+++ b/hosts/architect/sunshine.nix
@@ -38,22 +38,19 @@ let
   sunshinePkg = (pkgs.unstablePkgs.sunshine.override { cudaSupport = true; });
 in
 {
+  pepe.core.graphics = {
+    enable = true;
+    nvidia = true;
+  };
+
   boot.kernelModules = [ "uinput" ];
 
   environment.systemPackages = with pkgs.unstablePkgs; [ gamemode heroic ];
 
   hardware = {
     pulseaudio.enable = false;
-
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = false;
-      powerManagement.finegrained = false;
-      open = false;
-      nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.latest;
-    };
   };
+
   systemd.services.NetworkManager-wait-online.enable = pkgs.lib.mkForce false;
   programs.steam = {
     enable = true;
@@ -159,7 +156,6 @@ in
 
     xserver = {
       enable = true;
-      videoDrivers = [ "nvidia" ];
       desktopManager.xfce.enable = true;
 
       monitorSection = ''
diff --git a/modules/core/graphics.nix b/modules/core/graphics.nix
index daa2c47..ed060bc 100644
--- a/modules/core/graphics.nix
+++ b/modules/core/graphics.nix
@@ -12,9 +12,27 @@ in
   };
 
   config = mkIf cfg.enable {
-    hardware.opengl = {
-      enable = true;
-      extraPackages = with pkgs; mkIf cfg.nvidia [ vaapiVdpau ];
+    hardware = {
+      graphics = {
+        enable = true;
+        extraPackages = with pkgs; mkIf cfg.nvidia [ vaapiVdpau ];
+      };
+
+      nvidia = mkIf cfg.nvidia {
+        modesetting.enable = true;
+        powerManagement.enable = false;
+        powerManagement.finegrained = false;
+        open = false;
+        nvidiaSettings = true;
+        package = config.boot.kernelPackages.nvidiaPackages.latest;
+      };
+    };
+
+    services = {
+      xserver = {
+        enable = true;
+        videoDrivers = mkIf cfg.nvidia [ "nvidia" ];
+      };
     };
   };
 }