From d4688911b7856e69368d4d20e27bf9fb6e4d8d9c Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Fri, 22 Dec 2017 13:33:54 +0300
Subject: [PATCH] treewide: drop hardware-configuration.nix boilerplate (#28)

hardware-configuration.nix is still relied upon for hard drive
configuration, and it handles variations of hardware (custom
configurations, subrevisions).
---
 apple/macbook-pro-10-1.nix | 14 --------------
 dell/xps-15-9550.nix       | 15 ---------------
 lenovo/thinkpad/t460s.nix  | 11 -----------
 3 files changed, 40 deletions(-)

diff --git a/apple/macbook-pro-10-1.nix b/apple/macbook-pro-10-1.nix
index f9ba24d..797404e 100644
--- a/apple/macbook-pro-10-1.nix
+++ b/apple/macbook-pro-10-1.nix
@@ -5,20 +5,6 @@
     [ ../lib/kernel-version.nix
     ];
 
-  ## BEGIN from generated hardware-configuration
-  ## Probably better to just use a freshly generated hardware.configuration.nix
-  ## than this, but including for reference.
-  #imports =
-  #  [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-  #  ];
-  #
-  #boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sdhci_pci" ];
-  #boot.kernelModules = [ "kvm-intel" "wl" ];
-  #boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-  #
-  #nix.maxJobs = lib.mkDefault 8;
-  ## END from generated hardware-configuration
-
   # Use the systemd-boot efi boot loader. (From default generated configuration.nix)
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix
index ac935ac..04f7174 100644
--- a/dell/xps-15-9550.nix
+++ b/dell/xps-15-9550.nix
@@ -5,21 +5,6 @@
     [ ../lib/kernel-version.nix
     ];
 
-  ## BEGIN from generated hardware-configuration
-  ## Probably better to just use a freshly generated hardware.configuration.nix
-  ## than this, but including for reference.
-  #imports =
-  #  [ <nixos/modules/hardware/network/broadcom-43xx.nix>
-  #    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-  #  ];
-  #
-  #boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ];
-  #boot.kernelModules = [ "kvm-intel" ];
-  #boot.extraModulePackages = [ ];
-  #
-  #nix.maxJobs = 8;
-  ## END from generated hardware-configuration
-
   # Use the systemd-boot efi boot loader. (From default generated configuration.nix)
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/lenovo/thinkpad/t460s.nix b/lenovo/thinkpad/t460s.nix
index d6f2ba3..fbcdef7 100644
--- a/lenovo/thinkpad/t460s.nix
+++ b/lenovo/thinkpad/t460s.nix
@@ -6,17 +6,6 @@
       ./general-intel.nix
     ];
 
-  ## BEGIN from generated hardware-configuration
-  ## Probably better to just use a freshly generated hardware.configuration.nix
-  ## than this, but including for reference.
-  # boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  # boot.kernelModules = [ "kvm-intel" ];
-  # boot.extraModulePackages = [  ];
-  #
-  #
-  # nix.maxJobs = lib.mkDefault 4;
-  ## END from generated hardware-configuration
-
   # Use the gummiboot efi boot loader. (From default generated configuration.nix)
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;