From 3e09cc7444a5c0dcf58db2ea2f188181b7f86266 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 15 Nov 2020 13:06:50 +0100
Subject: [PATCH] Move some zfs stuff around

---
 configurations/docker.nix | 11 ++++++-----
 modules/zfs.nix           |  2 --
 profiles/common.nix       |  4 ----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/configurations/docker.nix b/configurations/docker.nix
index 4ab1270b..8ae6b68d 100644
--- a/configurations/docker.nix
+++ b/configurations/docker.nix
@@ -1,11 +1,12 @@
 { ... }:
 
 {
-  chvp.zfs.systemLinks = [
-    { path = "/var/lib/docker"; type = "cache"; }
-    { path = "/var/lib/docker/volumes"; type = "data"; }
-  ];
-  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+    enable = true;
+    extraOptions = "--data-root /data/var/lib/docker";
+    storageDriver = "zfs";
+  };
+
   users.users.charlotte.extraGroups = [
     "docker"
   ];
diff --git a/modules/zfs.nix b/modules/zfs.nix
index c08165bb..9e18dcf7 100644
--- a/modules/zfs.nix
+++ b/modules/zfs.nix
@@ -41,8 +41,6 @@ in
     '';
   };
 
-  config.virtualisation.docker.storageDriver = lib.mkIf config.chvp.zfs.enable "zfs";
-
   config.services.zfs.autoScrub.enable = config.chvp.zfs.enable;
   config.services.zfs.trim.enable = config.chvp.zfs.enable;
 
diff --git a/profiles/common.nix b/profiles/common.nix
index d83e9e1a..eaca1aca 100644
--- a/profiles/common.nix
+++ b/profiles/common.nix
@@ -19,10 +19,6 @@
     ../configurations/zsh.nix
   ];
 
-  chvp.zfs.systemLinks = [
-    { path = "/root/.ssh"; type = "data"; }
-  ];
-
   home-manager.useGlobalPkgs = true;
   home-manager.users.charlotte = { pkgs, ... }: {
     home.packages = with pkgs; [