summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock2
-rw-r--r--flake.nix4
-rw-r--r--hosts/workstation/default.nix14
-rw-r--r--hosts/workstation/hardware.nix8
4 files changed, 24 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock
index 19b36fc..b9256fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -319,7 +319,7 @@
"webtray": {
"inputs": {
"nixpkgs": [
- "nixpkgs-unstable"
+ "nixpkgs"
]
},
"locked": {
diff --git a/flake.nix b/flake.nix
index 51ad3dc..97fd726 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
};
webtray = {
url = "git+https://git.nathanreiner.xyz/webtray";
- inputs.nixpkgs.follows = "nixpkgs-unstable";
+ inputs.nixpkgs.follows = "nixpkgs";
};
};
@@ -47,7 +47,7 @@
hosts = [
"template"
"nixedo"
- "workstation"
+ "workstation"
];
in
{
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index ae730ae..45fac27 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
{
imports = [
./hardware.nix
@@ -67,5 +67,17 @@
keyname = "n8";
};
+ hardware.opengl = {
+ enable = true;
+ driSupport = true;
+ driSupport32Bit = true;
+ extraPackages = with pkgs; [
+ amdvlk
+ rocmPackages.clr.icd
+ ];
+ };
+
+ environment.systemPackages = with pkgs; [ clinfo ];
+
system.stateVersion = "24.05";
}
diff --git a/hosts/workstation/hardware.nix b/hosts/workstation/hardware.nix
index c9e8c35..d047d2b 100644
--- a/hosts/workstation/hardware.nix
+++ b/hosts/workstation/hardware.nix
@@ -26,6 +26,14 @@
boot.kernelModules = [
"kvm-intel"
"amdgpu"
+ "radeon"
+ "video=DP-1:1920x1080@60"
+ "video=DP-2:1920x1080@60"
+ "video=HDMI-A-1:1920x1080@60"
+ "radeon.si_support=0"
+ "radeon.cik_support=0"
+ "amdgpu.si_support=1"
+ "amdgpu.cik_support=1"
];
boot.extraModulePackages = [ ];
boot.kernelParams = [