3 files changed, 33 insertions, 18 deletions
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index c8dae73..847940e 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -1,15 +1,12 @@
 {
   lib,
   pkgs,
-  inputs,
   ...
 }: {
   imports = [
     ./boot.nix
     ./hardware-configuration.nix
-    ./nvidia.nix
-
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
+    ./gpu.nix
   ];
 
   archetypes.personal.enable = true;
@@ -34,6 +31,7 @@
 
   services = {
     flatpak.enable = true;
+    fstrim.enable = true;
     fwupd.enable = true;
   };
 
diff --git a/systems/glados/gpu.nix b/systems/glados/gpu.nix
new file mode 100644
index 0000000..d40a5ff
--- /dev/null
+++ b/systems/glados/gpu.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  services.xserver.videoDrivers = ["nvidia"];
+
+  hardware = {
+    opengl.extraPackages = [pkgs.vaapiVdpau];
+    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.latest;
+      modesetting.enable = true;
+    };
+  };
+
+  specialisation = {
+    nvk.configuration = {
+      boot = {
+        kernelParams = ["nouveau.config=NvGspRm=1"];
+        initrd.kernelModules = ["nouveau"];
+      };
+
+      hardware.opengl.extraPackages = lib.mkForce [];
+
+      services.xserver.videoDrivers = lib.mkForce ["modesetting"];
+
+      system.nixos.tags = ["with-nvk"];
+    };
+  };
+}
diff --git a/systems/glados/nvidia.nix b/systems/glados/nvidia.nix
deleted file mode 100644
index 0885d9a..0000000
--- a/systems/glados/nvidia.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: {
-  imports = [
-    inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
-  ];
-
-  hardware.nvidia = {
-    package = config.boot.kernelPackages.nvidiaPackages.latest;
-    modesetting.enable = true;
-  };
-}