From 36f2abc1a98fd2d72e17ce649f0f176e9aaf8598 Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Thu, 11 Jun 2026 16:07:53 -0400
Subject: [PATCH] chore(thinkpad): reorganize packages and drop ACPI GPE mask

Move mosh/unzip into common home packages, add orca-slicer to the thinkpad home, and remove the now-redundant system package list and kernel param.
---
 .../evanreichard@lin-va-thinkpad/default.nix    |  4 ++++
 modules/home/common/default.nix                 |  6 ++++--
 .../x86_64-linux/lin-va-thinkpad/default.nix    | 17 -----------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
index b36152b..3e61812 100755
--- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
@@ -68,6 +68,10 @@ in
     };
   };
 
+  home.packages = with pkgs; [
+    orca-slicer
+  ];
+
   home.pointerCursor = {
     gtk.enable = true;
     name = "catppuccin-macchiato-mauve-cursors";
diff --git a/modules/home/common/default.nix b/modules/home/common/default.nix
index d7e1e61..1005cea 100644
--- a/modules/home/common/default.nix
+++ b/modules/home/common/default.nix
@@ -2,11 +2,13 @@
 {
 
   home.packages = with pkgs; [
-    sqlite-interactive
     jnv
     jq
+    mosh
     ncdu
-    ripgrep
     reichard.codexis
+    ripgrep
+    sqlite-interactive
+    unzip
   ];
 }
diff --git a/systems/x86_64-linux/lin-va-thinkpad/default.nix b/systems/x86_64-linux/lin-va-thinkpad/default.nix
index ceb6e1e..40d9744 100755
--- a/systems/x86_64-linux/lin-va-thinkpad/default.nix
+++ b/systems/x86_64-linux/lin-va-thinkpad/default.nix
@@ -10,13 +10,6 @@ in
   system.stateVersion = "26.05";
   time.timeZone = "America/New_York";
 
-  boot = {
-    kernelParams = [
-      # Mask GPE03 (EC wakeup events) to allow hibernation without spurious CPU wakeups
-      "acpi_mask_gpe=0x03"
-    ];
-  };
-
   programs.nix-ld.enable = true;
 
   hardware = {
@@ -85,14 +78,4 @@ in
       sops = enabled;
     };
   };
-
-  # Additional System Packages
-  environment.systemPackages = with pkgs; [
-    dool
-    jq
-    mosh
-    rclone
-    sqlite-interactive
-    unzip
-  ];
 }