From de8271f760987a29a8a181675d7b36cb3f324f11 Mon Sep 17 00:00:00 2001
From: Reed Riley <reed@riley.engineer>
Date: Fri, 20 May 2022 11:05:03 -0400
Subject: [PATCH 1/2] framework: make it possible to disable fprintd if desired

---
 framework/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/default.nix b/framework/default.nix
index ecbbfcb..84797b3 100644
--- a/framework/default.nix
+++ b/framework/default.nix
@@ -20,7 +20,7 @@
   '';
 
   # For fingerprint support
-  services.fprintd.enable = true;
+  services.fprintd.enable = lib.mkDefault true;
 
   # Fix headphone noise when on powersave
   # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55

From 4a8259f0e255d0406728a4ff250b18aecf7eceeb Mon Sep 17 00:00:00 2001
From: Reed Riley <reed@riley.engineer>
Date: Thu, 19 May 2022 09:43:13 -0400
Subject: [PATCH 2/2] framework: add nvme.noacpi=1

---
 framework/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/framework/default.nix b/framework/default.nix
index 84797b3..431d23b 100644
--- a/framework/default.nix
+++ b/framework/default.nix
@@ -5,9 +5,14 @@
     ../common/pc/laptop/ssd
   ];
 
-  # For Power consumption
-  # https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html
-  boot.kernelParams = [ "mem_sleep_default=deep" ];
+  boot.kernelParams = [
+    # For Power consumption
+    # https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html
+    "mem_sleep_default=deep"
+    # For Power consumption
+    # https://community.frame.work/t/linux-battery-life-tuning/6665/156
+    "nvme.noacpi=1"
+  ];
 
   # Requires at least 5.16 for working wi-fi and bluetooth.
   # https://community.frame.work/t/using-the-ax210-with-linux-on-the-framework-laptop/1844/89