From 63eb8f543a4731bb954d59f6993c3d9fefeac095 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 13 Nov 2023 09:10:04 -0600
Subject: [PATCH] Foxtrot fixes?

---
 flake.lock                |  6 +++---
 nixos/foxtrot/default.nix | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 29c24a6..0e4adeb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -145,11 +145,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1696161939,
-        "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=",
+        "lastModified": 1699701045,
+        "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532",
+        "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
         "type": "github"
       },
       "original": {
diff --git a/nixos/foxtrot/default.nix b/nixos/foxtrot/default.nix
index 2c293ac..e625a04 100644
--- a/nixos/foxtrot/default.nix
+++ b/nixos/foxtrot/default.nix
@@ -21,9 +21,7 @@
       wifi
     ])
     ++ [
-      inputs.hardware.nixosModules.common-cpu-amd
-      # inputs.hardware.nixosModules.common-cpu-amd-pstate
-      inputs.hardware.nixosModules.common-pc-laptop-ssd
+      inputs.hardware.nixosModules.framework-13-7040-amd
     ];
 
   # TODO: hibernation? does sleep suffice?
@@ -34,7 +32,8 @@
       systemd-boot.enable = true;
     };
     kernelPackages = pkgs.linuxPackages_6_5;
-    kernelParams = ["amdgpu.sg_display=0"];
+    # many of these come from https://wiki.archlinux.org/title/Framework_Laptop_13#Suspend
+    kernelParams = ["amdgpu.sg_display=0" "acpi_osi=\"!Windows 2020\"" "nvme.noacpi=1" "rtc_cmos.use_acpi_alarm=1"];
     initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"];
     kernelModules = ["kvm-amd"];
   };
@@ -42,13 +41,12 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   services.printing.enable = true;
   services.fprintd = {
-    enable = true;
+    enable = false;
     # tod.enable = true;
     # tod.driver = pkgs.libfprint-2-tod1-goodix;
   };
-  services.power-profiles-daemon.enable = false;
   services.tlp = {
-    enable = true;
+    enable = false;
     settings = {
       CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
       CPU_SCALING_GOVERNOR_ON_BAT = "powersave";