From 1ce4d10e4bf374eab95fc97c26e5dda3e3766014 Mon Sep 17 00:00:00 2001
From: Alexander Heldt <me@alexanderheldt.se>
Date: Tue, 29 Sep 2026 16:41:55 +0200
Subject: [PATCH] pinwheel: Swap to new machine

---
 flake.nix                                 |  1 -
 hosts/pinwheel/configuration.nix          |  5 +-
 hosts/pinwheel/hardware-configuration.nix | 58 +++++++----------------
 hosts/pinwheel/modules/boot/default.nix   |  4 --
 4 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/flake.nix b/flake.nix
index 40cd683..cbdd6fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,7 +117,6 @@
           };
           modules = [
             ./hosts/pinwheel/configuration.nix
-            inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen
             ./hosts/pinwheel/home.nix
           ];
         };
diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix
index 3b192d7..8fdfcca 100644
--- a/hosts/pinwheel/configuration.nix
+++ b/hosts/pinwheel/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   imports = [
     ../../config-manager/default.nix
@@ -14,6 +14,9 @@
   ];
   nixpkgs.config.allowUnfree = true;
 
+  hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
+  services.thermald.enable = lib.mkDefault true;
+
   users.users.alex = {
     isNormalUser = true;
     description = "alex";
diff --git a/hosts/pinwheel/hardware-configuration.nix b/hosts/pinwheel/hardware-configuration.nix
index a857db5..5667b3a 100644
--- a/hosts/pinwheel/hardware-configuration.nix
+++ b/hosts/pinwheel/hardware-configuration.nix
@@ -1,56 +1,34 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/9c3ef2ad-0244-4310-9984-2e548ced3e22";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/mapper/luks-b05ba0f3-51f9-48d1-8d14-fcbff7c13c5b";
+      fsType = "ext4";
+    };
 
-  boot.initrd.luks.devices."luks-f569d036-e500-4839-bc78-ce4b032840d8".device = "/dev/disk/by-uuid/f569d036-e500-4839-bc78-ce4b032840d8";
+  boot.initrd.luks.devices."luks-b05ba0f3-51f9-48d1-8d14-fcbff7c13c5b".device = "/dev/disk/by-uuid/b05ba0f3-51f9-48d1-8d14-fcbff7c13c5b";
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/FCAE-6849";
-    fsType = "vfat";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/D449-C034";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
-  swapDevices = [
-    {
-      device = "/swapfile";
-      size = 48 * 1024; # 48GB
-    }
-  ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+  swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.npu.enable = true;
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/pinwheel/modules/boot/default.nix b/hosts/pinwheel/modules/boot/default.nix
index fb72c5e..063d6b8 100644
--- a/hosts/pinwheel/modules/boot/default.nix
+++ b/hosts/pinwheel/modules/boot/default.nix
@@ -49,10 +49,6 @@ in
 
         efi.canTouchEfiVariables = true;
       };
-
-      initrd.secrets = {
-        "/crypto_keyfile.bin" = null;
-      };
     };
   };
 }