From 8e877cc2056faea32bbe84254b2eccce5ed5222a Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Thu, 25 Apr 2024 04:58:16 +0000 Subject: [PATCH] catacomb: switch zfs mountpoint type --- machine/catacomb/default.nix | 1 + machine/catacomb/hardware-configuration.nix | 40 --------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/machine/catacomb/default.nix b/machine/catacomb/default.nix index 7a8d48f..a3d130e 100644 --- a/machine/catacomb/default.nix +++ b/machine/catacomb/default.nix @@ -18,6 +18,7 @@ }; supportedFilesystems = ["zfs"]; zfs.enableUnstable = true; + zfs.extraPools = [ "catapool" ]; kernelParams = [ "zfs.zfs_dmu_offset_next_sync=0" ]; }; diff --git a/machine/catacomb/hardware-configuration.nix b/machine/catacomb/hardware-configuration.nix index 374d364..798c873 100644 --- a/machine/catacomb/hardware-configuration.nix +++ b/machine/catacomb/hardware-configuration.nix @@ -18,46 +18,6 @@ fsType = "ext4"; }; - fileSystems."/backup" = - { device = "catapool/backup"; - fsType = "zfs"; - }; - - fileSystems."/home/katydid" = - { device = "catapool/user/katydid"; - fsType = "zfs"; - }; - - fileSystems."/nas" = - { device = "catapool/nas"; - fsType = "zfs"; - }; - - fileSystems."/nas/image" = - { device = "catapool/nas/image"; - fsType = "zfs"; - }; - - fileSystems."/nas/audio" = - { device = "catapool/nas/audio"; - fsType = "zfs"; - }; - - fileSystems."/nas/doc" = - { device = "catapool/nas/doc"; - fsType = "zfs"; - }; - - fileSystems."/nas/game" = - { device = "catapool/nas/game"; - fsType = "zfs"; - }; - - fileSystems."/nas/video" = - { device = "catapool/nas/video"; - fsType = "zfs"; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking