README.md

@@ -7,13 +7,13 @@ rewrite of my nixos flake with hopefully better structuring and modularity
 - (quater-progress) reintegrate file paths and arguments to work together
 
 # todo: migrate files below
-- [X] flake stuff (flake.nix & flake.lock)
+[X] flake stuff (flake.nix & flake.lock)
 
-- [X] hardware configs (hardware/scans)
-- [X] nixos system
-- [X] base nix configs
-- [X] apps list
-- [X] user config (not hm)
+[X] hardware configs (hardware/scans)
+[X] nixos system
+[X] base nix configs
+[X] apps list
+[X] user config (not hm)
 
-- [ ] home manager config
-- [ ] rice config (everything in /rice)
+[ ] home manager config
+[ ] rice config (everything in /rice)

modules/hardware/battery-power.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  powerManagement.powertop.enable = true;
-
-  services = {
-    udev.extraRules = ''
-      #ACTION=="add", SUBSYSTEM=="usb", TEST=="power/control", ATTR{power/control}="auto"
-      ACTION=="add", SUBSYSTEM=="pci", TEST=="power/control", ATTR{power/control}="auto"
-      SUBSYSTEM=="power_supply", ACTION=="change", RUN+="${pkgs.writeShellScript "battery-thresholds" ''
-        echo 80 > /sys/class/power_supply/BAT1/charge_control_start_threshold || true
-        echo 85 > /sys/class/power_supply/BAT1/charge_control_end_threshold || true
-      ''}"
-    '';
-    upower = {
-      enable = true;
-      percentageCritical = 15;
-      percentageAction = 10;
-      usePercentageForPolicy = true;
-      allowRiskyCriticalPowerAction = true;
-      criticalPowerAction = "HybridSleep";
-    };
-  };
-}

modules/hardware/cpu-thermal.nix

@@ -1,37 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    thermald.enable = true;
-    throttled.enable = true;
-    auto-cpufreq = {
-      enable = true;
-      settings = {
-        charger = {
-          governor = "performance";
-          energy_performance_preference = "balance_performance";
-          turbo = "auto";
-        };
-        battery = {
-          governor = "powersave";
-          energy_performance_preference = "balance_power";
-          turbo = "never";
-          enable_thresholds = "true";
-          start_threshold = "80";
-          stop_threshold = "85";
-        };
-      };
-    };
-    thinkfan = {
-      enable = true;
-      levels = [
-        [ "level auto"       0  55  ]
-        [ 3                  55 65  ]
-        [ 7                  65 75  ]
-        [ "level full-speed" 75 100 ]
-      ];
-      # sensors = [
-      #   { type = "hwmon"; query = "/sys/devices/platform/coretemp.0/hwmon"; }
-      # ];
-    };
-  };
-}

modules/hardware/igpu.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-    extraPackages = with pkgs; [
-      intel-media-driver
-      intel-compute-runtime
-      libva-vdpau-driver
-      libvdpau-va-gl
-    ];
-  };
-}

modules/hardware/power-button.nix

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

modules/hardware/thinkpad.nix

@@ -1,14 +1,9 @@
-{ pkgs, ... }:
-{
-  imports = [
+{ pkgs, ... }: {
+  import = [
     ./tzupdate.nix
     ./hibernation.nix
-    ./igpu.nix
-    ./cpu-thermal.nix
-    ./battery-power.nix
-    ./power-button.nix
   ];
-
+  powerManagement.powertop.enable = true;
   security = {
     tpm2 = {
       enable = true;
@@ -16,23 +11,82 @@
       tctiEnvironment.enable = true;
     };
   };
-
   hardware = {
     enableRedistributableFirmware = true; # T480 WiFi firmware fix
     bluetooth = {
       enable = true;
       powerOnBoot = true;
     };
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        intel-media-driver
+        intel-compute-runtime
+        libva-vdpau-driver
+        libvdpau-va-gl 
+      ];
+    };
   };
-
   boot = {
     kernelPackages = pkgs.linuxPackages;
     kernel.sysctl."vm.laptop_mode" = 5;
     initrd.availableKernelModules = [ "thinkpad_acpi" ];
   };
-
   services = {
+    logind.settings.Login = {
+      HandleLidSwitch = "suspend";
+      HandlePowerKey = "ignore";
+    };
     fstrim.enable = true;
+    thermald.enable = true;
+    throttled.enable = true;
     fwupd.enable = true;
+    udev.extraRules = ''
+      #ACTION=="add", SUBSYSTEM=="usb", TEST=="power/control", ATTR{power/control}="auto"
+      ACTION=="add", SUBSYSTEM=="pci", TEST=="power/control", ATTR{power/control}="auto"
+      SUBSYSTEM=="power_supply", ACTION=="change", RUN+="${pkgs.writeShellScript "battery-thresholds" ''
+        echo 80 > /sys/class/power_supply/BAT1/charge_control_start_threshold || true
+        echo 85 > /sys/class/power_supply/BAT1/charge_control_end_threshold || true
+      ''}"
+    '';
+    upower = {
+      enable = true;
+      percentageCritical = 15;
+      percentageAction = 10;
+      usePercentageForPolicy = true;
+      allowRiskyCriticalPowerAction = true;
+      criticalPowerAction = "HybridSleep";
+    };
+    auto-cpufreq = {
+      enable = true;
+      settings = {
+        charger = {
+          governor = "performance";
+          energy_performance_preference = "balance_performance";
+          turbo = "auto";
+        };
+        battery = {
+          governor = "powersave";
+          energy_performance_preference = "balance_power";
+          turbo = "never";
+          enable_thresholds = "true";
+          start_threshold = "80";
+          stop_threshold = "85";
+        };
+      };
+    };
+    thinkfan = {
+      enable = true;
+      levels = [
+        [ "level auto"        0  55  ]
+        [ 3                  55  65  ]
+        [ 7                  65  75  ]
+        [ "level full-speed" 75  100 ]
+      ];
+      # sensors = [
+      #   { type = "hwmon"; query = "/sys/devices/platform/coretemp.0/hwmon"; }
+      # ];
+    };
   };
 }