From d46c2a0225eca57d958e8f4ac092a30921a21d61 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 9 Apr 2026 20:25:12 -0400 Subject: [PATCH] Revert "Update packages." This reverts commit ee4794859a9f2bb6178cfac5abafcfded0c017d1. --- nix/configuration/configuration.nix | 8 +------- nix/configuration/flake.lock | 12 ++++++------ nix/configuration/roles/optimized_build/default.nix | 10 ++-------- nix/configuration/roles/recovery/default.nix | 2 +- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix index f823e3a0..2ab6cda3 100644 --- a/nix/configuration/configuration.nix +++ b/nix/configuration/configuration.nix @@ -227,13 +227,7 @@ (disableTests "coreutils-full") (disableTests "libuv") (final: prev: { - inherit (final.unoptimized) - libtpms - libjxl - ddrescueview - deno - mesa - ; + inherit (final.unoptimized) libtpms libjxl; }) (disableOptimizationsPython3 "scipy") # Works but probably sets python2's scipy to be python3: diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index c098f66b..28ca666d 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { diff --git a/nix/configuration/roles/optimized_build/default.nix b/nix/configuration/roles/optimized_build/default.nix index 3fc944da..d8a103be 100644 --- a/nix/configuration/roles/optimized_build/default.nix +++ b/nix/configuration/roles/optimized_build/default.nix @@ -79,15 +79,9 @@ in { linux_me = addConfig { - # Server | No preemption - Run until the next tick. Highest throughput but can cause stutter. - # PREEMPT = lib.mkOverride 60 lib.kernel.no; - # Desktop | Preempt kernel threads only at pre-defined places that call cond_resched(). - PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no; - # Low-latency desktop | Full preemption - Kernel threads can be preempted unless they hold a spinlock or are in a no-preemption section. + # Full preemption PREEMPT = lib.mkOverride 60 lib.kernel.yes; - # RT - All kernel code is preemptible except for a few critical sections. - # Middle ground | Real-time tasks preempt immediately like FULL, normal tasks run until the next tick. - PREEMPT_LAZY = lib.mkOverride 90 lib.kernel.no; + PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no; # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = lib.kernel.yes; diff --git a/nix/configuration/roles/recovery/default.nix b/nix/configuration/roles/recovery/default.nix index 14953642..1c46e07b 100644 --- a/nix/configuration/roles/recovery/default.nix +++ b/nix/configuration/roles/recovery/default.nix @@ -29,7 +29,7 @@ } (lib.mkIf config.me.graphical { environment.systemPackages = with pkgs; [ - #ddrescueview + ddrescueview ]; }) ]