From d2d9a58a5c03ea15b401c186508c171c07f9c4f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 21 Aug 2021 09:22:25 +0100
Subject: [PATCH] remove systemd-boot from hardware profiles (#307)

- We should not enable canTouchEfiVariables by default as this
  wears out the EFI storage.
- We should not set systemd-boot as default. This is up to the user to
  decide. There are exceptions when hardware only supports specific
  bootloaders so.
---
 apple/macbook-pro/10-1/default.nix | 4 ----
 dell/xps/13-9360/default.nix       | 6 ------
 dell/xps/15-9560/xps-common.nix    | 4 ----
 3 files changed, 14 deletions(-)

diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix
index e029ef2..4d31b1c 100644
--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@@ -6,10 +6,6 @@
     ../../../common/pc/laptop/ssd
   ];
 
-  # TODO: boot loader
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   # TODO: reverse compat
   hardware.opengl.driSupport32Bit = true;
 
diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix
index 68eedc8..f40f6e0 100644
--- a/dell/xps/13-9360/default.nix
+++ b/dell/xps/13-9360/default.nix
@@ -8,12 +8,6 @@
 
   boot.blacklistedKernelModules = [ "psmouse" ]; # touchpad goes over i2c
 
-  # TODO: decide on boot loader policy
-  boot.loader = {
-    efi.canTouchEfiVariables = lib.mkDefault true;
-    systemd-boot.enable = lib.mkDefault true;
-  };
-
   # This will save you money and possibly your life!
   services.thermald.enable = true;
 }
diff --git a/dell/xps/15-9560/xps-common.nix b/dell/xps/15-9560/xps-common.nix
index 62aae07..a8361ce 100644
--- a/dell/xps/15-9560/xps-common.nix
+++ b/dell/xps/15-9560/xps-common.nix
@@ -1,10 +1,6 @@
 { lib, ... }:
 
 {
-
-  # Boot loader
-  boot.loader.systemd-boot.enable = lib.mkDefault true;
-  boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
   boot.kernelParams = lib.mkDefault [ "acpi_rev_override" ];
 
   # This will save you money and possibly your life!