flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1770551880,
-        "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=",
+        "lastModified": 1770388745,
+        "narHash": "sha256-tmAONUMNHnlkozNcMR1kZJ/68OGea5wS56vl6vaUS5U=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2",
+        "rev": "5e9efb97caeffea3bf248023b6d8b68e63b839b9",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771037579,
-        "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
+        "lastModified": 1770491427,
+        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
+        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {

modules/hardware/misc/cpu-thermal.nix

@@ -2,31 +2,20 @@
   services = {
     thermald.enable = false;
     throttled.enable = true;
-    power-profiles-daemon.enable = true; # replacement for tlp and auto-cpufreq due to bugs
     tlp = {
-      enable = false; # buggy and inconsistent with frequency scaling
+      enable = true;
       settings = {
         TLP_DEFAULT_MODE = "BAL";
         
         CPU_SCALING_GOVERNOR_ON_PRF = "performance";
         CPU_ENERGY_PERF_POLICY_ON_PRF = "performance";
         CPU_BOOST_ON_PRF = "1";
-        CPU_MAX_FREQ_ON_PRF = "3600000";
-        CPU_MIN_FREQ_ON_PRF = "100000";
-        CPU_MIN_PERF_ON_PRF = "40";
-        CPU_MAX_PERF_ON_PRF = "100";
         PLATFORM_PROFILE_ON_PRF = "performance";
-        MEM_SLEEP_ON_PRF = "s2idle";
         
         CPU_SCALING_GOVERNOR_ON_BAL = "powersave";
         CPU_ENERGY_PERF_POLICY_ON_BAL = "balance_power";
         CPU_BOOST_ON_BAL = "0";
-        CPU_MAX_FREQ_ON_BAL = "1700000";
-        CPU_MIN_FREQ_ON_BAL = "800000";
-        CPU_MIN_PERF_ON_BAL = "40";
-        CPU_MAX_PERF_ON_BAL = "80";
         PLATFORM_PROFILE_ON_BAL = "balanced";
-        MEM_SLEEP_ON_BAL = "s2idle";
         
         CPU_SCALING_GOVERNOR_ON_SAV = "powersave";
         CPU_ENERGY_PERF_POLICY_ON_SAV = "power";
@@ -50,7 +39,7 @@
       };
     };
     auto-cpufreq = {
-      enable = false; # wait for fix: https://github.com/AdnanHodzic/auto-cpufreq/issues/906
+      enable = false; # replaced with tlp until fix: https://github.com/AdnanHodzic/auto-cpufreq/issues/906
       settings = {
         charger = {
           governor = "performance";

modules/home/core/zsh.nix

@@ -21,14 +21,12 @@
       autocd = true;
       syntaxHighlighting.enable = true;
       envExtra = ''
-        export NIXPKGS_ALLOW_UNFREE=1
-        export NIXPKGS_ALLOW_INSECURE=1
-        export NH_FLAKE=${flake-path}
-        export WINEPREFIX="~/.wine"
-        export WINEARCH="win64"
-        export DISPLAY=":0"
-        export EDITOR="nvim"
-        export PORT="3000"
+        NIXPKGS_ALLOW_UNFREE=1
+        WINEPREFIX="~/.wine"
+        WINEARCH="win64"
+        DISPLAY=":0"
+        EDITOR="nvim"
+        PORT="3000"
       '';
       shellAliases = {
         "cd-gvfs" = "cd /run/user/$(id -u)/gvfs";

modules/home/rice/waybar.nix

@@ -258,9 +258,9 @@
         font-weight: normal;
       }
 
-      .critical, .muted, .performance { border-color: @red; color: @red; }
-      .warning, .urgent, .disabled, .disconnected, .paused { border-color: @yellow; color: @yellow; }
-      .charging, .plugged, .power-saver { border-color: @green; color: @green; }
+      .critical, .muted, .performance { color: @red; }
+      .warning, .urgent, .disabled, .disconnected, .paused { color: @yellow; }
+      .charging, .plugged, .power-saver { color: @green; }
     '';
   };
 }