diff --git a/configuration.nix b/configuration.nix index 09703e9..260f14e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -60,6 +60,7 @@ boot = { kernelPackages = pkgs.linuxPackages; + zfs.package = pkgs.zfs_unstable; kernelParams = [ # 2048MB @@ -81,10 +82,6 @@ compressor = "zstd"; }; - kernelModules = [ - "msr" - ]; - loader.systemd-boot.enable = lib.mkForce false; lanzaboote = { @@ -103,6 +100,7 @@ ''; }; + # encryption key for zpool (VERY IMPORTANT) boot.initrd.secrets."/etc/zfs-key" = /etc/nixos/secrets/zfs-key; environment.etc = { diff --git a/flake.lock b/flake.lock index f018f11..fe0cbff 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1738201338, - "narHash": "sha256-yO1zdfkSyNWywriGUTRbDnJsoZkjFwpl/1DVwdv9GNA=", + "lastModified": 1738287839, + "narHash": "sha256-Vh060kC/aTX+e8Ru195wo+QySd0z91wJ++JZNSDJxy8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ce78a3fcb768948c3b2ed1196fdd124a4316a863", + "rev": "58f1ae4ac2620cbcef912e32b17f9a64fcb372ad", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738023785, - "narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b4230bf03deb33103947e2528cac2ed516c5c89", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": {