diff --git a/flake.lock b/flake.lock index 75e7387..964bf41 100644 --- a/flake.lock +++ b/flake.lock @@ -310,16 +310,16 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1718829834, - "narHash": "sha256-SBioRAhjYMcoBpIGV+kdquRjlm8DRD2dv8N4RXM694U=", + "lastModified": 1719442161, + "narHash": "sha256-daEQZl9Kw2sYTOyUY640RtZj13Zp+NzKYMjGeLiAuZE=", "owner": "NixOS", "repo": "nix", - "rev": "1c131ec2b71fa7ad6fd285ed2a9fcc4cf616b3a6", + "rev": "2dd7f8f42da374d9fee4d424c1c6f82bcb36b393", "type": "github" }, "original": { "owner": "NixOS", - "ref": "1c131ec2b71fa7ad6fd285ed2a9fcc4cf616b3a6", + "ref": "2dd7f8f42da374d9fee4d424c1c6f82bcb36b393", "repo": "nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 616146d..08cf8be 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ type = "github"; owner = "NixOS"; repo = "nix"; - ref = "1c131ec2b71fa7ad6fd285ed2a9fcc4cf616b3a6"; + ref = "2dd7f8f42da374d9fee4d424c1c6f82bcb36b393"; inputs.nixpkgs.follows = "stable"; }; nixos-generators = { diff --git a/hosts/gerg-desktop/boot.nix b/hosts/gerg-desktop/boot.nix index 0185a6d..988be49 100644 --- a/hosts/gerg-desktop/boot.nix +++ b/hosts/gerg-desktop/boot.nix @@ -62,7 +62,6 @@ in pkgs.sbctl ]; text = '' - set -o pipefail lzbt "$@" MP='${config.boot.loader.efi.efiSysMountPoint}' cp -f '${pkgs.edk2-uefi-shell.efi}' "$MP/shellx64.efi" @@ -89,14 +88,14 @@ in kernelPackages = pkgs.linuxPackagesFor ( let - version = "6.8.12"; + version = "6.9.6"; in (pkgs.linuxManualConfig { version = "${version}-gerg"; modDirVersion = "${version}-gerg"; src = pkgs.fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-GbMZVtIptbnKVnH6HHQyAXloKj2NAPyGeUEUsh2oYDk="; + hash = "sha256-XUNm4riZmPJ0q+A1V+87x4tY5H/GLBAtUeb0nl7Za0s="; }; inherit (config.boot) kernelPatches;