From 47a4b3d7789e1c582b0ffa481e3e84c733f39fff Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Mon, 18 Jul 2022 22:02:00 +0200
Subject: [PATCH] [Filesystems] Move ZFS config into defaults/filesystems

---
 filesystems.nix         | 12 ++++++++----
 filesystems/default.nix |  6 ++++++
 filesystems/zfs.nix     | 25 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 filesystems/default.nix
 create mode 100644 filesystems/zfs.nix

diff --git a/filesystems.nix b/filesystems.nix
index 3884e6b..7d3880b 100644
--- a/filesystems.nix
+++ b/filesystems.nix
@@ -10,6 +10,10 @@ let
   ioSchedType = types.enum [ "bfq" "kyber" "mq-deadline" "none" null ];
 in
 {
+  imports = [
+    ./filesystems
+  ];
+
   options.aviallon.filesystems = {
     enable = mkOption {
       default = true;
@@ -70,16 +74,16 @@ in
 
     aviallon.filesystems.udevRules = mkBefore (concatLists [
       (optional (!(builtins.isNull cfg.hddScheduler))
-        ''ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="sd[a-z]*", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}!="none", ATTR{queue/scheduler}="${cfg.hddScheduler}"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]*", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="${cfg.hddScheduler}"''
       )
       (optional (!(builtins.isNull cfg.slowFlashScheduler))
-        ''ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="sd[a-z]*|nvme[0-9]*n[0-9]*|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="${cfg.slowFlashScheduler}"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]*|nvme[0-9]*n[0-9]*|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="${cfg.slowFlashScheduler}"''
       )
       (optional (!(builtins.isNull cfg.nvmeScheduler))
-        ''ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="nvme[0-9]*n[0-9]*", ATTR{queue/scheduler}="${cfg.nvmeScheduler}"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="nvme[0-9]*n[0-9]*", ATTR{queue/scheduler}="${cfg.nvmeScheduler}"''
       )
       (optional cfg.queuePriority
-        ''ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="sd[a-z]*", ATTR{device/ncq_prio_supported}=="1", ATTR{device/ncq_prio_enable}="1"''
+        ''ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sd[a-z]*", ATTR{device/ncq_prio_supported}=="1", ATTR{device/ncq_prio_enable}="1"''
       )
     ]);
 
diff --git a/filesystems/default.nix b/filesystems/default.nix
new file mode 100644
index 0000000..a23ee33
--- /dev/null
+++ b/filesystems/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./zfs.nix
+  ];
+}
diff --git a/filesystems/zfs.nix b/filesystems/zfs.nix
new file mode 100644
index 0000000..f47b698
--- /dev/null
+++ b/filesystems/zfs.nix
@@ -0,0 +1,25 @@
+{config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.aviallon.filesystems.zfs;
+in {
+  options.aviallon.filesystems.zfs = {
+    enable = mkEnableOption "ZFS support";
+  };
+
+  config = mkIf cfg.enable {
+    boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs
+    boot.supportedFilesystems = [ "zfs" ];
+
+    aviallon.filesystems.udevRules = mkAfter [
+      # ZFS doesn't like additional schedulers
+      ''SUBSYSTEM=="block", ACTION!="remove", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="zfs_member", ATTR{../queue/scheduler}="none"''
+    ];
+    
+    services.zfs.autoScrub.enable = true;
+    services.zfs.autoSnapshot.enable = true;
+
+    # Can cause issues with ZFS
+    boot.kernelParams = [ "nohibernate" ];
+  };
+}