From ee95a802636c636e50afcfa8b1b23e61493ab9dc Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Tue, 29 Jun 2021 17:01:23 +0200
Subject: [PATCH] Remove file bindmount support from zfs module

---
 modules/gnupg.nix |  5 +----
 modules/zfs.nix   | 13 +------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/modules/gnupg.nix b/modules/gnupg.nix
index 81fcb5bb..ffb794d7 100644
--- a/modules/gnupg.nix
+++ b/modules/gnupg.nix
@@ -18,10 +18,7 @@
 
   config = lib.mkIf config.chvp.gnupg.enable {
     chvp.zfs.homeLinks = [
-      { path = ".gnupg/crls.d"; type = "data"; }
-      { path = ".gnupg/private-keys-v1.d"; type = "data"; }
-      { path = ".gnupg/pubring.kbx"; type = "data"; file = true; }
-      { path = ".gnupg/trustdb.gpg"; type = "data"; file = true; }
+      { path = ".gnupg"; type = "data"; }
     ];
     programs.gnupg.agent = {
       enable = true;
diff --git a/modules/zfs.nix b/modules/zfs.nix
index b620fe40..7533506a 100644
--- a/modules/zfs.nix
+++ b/modules/zfs.nix
@@ -22,7 +22,6 @@
       example = [
         { path = ".config/syncthing"; type = "data"; }
         { path = ".cache/nix-index"; type = "cache"; }
-        { path = ".gnupg/pubring.kbx"; type = "data"; file = true; }
       ];
     };
     backups = lib.mkOption {
@@ -88,17 +87,7 @@
 
     systemd.services =
       let
-        makeLinkScript = config: lib.strings.concatStringsSep "\n" (map
-          (location:
-            if location.file or false then
-              ''
-                mkdir -p $(dirname "${location.path}")
-                [ -f "${location.path}" ] || touch "${location.path}"
-              ''
-            else
-              ''mkdir -p "${location.path}"''
-          )
-          config);
+        makeLinkScript = config: lib.strings.concatStringsSep "\n" (map (location: ''mkdir -p "${location.path}"'') config);
         systemLinksScript = makeLinkScript config.chvp.zfs.systemLinks;
         homeLinksScript = makeLinkScript config.chvp.zfs.homeLinks;
       in