From 01d1f9604e26953f43b77c2e173e31c9af8075dd Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Wed, 11 Jan 2023 12:10:06 +1300
Subject: [PATCH 1/2] Update TODO's

---
 microsoft/surface/TODO.org | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/microsoft/surface/TODO.org b/microsoft/surface/TODO.org
index bf1f0f7..f5526c3 100644
--- a/microsoft/surface/TODO.org
+++ b/microsoft/surface/TODO.org
@@ -42,14 +42,18 @@
 * Support Tools
 ** TODO Incorporate @hpfr's function(s) from this commit:
    - https://github.com/hpfr/system/commit/03fa1b0a83f8a336e812910d0d50f5247a8a630c
-** TODO Create derivative for `iptsd` touch-screen daemon
-   - [ ] Download
-   - [ ] Install binary
-   - [ ] Enable via systemd
+   - @hpfr's repo forked for posterity, as he no longer has a Surface:
+     https://github.com/mexisme/hpfr-nix-linux-surface-system/commit/03fa1b0a83f8a336e812910d0d50f5247a8a630c
+** DONE Create derivative for `iptsd` touch-screen daemon
+- State "DONE"       from "TODO"       [2023-01-11 Wed 12:09]
+   - [X] Download
+   - [X] Install binary
+   - [X] Enable via systemd
 ** TODO Create derivative to patch and rebuild libwacom
    - github.com/linux-surface/libwacom-surface
    - The plan is to do this in a separate PR against `nixpkgs` instead of `nixos-hardware`
-** TODO Create derivative to install `surface-control`
+** DONE Create derivative to install `surface-control`
+- State "DONE"       from "TODO"       [2023-01-11 Wed 12:05]
    - Download github.com/linux-surface/surface-control
 ** TODO Create derivative to install `surface-dtx-daemon`
    - Download github.com/linux-surface/surface-dtx-daemon

From 62e8ddb93f08487f63dbb339d1e572b214bf81d9 Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Wed, 11 Jan 2023 12:11:44 +1300
Subject: [PATCH 2/2] Deadnix fixes

---
 microsoft/surface/surface-laptop-amd/default.nix | 6 ++----
 microsoft/surface/surface-pro-intel/default.nix  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/microsoft/surface/surface-laptop-amd/default.nix b/microsoft/surface/surface-laptop-amd/default.nix
index 9a647dd..4985911 100644
--- a/microsoft/surface/surface-laptop-amd/default.nix
+++ b/microsoft/surface/surface-laptop-amd/default.nix
@@ -1,12 +1,10 @@
-{ lib, ... }:
+{ ... }:
 
 # This module is intended to support the Surface Laptop range, specifically those with AMD CPUs.
 # It's expected it will work equally well on many other Surface models, but they may need further
 # config changes to work well.
 
-let
-  inherit (lib) mkDefault;
-in {
+{
   imports = [
     ../common
     ../../../common/pc
diff --git a/microsoft/surface/surface-pro-intel/default.nix b/microsoft/surface/surface-pro-intel/default.nix
index abbd531..026843a 100644
--- a/microsoft/surface/surface-pro-intel/default.nix
+++ b/microsoft/surface/surface-pro-intel/default.nix
@@ -1,12 +1,10 @@
-{ lib, ... }:
+{ ... }:
 
 # This module is intended to support the Surface Pro range, specifically those with Intel CPUs.
 # It's expected it will work equally well on many other Surface models, but they may need further
 # config changes to work well.
 
-let
-  inherit (lib) mkDefault;
-in {
+{
   imports = [
     ../common
     ../../../common/pc