diff --git a/core/hosts/hades/default.nix b/core/hosts/hades/default.nix index f0034ca..105fb1c 100755 --- a/core/hosts/hades/default.nix +++ b/core/hosts/hades/default.nix @@ -10,7 +10,7 @@ ## Shared 'core' config options ../../../core ## Host-specific core modules - ../../../core/modules/optional/zfs2.nix + ../../../core/modules/optional/zfs.nix ../../../core/modules/optional/gaming.nix ../../../core/modules/optional/jellyfin.nix diff --git a/core/modules/optional/zfs.nix b/core/modules/optional/zfs.nix index ca387c6..9381a18 100755 --- a/core/modules/optional/zfs.nix +++ b/core/modules/optional/zfs.nix @@ -5,18 +5,17 @@ { config, lib, pkgs, ... }: +## Black magic wizardry from https://wiki.nixos.org/wiki/ZFS let - ## This 'let' binding creates an attribute set - ## called "LatestZfsLinux", which we can call as - ## a package to specify when building our kernel. - latestZfsLinux = lib.pipe pkgs.linuxKernel.packages [ - builtins.attrValues - (builtins.filter (kPkgs: - (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.pname - == "linux" && !kPkgs.zfs.meta.broken)) - (builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version))) - lib.last - ]; + + zfsCompatibleKernelPackages = lib.filterAttrs (name: kernelPackages: + (builtins.match "linux_[0-9]+_[0-9]+" name) != null + && (builtins.tryEval kernelPackages).success + && (!kernelPackages.${config.boot.zfs.package.kernelModuleAttribute}.meta.broken)) + pkgs.linuxKernel.packages; + latestKernelPackage = lib.last + (lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) + (builtins.attrValues zfsCompatibleKernelPackages)); in { @@ -24,20 +23,24 @@ in { ## Enable zfs in kernel and boot boot = { - kernelPackages = lib.mkForce latestZfsLinux; + ## Sets system to use the kernel specified in the let binding above + kernelPackages = lib.mkForce latestKernelPackage; supportedFilesystems = [ "zfs" ]; zfs = { + ## uhhh extraPools = [ "orcus" ]; + ## uhhh forceImportRoot = false; }; }; - #fileSystems."/home/serenity/Disks/Orcus" = { + #fileSystems."/run/media/serenity/Orcus" = { #device = "orcus"; #fsType = "zfs"; #options = [ "users" ]; #}; + ## Adding ZFS package to system just in case environment.systemPackages = with pkgs; [ zfs ]; ## Enable trim for ZFS SSDs @@ -51,6 +54,13 @@ in { }; }; + ## Automount service for the ZFS pools + ## Is supposed to be enabled by default + #systemd.services.zfs-mount = { + #enable = true; + #}; + + ## Unsure why this is here actually ? networking = { hostId = "603b0c8b"; }; } diff --git a/core/modules/optional/zfs2.nix b/core/modules/optional/zfs2.nix deleted file mode 100755 index 9381a18..0000000 --- a/core/modules/optional/zfs2.nix +++ /dev/null @@ -1,66 +0,0 @@ -# # ZFS Support NixOS module - -## temporary location while we figure out how ZFS works, -## eventually this will be embedded into the flake in a better way - -{ config, lib, pkgs, ... }: - -## Black magic wizardry from https://wiki.nixos.org/wiki/ZFS -let - - zfsCompatibleKernelPackages = lib.filterAttrs (name: kernelPackages: - (builtins.match "linux_[0-9]+_[0-9]+" name) != null - && (builtins.tryEval kernelPackages).success - && (!kernelPackages.${config.boot.zfs.package.kernelModuleAttribute}.meta.broken)) - pkgs.linuxKernel.packages; - latestKernelPackage = lib.last - (lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) - (builtins.attrValues zfsCompatibleKernelPackages)); - -in { - - imports = [ ]; - - ## Enable zfs in kernel and boot - boot = { - ## Sets system to use the kernel specified in the let binding above - kernelPackages = lib.mkForce latestKernelPackage; - supportedFilesystems = [ "zfs" ]; - zfs = { - ## uhhh - extraPools = [ "orcus" ]; - ## uhhh - forceImportRoot = false; - }; - }; - - #fileSystems."/run/media/serenity/Orcus" = { - #device = "orcus"; - #fsType = "zfs"; - #options = [ "users" ]; - #}; - - ## Adding ZFS package to system just in case - environment.systemPackages = with pkgs; [ zfs ]; - - ## Enable trim for ZFS SSDs - services = { - zfs = { - ## Trim for SSSds with ZFS - #trim.enable = true; - ## Autoscrub data integrity ZFS service, - ## more to be added soon - autoScrub = { enable = true; }; - }; - }; - - ## Automount service for the ZFS pools - ## Is supposed to be enabled by default - #systemd.services.zfs-mount = { - #enable = true; - #}; - - ## Unsure why this is here actually ? - networking = { hostId = "603b0c8b"; }; - -}