From e73ff8a96a0e0e813240dda99a3aed91d0356cf6 Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Wed, 28 Jun 2023 14:25:16 +0200
Subject: [PATCH] Remove wacky NAS mounts, they're handled by ZFS natively now

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 nixos/systems/blowhole/nas.nix | 64 ++--------------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/nixos/systems/blowhole/nas.nix b/nixos/systems/blowhole/nas.nix
index 64e6b5a..41d6895 100644
--- a/nixos/systems/blowhole/nas.nix
+++ b/nixos/systems/blowhole/nas.nix
@@ -1,66 +1,8 @@
 { pkgs, ... }:
 {
-  fileSystems."/mnt/cartman" = {
-    device = "storfa/ds1/cartman";
-    fsType = "zfs";
-  };
-
-  systemd.services.mnt-kyle-zfs-relmount = {
-    requires = ["mnt-kyle.mount"];
-    after = ["mnt-kyle.mount"];
-    requiredBy = ["local-fs.target"];
-
-    path = with pkgs; [zfs util-linux];
-
-    serviceConfig = {
-      RemainAfterExit = true;
-      Type = "oneshot";
-      ExecStart = "${pkgs.zfs-relmount}/bin/zfs-relmount mount storfa/ds1/kyle /mnt/kyle";
-    };
-  };
-
-  fileSystems."/mnt/kyle" = {
-    device = "storfa/ds1/kyle";
-    fsType = "zfs";
-  };
-
-  systemd.services.mnt-cartman-zfs-relmount = {
-    requires = ["mnt-cartman.mount"];
-    after = ["mnt-cartman.mount"];
-    requiredBy = ["local-fs.target"];
-
-    path = with pkgs; [zfs util-linux];
-
-    serviceConfig = {
-      RemainAfterExit = true;
-      Type = "oneshot";
-      ExecStart = "${pkgs.zfs-relmount}/bin/zfs-relmount mount storfa/ds1/cartman /mnt/cartman";
-    };
-  };
-
-  fileSystems."/mnt/stan" = {
-    device = "storfa/ds1/stan";
-    fsType = "zfs";
-  };
-
-  systemd.services.mnt-stan-zfs-relmount = {
-    requires = ["mnt-stan.mount"];
-    after = ["mnt-stan.mount"];
-    requiredBy = ["local-fs.target"];
-
-    path = with pkgs; [zfs util-linux];
-
-    serviceConfig = {
-      RemainAfterExit = true;
-      Type = "oneshot";
-      ExecStart = "${pkgs.zfs-relmount}/bin/zfs-relmount mount storfa/ds1/stan /mnt/stan";
-    };
-  };
-
-  fileSystems."/run/restic" = {
-    fsType = "tmpfs";
-    options = [ "size=64M" ];
-  };
+  boot.zfs.extraPools = [
+    "storfa"
+  ];
 
   services.restic.backups.cartman = {
     initialize = true;