persist: configure the private store to symlink everyting by default

modules/lib/default.nix

@@ -4,6 +4,12 @@
   path = import ./path.nix moduleArgs;
   types = import ./types.nix moduleArgs;
 
+  # if `maybe-null` is non-null, yield that. else, return the `default`.
+  withDefault = default: maybe-null: if maybe-null != null then
+    maybe-null
+  else
+    default;
+
   filterNonNull = attrs: lib.filterAttrsRecursive (n: v: v != null) attrs;
   # transform a list into an attrset via a function which maps an element to a name + value
   # Type: mapToAttrs :: (a -> { name, value }) -> [a] -> AttrSet

modules/persist/default.nix

@@ -34,6 +34,13 @@ let
           /mnt/crypt/private/var/private/www/root.
         '';
       };
+      defaultMethod = mkOption {
+        type = types.enum [ "bind" "symlink" ];
+        default = "bind";
+        description = ''
+          preferred way to link items from the store into the fs
+        '';
+      };
       defaultOrdering.wantedBeforeBy = mkOption {
         type = types.listOf types.str;
         default = [ "local-fs.target" ];
@@ -63,8 +70,8 @@ let
         default = {};
       };
       method = mkOption {
-        type = types.enum [ "bind" "symlink" ];
+        type = types.nullOr (types.enum [ "bind" "symlink" ]);
-        default = "bind";
+        default = null;
         description = ''
           how to link the store entry into the fs
         '';
@@ -205,6 +212,7 @@ in
     cfgFor = fspath: opt:
       let
         store = opt.store;
+        method = (sane-lib.withDefault store.defaultMethod) opt.method;
         fsPathToStoreRelPath = fspath: path.from store.prefix fspath;
         fsPathToBackingPath = fspath: path.concat [ store.origin (fsPathToStoreRelPath fspath) ];
       in [
@@ -212,11 +220,11 @@ in
           # create destination dir, with correct perms
           sane.fs."${fspath}" = {
             inherit (store.defaultOrdering) wantedBy wantedBeforeBy;
-          } // (lib.optionalAttrs (opt.method == "bind") {
+          } // (lib.optionalAttrs (method == "bind") {
             # inherit perms & make sure we don't mount until after the mount point is setup correctly.
             dir.acl = opt.acl;
             mount.bind = fsPathToBackingPath fspath;
-          }) // (lib.optionalAttrs (opt.method == "symlink") {
+          }) // (lib.optionalAttrs (method == "symlink") {
             symlink.acl = opt.acl;
             symlink.target = fsPathToBackingPath fspath;
           });

modules/persist/stores/private.nix

@@ -20,6 +20,7 @@ lib.mkIf config.sane.persist.enable
       # we can't create things in private before local-fs.target
       wantedBeforeBy = [ ];
     };
+    defaultMethod = "symlink";
   };
 
   fileSystems."/home/colin/private" = {