From e5c52d516ac6fa8b1a947925b8a099c1f5478ce3 Mon Sep 17 00:00:00 2001
From: k3t <k3t@k3t.dev>
Date: Thu, 6 Aug 2026 23:50:08 -0600
Subject: [PATCH] rename T14 to ThinkPad

---
 flake.nix                      | 123 +++------------------------------
 hosts/laptop/configuration.nix |   2 +-
 2 files changed, 10 insertions(+), 115 deletions(-)

diff --git a/flake.nix b/flake.nix
index eea8e11..e32659c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -124,117 +124,6 @@
         }
       ];
 
-      "NixNAS" = mkHost "x86_64-linux" [
-        ./modules/net/services/avahi.nix
-        ./modules/net/services/fail2ban.nix
-        ./modules/net/services/networkmanager.nix
-        ./modules/net/services/tailscale.nix
-        
-        ./modules/sys/compat.nix
-        ./modules/sys/firewall.nix
-        
-        ./modules/sys/fs/btrfs.nix
-        ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
-        ./modules/sys/fs/mounts/swap.nix
-
-        ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/hyperv.nix
-        
-        ./modules/sys/nix.nix
-        ./modules/sys/perf.nix
-        ./modules/sys/pkgs.nix
-        ./modules/sys/rc/openssh.nix
-        ./modules/sys/security.nix
-        ./modules/sys/shell.nix
-        ./modules/sys/stateversion.nix
-        ./modules/sys/sysctl.nix
-        ./modules/sys/time.nix
-        ./modules/sys/users/k3t.nix
-
-        ./hosts/NixNAS/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/server.nix;
-        }
-      ];
-
-      "NixServe" = mkHost "x86_64-linux" [
-        ./modules/net/services/avahi.nix
-        ./modules/net/services/fail2ban.nix
-        ./modules/net/services/networkmanager.nix
-        ./modules/net/services/tailscale.nix
-        
-        ./modules/sys/compat.nix
-        ./modules/sys/firewall.nix
-        
-        ./modules/sys/fs/btrfs.nix
-        ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
-        ./modules/sys/fs/mounts/swap.nix
-
-        ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/hyperv.nix
-        
-        ./modules/sys/nix.nix
-        ./modules/sys/perf.nix
-        ./modules/sys/pkgs.nix
-        ./modules/sys/rc/openssh.nix
-        ./modules/sys/security.nix
-        ./modules/sys/shell.nix
-        ./modules/sys/stateversion.nix
-        ./modules/sys/sysctl.nix
-        ./modules/sys/time.nix
-        ./modules/sys/users/k3t.nix
-
-        ./hosts/NixServe/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/server.nix;
-        }
-      ];
-
-      "NixGame" = mkHost "x86_64-linux" [
-        ./modules/net/services/avahi.nix
-        ./modules/net/services/fail2ban.nix
-        ./modules/net/services/networkmanager.nix
-        ./modules/net/services/tailscale.nix
-        
-        ./modules/sys/compat.nix
-        ./modules/sys/firewall.nix
-        
-        ./modules/sys/fs/btrfs.nix
-        ./modules/sys/fs/mounts/efi.nix
-        ./modules/sys/fs/mounts/root-btrfs.nix
-        ./modules/sys/fs/mounts/swap.nix
-
-        ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/hyperv.nix
-        
-        ./modules/sys/nix.nix
-        ./modules/sys/perf.nix
-        ./modules/sys/pkgs.nix
-        ./modules/sys/rc/openssh.nix
-        ./modules/sys/security.nix
-        ./modules/sys/shell.nix
-        ./modules/sys/stateversion.nix
-        ./modules/sys/sysctl.nix
-        ./modules/sys/time.nix
-        ./modules/sys/users/k3t.nix
-
-        ./hosts/NixGame/configuration.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/server.nix;
-        }
-      ];
-
       "IdeaPad" = mkHost "x86_64-linux" [
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
@@ -335,7 +224,7 @@
           home-manager.users.k3t = ./home/desktop.nix;
         }
       ];
-      "T14" = mkHost "x86_64-linux" [
+      "ThinkPad" = mkHost "x86_64-linux" [
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
 
@@ -362,10 +251,16 @@
         
         ./modules/sys/compat.nix
         ./modules/sys/firewall.nix
+
         ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/btrfs/tbb-btrfs.nix
+        ./modules/sys/fs/mounts/swap.nix
+
+
         ./modules/sys/hw/boot.nix
-        ./modules/sys/hw/cpu/amd64.nix
-        ./modules/sys/hw/gpu/amd.nix
+        ./modules/sys/hw/cpu/intel.nix
+        ./modules/sys/hw/gpu/intel.nix
         ./modules/sys/nix.nix
         ./modules/sys/perf.nix
         ./modules/sys/pkgs.nix
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 7b61d97..29e4b08 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -10,7 +10,7 @@
       ./hardware-configuration.nix
     ];
 
-  networking.hostName = "T14"; # Define your hostname.
+  networking.hostName = "ThinkPad"; # Define your hostname.
 
   users.users.k3t = {
     packages = with pkgs; [