diff --git a/config/optional/zfs.nix b/config/optional/zfs.nix index fabc8b4..f5c623d 100644 --- a/config/optional/zfs.nix +++ b/config/optional/zfs.nix @@ -5,7 +5,6 @@ ... }: { boot.supportedFilesystems = ["zfs"]; - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; # The root pool should never be imported forcefully. # Failure to import is important to notice! diff --git a/flake.lock b/flake.lock index 330cfff..a5951f5 100644 --- a/flake.lock +++ b/flake.lock @@ -258,7 +258,10 @@ }, "devshell_3": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": [ + "nix-topology", + "flake-utils" + ], "nixpkgs": [ "nix-topology", "nixpkgs" @@ -284,7 +287,7 @@ "nixos-extra-modules", "nixpkgs" ], - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1701787589, @@ -323,7 +326,7 @@ }, "devshell_6": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "nixpkgs": [ "whisper-overlay", "nixpkgs" @@ -350,11 +353,11 @@ ] }, "locked": { - "lastModified": 1729712798, - "narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "09a776702b004fdf9c41a024e1299d575ee18a7d", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -680,24 +683,6 @@ "type": "github" } }, - "flake-utils_10": { - "inputs": { - "systems": "systems_13" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_4" @@ -739,11 +724,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -756,24 +741,6 @@ "inputs": { "systems": "systems_7" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_8" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -788,9 +755,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1701680307, @@ -806,9 +773,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1726560853, @@ -824,7 +791,7 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { "systems": [ "stylix", @@ -845,6 +812,24 @@ "type": "github" } }, + "flake-utils_9": { + "inputs": { + "systems": "systems_12" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -1090,11 +1075,11 @@ ] }, "locked": { - "lastModified": 1729844616, - "narHash": "sha256-LZdokf9Xave80URxsHAZehogjC16dDPBZb285hh5OAM=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "5feb9dba3cc095cd0d5d0d34a39dbee9cc469530", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -1111,11 +1096,11 @@ ] }, "locked": { - "lastModified": 1729716953, - "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -1212,11 +1197,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1729726792, - "narHash": "sha256-ndjFy5kfhn9MoOOSzGnZ7f2FwRUUY1EJYwXGxK8DzsQ=", + "lastModified": 1730167839, + "narHash": "sha256-V9ON7dVdjBg8mwx78chSSyBZsw+Q8m+HO9UfUOIo9L8=", "owner": "astro", "repo": "microvm.nix", - "rev": "ef42cfface9940b9ce9614307670b60cdbda33f6", + "rev": "46ed88edeee85cb80063c1a511318fe39f9f846f", "type": "github" }, "original": { @@ -1273,11 +1258,11 @@ ] }, "locked": { - "lastModified": 1729757100, - "narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "04193f188e4144d7047f83ad1de81d6034d175cd", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -1293,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1729394935, - "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -1309,18 +1294,18 @@ "nix-topology": { "inputs": { "devshell": "devshell_3", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { - "lastModified": 1725483443, - "narHash": "sha256-WzOlGMKV/51Fccn/OMHcm5yrqgbOJZrJIy1ya4pW0u8=", + "lastModified": 1730136771, + "narHash": "sha256-lnAyG05e9uxFL7jw0ojBHpch9UjZRZ1X3RymmZipeE4=", "owner": "oddlama", "repo": "nix-topology", - "rev": "8738d94670265beb166954c4e3a26e432f79f68c", + "rev": "95ce4eb09c986cc78b5962c8a07ac9537adfed1c", "type": "github" }, "original": { @@ -1347,7 +1332,7 @@ "nixos-extra-modules": { "inputs": { "devshell": "devshell_4", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "lib-net": "lib-net", "nixpkgs": [ "nixpkgs" @@ -1391,11 +1376,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729742320, - "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -1538,22 +1523,6 @@ } }, "nixpkgs-stable_4": { - "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_5": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -1569,7 +1538,7 @@ "type": "github" } }, - "nixpkgs-stable_6": { + "nixpkgs-stable_5": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1585,7 +1554,7 @@ "type": "github" } }, - "nixpkgs-stable_7": { + "nixpkgs-stable_6": { "locked": { "lastModified": 1718447546, "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", @@ -1603,11 +1572,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1648,11 +1617,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729791159, - "narHash": "sha256-i5TKYCs9tJ2qaYTsjQh3WwExmj4O0EU+L1jq6ZBVMfM=", + "lastModified": 1730214386, + "narHash": "sha256-FNXiFunXR2DnNrjmA0ofLznTTHcEDJjNWvCQtQExtL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "4726334e4413ff55f1db3768c8d08722abbf09cf", + "rev": "7d882356a486cf44b7fab842ac26885ecd985af3", "type": "github" }, "original": { @@ -1663,7 +1632,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1671,11 +1640,11 @@ ] }, "locked": { - "lastModified": 1729763753, - "narHash": "sha256-M8WAUgKFBU5TvFt92g/dHBtGJmBP33LHird+solHt0g=", + "lastModified": 1730044642, + "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "owner": "NuschtOS", "repo": "search", - "rev": "bedc2f2ada220815a98a896e10f5e61bfc329bfc", + "rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "type": "github" }, "original": { @@ -1798,7 +1767,10 @@ "nix-topology", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": [ + "nix-topology", + "nixpkgs" + ] }, "locked": { "lastModified": 1714478972, @@ -1826,7 +1798,7 @@ "nixos-extra-modules", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1702456155, @@ -1849,7 +1821,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_6" + "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { "lastModified": 1729104314, @@ -1873,7 +1845,7 @@ "whisper-overlay", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_7" + "nixpkgs-stable": "nixpkgs-stable_6" }, "locked": { "lastModified": 1718879355, @@ -2044,11 +2016,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1720264467, - "narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=", + "lastModified": 1729945407, + "narHash": "sha256-iGNMamNOAnVTETnIVqDWd6fl74J8fLEi1ejdZiNjEtY=", "ref": "refs/heads/main", - "rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3", - "revCount": 674, + "rev": "f1d94ee7029af18637dbd5fdf4749621533693fa", + "revCount": 764, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -2064,7 +2036,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -2072,17 +2044,17 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_12", + "systems": "systems_11", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1729380793, - "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", + "lastModified": 1729963473, + "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", "owner": "danth", "repo": "stylix", - "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", + "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", "type": "github" }, "original": { @@ -2151,21 +2123,6 @@ "type": "github" } }, - "systems_13": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2365,11 +2322,11 @@ ] }, "locked": { - "lastModified": 1729613947, - "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "type": "github" }, "original": {