From 24e03ed8f7dcfa527099a1b7028d66bb37ddf9ae Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 15 Jan 2026 18:10:05 -0500 Subject: [PATCH] Update packages in nix. --- nix/configuration/configuration.nix | 71 +++++++++++++++---- nix/configuration/flake.lock | 47 +++++++++--- nix/configuration/flake.nix | 5 +- nix/configuration/formats/installer.nix | 3 +- nix/configuration/roles/base/default.nix | 2 +- nix/configuration/roles/emacs/default.nix | 2 +- nix/configuration/roles/gpg/default.nix | 10 +-- nix/configuration/roles/network/default.nix | 6 +- .../roles/optimized_build/default.nix | 5 +- nix/configuration/roles/rust/default.nix | 6 +- nix/configuration/roles/ssh/default.nix | 1 - 11 files changed, 116 insertions(+), 42 deletions(-) diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix index d5db9081..6491df9e 100644 --- a/nix/configuration/configuration.nix +++ b/nix/configuration/configuration.nix @@ -166,6 +166,7 @@ nixpkgs.overlays = let disableTests = ( + # Example: (disableTests "coreutils") package_name: (final: prev: { "${package_name}" = prev."${package_name}".overrideAttrs (old: { @@ -174,23 +175,65 @@ }); }) ); + disableTestsPython = ( + # Example: (disableTestsPython "scipy") + package_name: + (final: prev: { + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + (python-final: python-prev: { + "${package_name}" = python-prev."${package_name}".overridePythonAttrs (oldAttrs: { + doCheck = false; + }); + }) + ]; + }) + ); + disableOptimizations = ( + # Example: (disableOptimizations "coreutils") + package_name: + (final: prev: { + "${package_name}" = final.unoptimized."${package_name}"; + }) + ); + disableOptimizationsScope = ( + # Example: (disableOptimizationsScope "kdePackages" "qtbase") + scope: package_name: + (final: prev: { + "${scope}" = prev."${scope}".overrideScope ( + scopeFinal: scopePrev: { + "${package_name}" = final.unoptimized."${scope}"."${package_name}"; + } + ); + }) + ); + disableOptimizationsPython3 = ( + # Example: (disableOptimizationsPython3 "scipy") + package_name: + (final: prev: { + python3Packages = prev.python3Packages.override { + overrides = python-final: python-prev: { + "${package_name}" = final.unoptimized.python3.pkgs."${package_name}"; + }; + }; + }) + ); in [ + (disableTests "coreutils") + (disableTests "coreutils-full") + (disableTests "libuv") + (final: prev: { + inherit (final.unoptimized) libtpms libjxl; + }) + (disableOptimizationsPython3 "scipy") + # Works but probably sets python2's scipy to be python3: + # # (final: prev: { - # imagemagick = prev.imagemagick.overrideAttrs (old: rec { - # # 7.1.2-6 seems to no longer exist, so use 7.1.2-7 - # version = "7.1.2-7"; - - # src = final.fetchFromGitHub { - # owner = "ImageMagick"; - # repo = "ImageMagick"; - # tag = version; - # hash = "sha256-9ARCYftoXiilpJoj+Y+aLCEqLmhHFYSrHfgA5DQHbGo="; - # }; - # }); - # }) - # (final: prev: { - # grub2 = (final.callPackage ./package/grub { }); + # pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + # (python-final: python-prev: { + # scipy = final.unoptimized.python3Packages.scipy; + # }) + # ]; # }) ]; diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index 0804cf06..28ca666d 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1764110879, - "narHash": "sha256-xanUzIb0tf3kJ+PoOFmXEXV1jM3PjkDT/TQ5DYeNYRc=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "aecba248f9a7d68c5d1ed15de2d1c8a4c994a3c5", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -94,13 +94,40 @@ "type": "github" } }, - "impermanence": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "impermanence": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -137,11 +164,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index b75d8819..e2ecd21c 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -15,7 +15,10 @@ description = "My system configuration"; inputs = { - impermanence.url = "github:nix-community/impermanence"; + impermanence = { + url = "github:nix-community/impermanence"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; diff --git a/nix/configuration/formats/installer.nix b/nix/configuration/formats/installer.nix index 844808be..38a7834d 100644 --- a/nix/configuration/formats/installer.nix +++ b/nix/configuration/formats/installer.nix @@ -37,7 +37,8 @@ in (modulesPath + "/profiles/all-hardware.nix") ]; - boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17; + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_18; + # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux; boot.zfs.package = pkgs.zfs_unstable; boot.kernelParams = [ "quiet" diff --git a/nix/configuration/roles/base/default.nix b/nix/configuration/roles/base/default.nix index d1b33e79..77232a71 100644 --- a/nix/configuration/roles/base/default.nix +++ b/nix/configuration/roles/base/default.nix @@ -57,7 +57,7 @@ in ipcalc gptfdisk # for cgdisk nix-output-monitor # For better view into nixos-rebuild - nix-serve-ng # Serve nix store over http + # nix-serve-ng # Serve nix store over http cleanup_temporary_files jq inetutils # For whois diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix index 40a1332d..b795d31e 100644 --- a/nix/configuration/roles/emacs/default.nix +++ b/nix/configuration/roles/emacs/default.nix @@ -125,7 +125,7 @@ in ] )) final.nixd # nix language server - final.nixfmt-rfc-style # auto-formatting nix files through nixd + final.nixfmt # auto-formatting nix files through nixd final.clang # To compile tree-sitter grammars final.shellcheck final.cmake-language-server diff --git a/nix/configuration/roles/gpg/default.nix b/nix/configuration/roles/gpg/default.nix index a54f914b..e9f07810 100644 --- a/nix/configuration/roles/gpg/default.nix +++ b/nix/configuration/roles/gpg/default.nix @@ -44,11 +44,11 @@ in ]; services.pcscd.enable = true; - me.install.user.talexander.file = { - ".gnupg/scdaemon.conf" = { - source = ./files/scdaemon.conf; - }; - }; + # me.install.user.talexander.file = { + # ".gnupg/scdaemon.conf" = { + # source = ./files/scdaemon.conf; + # }; + # }; programs.gnupg.agent = { enable = true; diff --git a/nix/configuration/roles/network/default.nix b/nix/configuration/roles/network/default.nix index 3ec37e72..ff453ec4 100644 --- a/nix/configuration/roles/network/default.nix +++ b/nix/configuration/roles/network/default.nix @@ -37,9 +37,9 @@ services.resolved = { enable = true; # dnssec = "true"; - domains = [ "~." ]; - fallbackDns = [ ]; - dnsovertls = "true"; + settings.Resolve.Domains = [ "~." ]; + settings.Resolve.FallbackDNS = [ ]; + settings.Resolve.DNSOverTLS = "true"; }; # Without this, systemd-resolved will send DNS requests for .home.arpa to the per-link DNS server (172.16.0.1) which does not support DNS-over-TLS. This leads to the connection hanging and timing out. This causes firefox startup to take an extra 10+ seconds. diff --git a/nix/configuration/roles/optimized_build/default.nix b/nix/configuration/roles/optimized_build/default.nix index 3b7c3ff0..d8a103be 100644 --- a/nix/configuration/roles/optimized_build/default.nix +++ b/nix/configuration/roles/optimized_build/default.nix @@ -52,7 +52,8 @@ (lib.mkIf (!config.me.optimizations.enable) ( lib.mkMerge [ { - boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17; + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_18; + # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux; } ] )) @@ -90,7 +91,7 @@ HZ = lib.kernel.freeform "300"; HZ_300 = lib.kernel.yes; HZ_1000 = lib.kernel.no; - } prev.linux_6_17; + } prev.linux_6_18; # or prev.linux } ) (final: prev: { diff --git a/nix/configuration/roles/rust/default.nix b/nix/configuration/roles/rust/default.nix index df37744d..57fcbf4c 100644 --- a/nix/configuration/roles/rust/default.nix +++ b/nix/configuration/roles/rust/default.nix @@ -50,9 +50,9 @@ in ".cargo/config.toml" = { source = ./files/cargo_config.toml; }; - ".rustup/settings.toml" = { - source = ./files/rustup_settings.toml; - }; + # ".rustup/settings.toml" = { + # source = ./files/rustup_settings.toml; + # }; }; environment.persistence."/state" = lib.mkIf (config.me.mountPersistence) { diff --git a/nix/configuration/roles/ssh/default.nix b/nix/configuration/roles/ssh/default.nix index 92e01df1..16eadce1 100644 --- a/nix/configuration/roles/ssh/default.nix +++ b/nix/configuration/roles/ssh/default.nix @@ -30,7 +30,6 @@ ]; }; users.root = { - home = "/root"; files = [ ".ssh/known_hosts" ];