summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/bismuth/default.nix3
-rw-r--r--machines/moissanite/default.nix2
-rw-r--r--modules/hardware/amd-gpu.nix31
-rw-r--r--modules/hardware/arm.nix (renamed from modules/arm.nix)0
-rw-r--r--modules/hardware/nvidia-gpu.nix (renamed from modules/nvidia.nix)0
5 files changed, 33 insertions, 3 deletions
diff --git a/machines/bismuth/default.nix b/machines/bismuth/default.nix
index 7838ce0..02fda0f 100644
--- a/machines/bismuth/default.nix
+++ b/machines/bismuth/default.nix
@@ -6,8 +6,7 @@
     ./devices.nix
 
     ../../modules/binary-cache.nix
-    # ../../modules/syncthing.nix
-    ../../modules/nvidia.nix
+    ../../modules/hardware/amd-gpu.nix
   ];
 
   # expose vm web interface to tailnet
diff --git a/machines/moissanite/default.nix b/machines/moissanite/default.nix
index 322c1ac..bc4c098 100644
--- a/machines/moissanite/default.nix
+++ b/machines/moissanite/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../modules/arm.nix
+    ../../modules/hardware/arm.nix
     ../../modules/work
 
     ./hardware.nix
diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix
new file mode 100644
index 0000000..cfaa974
--- /dev/null
+++ b/modules/hardware/amd-gpu.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+
+    # use amdvlk in conjunction with amdgpu,
+    # applications can choose which one to use.
+    extraPackages = with pkgs; [ amdvlk ];
+    extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
+  };
+
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
+  hardware.amdgpu = {
+    opencl.enable = true;
+    initrd.enable = true;
+    overdrive.enable = false;
+    legacySupport.enable = false;
+  };
+
+  services.lact.enable = true;
+  environment.systemPackages = with pkgs; [
+    lact
+    clinfo
+  ];
+}
diff --git a/modules/arm.nix b/modules/hardware/arm.nix
index 63a448f..63a448f 100644
--- a/modules/arm.nix
+++ b/modules/hardware/arm.nix
diff --git a/modules/nvidia.nix b/modules/hardware/nvidia-gpu.nix
index dae9fb5..dae9fb5 100644
--- a/modules/nvidia.nix
+++ b/modules/hardware/nvidia-gpu.nix