From 9443348634a5cc5dd0ec1a8d93166ed21b6c6b95 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 11 Jan 2026 11:56:02 -0500 Subject: [PATCH] update, fixup ca9742f721eea9e7a19073706e4d80a1f8417838 --- nix/kubernetes/configuration.nix | 5 ++ nix/kubernetes/flake.lock | 47 +++++++++++++++---- nix/kubernetes/flake.nix | 5 +- nix/kubernetes/formats/installer.nix | 5 +- nix/kubernetes/keys/flake.lock | 6 +-- .../roles/optimized_build/default.nix | 5 +- nix/kubernetes/roles/ssh/default.nix | 1 - 7 files changed, 55 insertions(+), 19 deletions(-) diff --git a/nix/kubernetes/configuration.nix b/nix/kubernetes/configuration.nix index 95edddfd..2be35057 100644 --- a/nix/kubernetes/configuration.nix +++ b/nix/kubernetes/configuration.nix @@ -109,6 +109,11 @@ # (final: prev: { # grub2 = (final.callPackage ./package/grub { }); # }) + (final: prev: { + inherit (final.unoptimized) + libtpms + ; + }) ]; # This option defines the first version of NixOS you have installed on this particular machine, diff --git a/nix/kubernetes/flake.lock b/nix/kubernetes/flake.lock index 1448fc3b..28ca666d 100644 --- a/nix/kubernetes/flake.lock +++ b/nix/kubernetes/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1764627417, - "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", + "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": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { diff --git a/nix/kubernetes/flake.nix b/nix/kubernetes/flake.nix index 0c423765..bfbbd02e 100644 --- a/nix/kubernetes/flake.nix +++ b/nix/kubernetes/flake.nix @@ -18,7 +18,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/kubernetes/formats/installer.nix b/nix/kubernetes/formats/installer.nix index 844808be..93b1187e 100644 --- a/nix/kubernetes/formats/installer.nix +++ b/nix/kubernetes/formats/installer.nix @@ -37,8 +37,9 @@ in (modulesPath + "/profiles/all-hardware.nix") ]; - boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17; - boot.zfs.package = pkgs.zfs_unstable; + # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17; + # boot.zfs.package = pkgs.zfs_unstable; + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux; boot.kernelParams = [ "quiet" "systemd.unit=getty.target" diff --git a/nix/kubernetes/keys/flake.lock b/nix/kubernetes/keys/flake.lock index 65e47984..42c9926c 100644 --- a/nix/kubernetes/keys/flake.lock +++ b/nix/kubernetes/keys/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { diff --git a/nix/kubernetes/roles/optimized_build/default.nix b/nix/kubernetes/roles/optimized_build/default.nix index 3b7c3ff0..d569df4e 100644 --- a/nix/kubernetes/roles/optimized_build/default.nix +++ b/nix/kubernetes/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_17; + 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; # or prev.linux_6_17 } ) (final: prev: { diff --git a/nix/kubernetes/roles/ssh/default.nix b/nix/kubernetes/roles/ssh/default.nix index e5ad8ae6..8532dd19 100644 --- a/nix/kubernetes/roles/ssh/default.nix +++ b/nix/kubernetes/roles/ssh/default.nix @@ -30,7 +30,6 @@ ]; }; users.root = { - home = "/root"; files = [ ".ssh/known_hosts" ];