pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

nord: migrate to 2311

This commit is contained in:
Peder Bergebakken Sundt 2024-01-11 21:57:25 +01:00
parent 8ba4dbbcc5
commit a60075ff6e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -198,7 +198,7 @@
#hostname "domain" "system" inputs "state" [ modules ... ] #hostname "domain" "system" inputs "state" [ modules ... ]
noximilien = mk "pbsds.net" "x86_64-linux" inputs-2311 "22.11" [ intel ]; noximilien = mk "pbsds.net" "x86_64-linux" inputs-2311 "22.11" [ intel ];
brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ amd ]; brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ amd ];
nord = mk "pbsds.net" "x86_64-linux" inputs-2305 "23.05" [ intel-novga hw.common-cpu-intel-sandy-bridge rocm hidpi ]; nord = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.05" [ intel-novga hw.common-cpu-intel-sandy-bridge rocm hidpi ];
sopp = mk "pbsds.net" "x86_64-linux" inputs-2305 "23.05" [ intel cuda p1005 ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-2305 "23.05" [ intel cuda p1005 ];
bolle = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ]; bolle = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ];
eple = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ]; eple = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ];

15
hardware/gpu/rocm.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
# assumes common-gpu-amd from nixos-hardware is also added # assumes common-gpu-amd from nixos-hardware is also added
# TODO: should we move it from flake.nix to here? # TODO: should we move it from flake.nix to here?
@ -16,7 +16,10 @@
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages = [ hardware.opengl.extraPackages = [
pkgs.rocm-opencl-icd pkgs.rocm-opencl-icd
pkgs.rocm-runtime#-ext (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11")
then pkgs.rocm-runtime#-ext
else pkgs.rocmPackages.rocm-runtime
)
]; ];
nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ? nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ?
@ -25,8 +28,12 @@
nixpkgs.config.vaapiSupport = true; nixpkgs.config.vaapiSupport = true;
# https://nixos.wiki/wiki/AMD_GPU#HIP # https://nixos.wiki/wiki/AMD_GPU#HIP
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = let
"L+ /opt/rocm/hip - - - - ${pkgs.hip}" hip = if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11")
then pkgs.hip
else pkgs.rocmPackages.clr;
in [
"L+ /opt/rocm/hip - - - - ${hip}"
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [