From 9754c6d33258b7800dcb1187a0951128ab86b319 Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Wed, 17 Aug 2022 14:10:45 -0300
Subject: [PATCH 1/2] nixos/fwupd: migrate to uefi_capsule.conf

In version 1.5.5 of fwupd the uefi plugin was renamed to
uefi-capsule. As part of those changes the configuration file was
renamed and changed.

This modules configuration mismatch was generally hidden because
when udisks2 is enabled fwupd will use that instead. Without
udisks2 the following warning is seen:

    WARNING: UEFI ESP partition not detected or configured
---
 nixos/modules/services/hardware/fwupd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index eb5f6dcf8fd0..c8498524ed79 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -15,9 +15,9 @@ let
         DisabledPlugins=${lib.concatStringsSep ";" cfg.disabledPlugins}
       '';
     };
-    "fwupd/uefi.conf" = {
-      source = pkgs.writeText "uefi.conf" ''
-        [uefi]
+    "fwupd/uefi_capsule.conf" = {
+      source = pkgs.writeText "uefi_capsule.conf" ''
+        [uefi_capsule]
         OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint}
       '';
     };

From 7b0b92f5a99b359e89262d999e24b0e9183d3a60 Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Fri, 19 Aug 2022 12:53:34 -0300
Subject: [PATCH 2/2] Revert "nixos/fwupd: enable udisks2"

This reverts commit fb5bceb3ff3b99f6531908f46526cb55c7d29eac.

Reverted at the request of the author, Bernardo Meurer, to avoid
requiring udisks2 for fwupd to work.
---
 nixos/modules/services/hardware/fwupd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index c8498524ed79..fe00cd1e32b6 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -125,8 +125,6 @@ in {
 
     services.udev.packages = [ cfg.package ];
 
-    services.udisks2.enable = true;
-
     systemd.packages = [ cfg.package ];
   };