organize modules

modules/hardware/core/firmware.nix

@@ -0,0 +1,4 @@
+{ ... }: {
+  hardware.enableRedistributableFirmware = true; # T480 WiFi firmware fix
+  services.fwupd.enable = true;
+}

modules/hardware/core/igpu.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   hardware.graphics = {
     enable = true;
     enable32Bit = true;

modules/hardware/core/tpm.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  security.tpm2 = {
+    enable = true;
+    pkcs11.enable = true;
+    tctiEnvironment.enable = true;
+  };
+}

modules/hardware/misc/battery-power.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   powerManagement.powertop.enable = true;
 
   services = {

modules/hardware/misc/cpu-thermal.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ ... }: {
   services = {
     thermald.enable = true;
     throttled.enable = true;
@@ -15,9 +14,6 @@
           governor = "powersave";
           energy_performance_preference = "balance_power";
           turbo = "never";
-          enable_thresholds = "true";
-          start_threshold = "80";
-          stop_threshold = "85";
         };
       };
     };
@@ -29,9 +25,6 @@
         [ 7                  65 75  ]
         [ "level full-speed" 75 100 ]
       ];
-      # sensors = [
-      #   { type = "hwmon"; query = "/sys/devices/platform/coretemp.0/hwmon"; }
-      # ];
     };
   };
 }

modules/hardware/misc/power-button.nix

@@ -1,5 +1,4 @@
-{ ... }:
-{
+{ ... }: {
   services.logind.settings.Login = {
     HandleLidSwitch = "suspend";
     HandlePowerKey = "ignore";

modules/hardware/thinkpad.nix

@@ -1,35 +1,21 @@
 { pkgs, ... }:
 {
   imports = [
-    ./tzupdate.nix
-    ./hibernation.nix
-    ./igpu.nix
-    ./cpu-thermal.nix
-    ./battery-power.nix
-    ./power-button.nix
+    ./misc/battery-power.nix
+    ./misc/power-button.nix
+    ./misc/cpu-thermal.nix
+    ./misc/tzupdate.nix
+    ./core/hibernation.nix
+    ./core/firmware.nix
+    ./core/igpu.nix
+    ./core/tpm.nix
   ];
 
-  security = {
-    tpm2 = {
-      enable = true;
-      pkcs11.enable = true;
-      tctiEnvironment.enable = true;
-    };
-  };
-
-  hardware = {
-    enableRedistributableFirmware = true; # T480 WiFi firmware fix
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-  };
+  hardware.bluetooth.enable = true;
 
   boot = {
     kernelPackages = pkgs.linuxPackages;
     kernel.sysctl."vm.laptop_mode" = 5;
     initrd.availableKernelModules = [ "thinkpad_acpi" ];
   };
-
-  services.fwupd.enable = true;
 }