From e795d704d6004e2cc5a4c920e2280eb24c55ef3c Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 2 Jan 2020 18:49:07 +0800
Subject: [PATCH] nixbld: another attempt at using a less shitty wifi card

---
 nixbld-etc-nixos/configuration.nix          |  3 +-
 nixbld-etc-nixos/firmware-linux-nonfree.nix | 32 ---------------------
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 nixbld-etc-nixos/firmware-linux-nonfree.nix

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 2ec21ec..cd283e2 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -7,7 +7,7 @@
 let
   netifWan = "enp0s31f6";
   netifLan = "enp3s0";
-  netifWifi = "wlp4s0";
+  netifWifi = "wlp1s0";
   netifSit = "henet0";
   hydraWwwOutputs = "/var/www/hydra-outputs";
 in
@@ -26,6 +26,7 @@ in
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.blacklistedKernelModules = ["iwlwifi"];
 
   security.apparmor.enable = true;
 
diff --git a/nixbld-etc-nixos/firmware-linux-nonfree.nix b/nixbld-etc-nixos/firmware-linux-nonfree.nix
deleted file mode 100644
index a1a15ba..0000000
--- a/nixbld-etc-nixos/firmware-linux-nonfree.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchgit }:
-
-stdenv.mkDerivation rec {
-  name = "firmware-linux-nonfree-${version}";
-  version = "2019-04-16";
-
-  src = fetchgit {
-    url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    rev = "20190416";
-    sha256 = "1grsxch5x65piqm8zswa7za3zccwxk0sxdm5qpgidmmq729xq3py";
-  };
-
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  # Firmware blobs do not need fixing and should not be modified
-  dontFixup = true;
-
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  outputHash = "1fh6gwdx4paswhpyx8z43kf41l9svicp6ji06pdfhsnbx2l859zi";
-
-  meta = with stdenv.lib; {
-    description = "Binary firmware collection packaged by kernel.org";
-    homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
-    license = licenses.unfreeRedistributableFirmware;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz ];
-    priority = 6; # give precedence to kernel firmware
-  };
-
-  passthru = { inherit version; };
-}