misc changes

etcnixos/flake.lock

@@ -278,11 +278,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1725379389,
-        "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=",
+        "lastModified": 1727792571,
+        "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871",
+        "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727634051,
-        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
         "type": "github"
       },
       "original": {

etcnixos/flake.nix

@@ -57,22 +57,11 @@
           inherit inputs username hostname;
         };
         inherit pkgs;
-        modules =
-          [
-            ./system-${hostname}.nix
-            chaotic.nixosModules.default
-            agenix.nixosModules.default
-
-          ]
-          ++ (
-            if ("${hostname}" == "mreow") then # laptop
-              [
-                nixos-hardware.nixosModules.framework-12th-gen-intel
-                lanzaboote.nixosModules.lanzaboote
-              ]
-            else
-              [ ]
-          );
+        modules = [
+          ./system-${hostname}.nix
+          chaotic.nixosModules.default
+          agenix.nixosModules.default
+        ];
       };
     };
 }

etcnixos/system-mreow.nix

@@ -4,12 +4,16 @@
   lib,
   username,
   system,
+  inputs,
   ...
 }:
 {
   imports = [
     ./common.nix
     ./hardware_laptop.nix
+
+    inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
+    inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
   services.tlp = {
@@ -27,7 +31,7 @@
       CPU_MAX_PERF_ON_BAT = 60;
 
       CPU_BOOST_ON_BAT = 0;
-      START_CHARGE_THRESH_BAT0 = 90;
+      START_CHARGE_THRESH_BAT0 = 80;
       STOP_CHARGE_THRESH_BAT0 = 90;
       RUNTIME_PM_ON_BAT = "auto";
     };

etcnixos/system-nixos.nix

@@ -12,6 +12,10 @@
   imports = [
     ./common.nix
     ./hardware_desktop.nix
+
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
   boot = {