From 460045679efaf1da7fe8338005434e9b527fae72 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jun 2022 14:11:32 +0000
Subject: [PATCH] Start debugging sleep on rainbowdash

---
 sets/laptop.nix                    | 5 +----
 system/rainbowdash/boot-config.nix | 9 ++++++++-
 system/rainbowdash/default.nix     | 7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sets/laptop.nix b/sets/laptop.nix
index 78d9891..fe0bb99 100644
--- a/sets/laptop.nix
+++ b/sets/laptop.nix
@@ -5,10 +5,7 @@
     ./wifi.nix
   ];
 
-  services = {
-    tlp.enable = true;
-    upower.enable = true;
-  };
+  services.upower.enable = true;
   programs.light.enable = true;
   users.users.artemis.extraGroups = [ "video" ];
 
diff --git a/system/rainbowdash/boot-config.nix b/system/rainbowdash/boot-config.nix
index 5e0b1dd..69ca673 100644
--- a/system/rainbowdash/boot-config.nix
+++ b/system/rainbowdash/boot-config.nix
@@ -3,7 +3,14 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ "mem_sleep_default=deep" ];
+    kernelParams = [ "mem_sleep_default=deep" "initcall_debug" ];
+    kernelPatches = [{
+      name = "debug_acpi";
+      patch = null;
+      extraConfig = ''
+        ACPI_DEBUG y
+      '';
+    }];
     kernel.sysctl."vm.swappiness" = 5;
     cleanTmpDir = true;
     blacklistedKernelModules = [ "psmouse" ];
diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix
index 314b731..6fa6801 100644
--- a/system/rainbowdash/default.nix
+++ b/system/rainbowdash/default.nix
@@ -12,11 +12,15 @@
     ../../sets/1password.nix
     ../../sets/workstation.nix
     ../../sets/krb5.nix
-    inputs.nixos-hardware.nixosModules.dell-xps-13-9380
+    inputs.nixos-hardware.nixosModules.common-cpu-intel
+    inputs.nixos-hardware.nixosModules.common-pc-laptop
+    inputs.nixos-hardware.nixosModules.common-pc-laptop-acpi_call
   ];
 
   boot.supportedFilesystems = [ "nfs4" ];
 
+  services.throttled.enable = true;
+
   # Home
   home-manager.users.artemis = {
     wayland.windowManager.sway.config = {
@@ -39,7 +43,6 @@
     '';
   };
 
-  services.thermald.enable = true;
 
   networking.domain = "manehattan.artem.ist";
   networking.hostName = "rainbowdash";