diff --git a/flake.lock b/flake.lock index 2671746..fd4412d 100644 --- a/flake.lock +++ b/flake.lock @@ -530,18 +530,17 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718207430, - "narHash": "sha256-/eO2NTRvrrdYWMI06plS8ANDGOhTZBA+C3H3KwbBI1w=", - "ref": "refs/heads/master", - "rev": "9e848e173ca83adf884815c66edc08652ef9ade8", - "revCount": 1712, - "type": "git", - "url": "https://github.com/NixOS/nixos-hardware.git" + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "type": "github" }, "original": { - "rev": "9e848e173ca83adf884815c66edc08652ef9ade8", - "type": "git", - "url": "https://github.com/NixOS/nixos-hardware.git" + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index 5ac30b0..5cebcef 100644 --- a/flake.nix +++ b/flake.nix @@ -34,8 +34,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # nixos hardware for nixos 23.11 - nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware.git?rev=9e848e173ca83adf884815c66edc08652ef9ade8"; + nixos-hardware.url = "github:NixOS/nixos-hardware"; ## TLMS stuff below trekkie = { @@ -299,7 +298,7 @@ apps."x86_64-linux" = (import ./pkgs/deployment.nix { inherit self pkgs lib; }); nixosConfigurations = lib.attrsets.mapAttrs (name: value: - (if (name == "notice-me-senpai" || name == "tetra-zw") then (nixpkgs-2311.lib.nixosSystem value) else (nixpkgs.lib.nixosSystem value))) unevaluatedNixosConfigurations; + (if (name == "notice-me-senpai") then (nixpkgs-2311.lib.nixosSystem value) else (nixpkgs.lib.nixosSystem value))) unevaluatedNixosConfigurations; hydraJobs = let diff --git a/hardware/tetra-zw.nix b/hardware/tetra-zw.nix index 31d1ebd..f416876 100644 --- a/hardware/tetra-zw.nix +++ b/hardware/tetra-zw.nix @@ -50,12 +50,26 @@ enable = true; driSupport = true; driSupport32Bit = true; + extraPackages = with pkgs; [ + rocmPackages.clr.icd + rocmPackages.clr + rocmPackages.rocminfo + rocmPackages.rocm-runtime + rocm-opencl-icd + rocmPackages.rocm-smi + ]; }; - hardware.amdgpu.opencl = true; - hardware.amdgpu.loadInInitrd = true; + nixpkgs.config.allowUnfree = true; + hardware.enableAllFirmware = true; + + hardware.amdgpu.opencl.enable = true; nixpkgs.config.rocmSupport = true; + systemd.tmpfiles.rules = [ + "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + ]; + # Adjust power limits of the processor systemd.services."adjust-power-limits" = { enable = true;