From 07712994e0a59201a498ec1815375f80a7aca122 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 7 Nov 2019 10:59:12 +0100
Subject: ma: hardware.enableAllFirmware ->
 hardware.enableRedistributableFirmware

what could possibly go wrong?!
---
 makefu/1systems/darth/config.nix          | 2 +-
 makefu/1systems/repunit/config.nix        | 2 +-
 makefu/1systems/tsp/config.nix            | 2 +-
 makefu/2configs/fs/cac-boot-partition.nix | 3 +--
 makefu/2configs/hw/tp-x2x0.nix            | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix
index 046c1574c..4e71d1426 100644
--- a/makefu/1systems/darth/config.nix
+++ b/makefu/1systems/darth/config.nix
@@ -41,7 +41,7 @@ in {
   makefu.server.primary-itf = "enp0s25";
   # krebs.hidden-ssh.enable = true;
   boot.kernelModules = [ "coretemp" "f71882fg" ];
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   nixpkgs.config.allowUnfree = true;
   networking = {
     wireless.enable = true;
diff --git a/makefu/1systems/repunit/config.nix b/makefu/1systems/repunit/config.nix
index 996abff08..5589cc0a2 100644
--- a/makefu/1systems/repunit/config.nix
+++ b/makefu/1systems/repunit/config.nix
@@ -21,7 +21,7 @@
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
 # networking.firewall is enabled by default
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix
index 2921e2bcf..bbfaebd44 100644
--- a/makefu/1systems/tsp/config.nix
+++ b/makefu/1systems/tsp/config.nix
@@ -34,6 +34,6 @@
     25
   ];
 
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   nixpkgs.config.allowUnfree = true;
 }
diff --git a/makefu/2configs/fs/cac-boot-partition.nix b/makefu/2configs/fs/cac-boot-partition.nix
index 3d59a25dd..14480bc4a 100644
--- a/makefu/2configs/fs/cac-boot-partition.nix
+++ b/makefu/2configs/fs/cac-boot-partition.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 # vda1 ext4 (label nixos) -> only root partition
-with import <stockholm/lib>;
 {
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
@@ -16,6 +15,6 @@ with import <stockholm/lib>;
     fsType = "ext4";
   };
 
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   nixpkgs.config.allowUnfree = true;
 }
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index 564925db5..f4578bf77 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -15,7 +15,7 @@
 
   networking.wireless.enable = lib.mkDefault true;
 
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   nixpkgs.config.allowUnfree = true;
 
   hardware.cpu.intel.updateMicrocode = true;
-- 
cgit v1.2.3