From e5b79fcffdcd1f1dbe5923857d0121402a065971 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Fri, 15 Dec 2023 07:19:42 -0700
Subject: [PATCH] europa: switch back to nixos-hw for sleep magic

---
 flake.lock               | 17 +++++++++++++++++
 flake.nix                |  7 ++++++-
 hosts/europa/default.nix |  1 -
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index c45400f..8b0eece 100644
--- a/flake.lock
+++ b/flake.lock
@@ -139,6 +139,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1702453208,
+        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1670751203,
@@ -272,6 +288,7 @@
         "gostart": "gostart",
         "gqrss": "gqrss",
         "microca": "microca",
+        "nixos-hardware": "nixos-hardware",
         "peerix": "peerix",
         "po": "po",
         "pots": "pots",
diff --git a/flake.nix b/flake.nix
index 0769fea..54a8ced 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,8 @@
 
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
 
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
     microca = {
       url = "github:qbit/microca";
       inputs.nixpkgs.follows = "unstable";
@@ -99,6 +101,7 @@
     , xin-secrets
     , xintray
     , simple-nixos-mailserver
+    , nixos-hardware
     , ...
     } @ inputs:
     let
@@ -207,7 +210,9 @@
       devShells.aarch64-darwin.default = xinlib.buildShell darwinPkgs;
 
       nixosConfigurations = {
-        europa = buildSys "x86_64-linux" unstable [ ] "europa";
+        europa = buildSys "x86_64-linux" unstable [
+          nixos-hardware.nixosModules.framework-11th-gen-intel
+        ] "europa";
         pwntie = buildSys "x86_64-linux" stable [ ] "pwntie";
         stan = buildSys "x86_64-linux" unstable [ ] "stan";
         weather = buildSys "aarch64-linux" stable [ ] "weather";
diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix
index 623dc5b..c0a5c4a 100644
--- a/hosts/europa/default.nix
+++ b/hosts/europa/default.nix
@@ -117,7 +117,6 @@ in
     };
     kernelParams = [
       "boot.shell_on_fail"
-      "acpi_osi=\"!Windows 2020\""
     ];
     kernelPackages = pkgs.linuxPackages_latest;
   };