From 05f3435635676b19ff4daec79401df27a4a34632 Mon Sep 17 00:00:00 2001 From: macronova Date: Mon, 4 Mar 2024 21:10:52 -0800 Subject: [PATCH] Disable ZFS unstable --- flake.lock | 24 ++++++++++++------------ linux/blitzar/zfs.nix | 1 - linux/nebula/zfs.nix | 1 - linux/protostar/zfs.nix | 4 ---- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9712020..84e7b54 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1709439398, - "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=", + "lastModified": 1709599612, + "narHash": "sha256-3fCm3BIc2iva90E/lbkkt+fPXkZr9pnC7tJk3QPOf7Q=", "owner": "nix-community", "repo": "disko", - "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57", + "rev": "c54e7e2b2b7e394440be36305a8fdeeba6339712", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709485962, - "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=", + "lastModified": 1709578243, + "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "d579633ff9915a8f4058d5c439281097e92380a8", + "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3", "type": "github" }, "original": { @@ -348,11 +348,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { @@ -397,11 +397,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1709434911, - "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=", + "lastModified": 1709591996, + "narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "075df9d85ee70cfb53e598058045e1738f05e273", + "rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b", "type": "github" }, "original": { diff --git a/linux/blitzar/zfs.nix b/linux/blitzar/zfs.nix index 430a055..a8bbdc6 100644 --- a/linux/blitzar/zfs.nix +++ b/linux/blitzar/zfs.nix @@ -4,7 +4,6 @@ boot = { kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; loader.grub.zfsSupport = true; - zfs.enableUnstable = true; }; services.zfs = { diff --git a/linux/nebula/zfs.nix b/linux/nebula/zfs.nix index 35d7371..1f77169 100644 --- a/linux/nebula/zfs.nix +++ b/linux/nebula/zfs.nix @@ -5,7 +5,6 @@ boot = { kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; loader.grub.zfsSupport = true; - zfs.enableUnstable = true; }; services.zfs = { diff --git a/linux/protostar/zfs.nix b/linux/protostar/zfs.nix index 549a322..8c6491b 100644 --- a/linux/protostar/zfs.nix +++ b/linux/protostar/zfs.nix @@ -1,13 +1,9 @@ { ... }: { - - boot.zfs.enableUnstable = true; - services.zfs = { autoScrub.enable = true; trim.enable = true; }; - }