From 7076809a17452ac418a411c55dccabfe6c7092c6 Mon Sep 17 00:00:00 2001
From: Astrid Yu <astrid@astrid.tech>
Date: Fri, 8 Mar 2024 19:05:40 -0800
Subject: [PATCH 1/2] fix the surface pro intel thing

---
 machines/shai-hulud/configuration.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/machines/shai-hulud/configuration.nix b/machines/shai-hulud/configuration.nix
index c7b5e42e..68a1f8a2 100644
--- a/machines/shai-hulud/configuration.nix
+++ b/machines/shai-hulud/configuration.nix
@@ -3,10 +3,8 @@ inputs:
 with lib; {
   imports = [ ./hardware-configuration.nix ]
     ++ (with inputs.nixos-hardware.nixosModules; [
-      common-cpu-intel
       common-pc-ssd
       microsoft-surface-common
-      microsoft-surface-pro-intel
     ]) ++ [
       inputs.self.nixosModules.laptop
       inputs.self.nixosModules.pc

From 777969d38d6d46b2b5c487b9dbe956ed952199e1 Mon Sep 17 00:00:00 2001
From: Astrid Yu <astrid@astrid.tech>
Date: Fri, 8 Mar 2024 21:40:59 -0800
Subject: [PATCH 2/2] Add iptsd again

---
 machines/shai-hulud/configuration.nix   | 10 ++++++++++
 nix/nixos-modules/astral/hw/surface.nix | 11 +----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/machines/shai-hulud/configuration.nix b/machines/shai-hulud/configuration.nix
index 68a1f8a2..1744813a 100644
--- a/machines/shai-hulud/configuration.nix
+++ b/machines/shai-hulud/configuration.nix
@@ -13,6 +13,16 @@ with lib; {
     ];
 
   microsoft-surface.kernelVersion = "6.6";
+  microsoft-surface.ipts = {
+    enable = true;
+    config = {
+      Config = {
+        BlockOnPalm = true;
+        TouchThreshold = 20;
+        StabilityThreshold = 0.1;
+      };
+    };
+  };
 
   time.timeZone = "US/Pacific";
 
diff --git a/nix/nixos-modules/astral/hw/surface.nix b/nix/nixos-modules/astral/hw/surface.nix
index 7b69bf18..31388453 100644
--- a/nix/nixos-modules/astral/hw/surface.nix
+++ b/nix/nixos-modules/astral/hw/surface.nix
@@ -20,15 +20,6 @@ with lib; {
     ];
 
     services.touchegg.enable = true;
-
-    services.xserver.libinput = { enable = true; };
-
-    # https://github.com/linux-surface/iptsd/blob/master/etc/ipts.conf
-    environment.etc."ipts.conf".text = ''
-      [Config]
-      BlockOnPalm = true
-      TouchThreshold = 20
-      StabilityThreshold = 0.1
-    '';
+    services.xserver.libinput.enable = true; 
   };
 }