"fix" caches

flake.nix

@@ -30,8 +30,13 @@
     pkgs = import nixpkgs {
       inherit system;
       config = {
-        allowUnfree = true;
-        rocmSupport = true;
+        allowUnfreePredicate = pkg:
+          builtins.elem (nixpkgs.lib.getName pkg) [
+            "discord"
+            "samsung-UnifiedLinuxDriver"
+            "steam"
+            "steam-unwrapped"
+          ];
       };
     };
   in {

hosts/MaxNixosLaptop/configuration.nix

@@ -26,10 +26,14 @@
   # NIXOS
   nix.settings = {
     experimental-features = ["nix-command" "flakes"];
-    substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org"];
+    substituters = ["https://cache.nixos.org" "https://nix-community.cachix.org"];
     trusted-public-keys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
+    auto-optimise-store = true;
+    max-jobs = "auto";
+    cores = 12;
   };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -57,7 +61,6 @@
     wget
     fprintd
     qemu
-    quickemu
     home-manager
     (let
       base = appimageTools.defaultFhsEnvArgs;
@@ -150,7 +153,6 @@
     enable = true;
     packages = with pkgs; [
       picoprobe-udev-rules
-      teensy-udev-rules
       qmk-udev-rules
       game-devices-udev-rules
       android-udev-rules
@@ -190,10 +192,6 @@
       "musnix"
       "--commit-lock-file"
       "-L"
-      "--cores"
-      "12"
-      "-j"
-      "12"
     ];
     dates = "daily";
     randomizedDelaySec = "45min";
@@ -207,7 +205,6 @@
     randomizedDelaySec = "45min";
     options = "--delete-older-than 14d";
   };
-  nix.settings.auto-optimise-store = true;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

modules/nixos/gpu/amd.nix

@@ -14,8 +14,18 @@ in {
     boot.initrd.kernelModules = ["amdgpu"];
     services.xserver.videoDrivers = ["amdgpu"];
 
-    systemd.tmpfiles.rules = [
-      "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
+    systemd.tmpfiles.rules = let
+      rocmEnv = pkgs.symlinkJoin {
+        name = "rocm-combined";
+        paths = with pkgs.rocmPackages; [
+          rocblas
+          hipblas
+          rocm-smi
+          clr
+        ];
+      };
+    in [
+      "L+    /opt/rocm   -    -    -     -    ${rocmEnv}"
     ];
 
     hardware.graphics = {
@@ -23,7 +33,6 @@ in {
       enable32Bit = true;
       extraPackages = with pkgs; [
         rocmPackages.clr.icd
-        rocmPackages.rocm-smi
         amdvlk
       ];
       extraPackages32 = with pkgs; [