From 859a6d1e732bfc40e65f5ed7b33d4014d77740a8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Jan 2021 17:34:59 +0100
Subject: l bindfs: add clearTarget option

---
 lass/3modules/bindfs.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'lass/3modules/bindfs.nix')

diff --git a/lass/3modules/bindfs.nix b/lass/3modules/bindfs.nix
index 5c8df8dc5..c489ef163 100644
--- a/lass/3modules/bindfs.nix
+++ b/lass/3modules/bindfs.nix
@@ -28,6 +28,13 @@ in {
           type = types.listOf types.str;
           default = [];
         };
+        clearTarget = mkOption {
+          description = ''
+            whether to clear the target folder before mounting
+          '';
+          type = types.bool;
+          default = false;
+        };
       };
     }));
     default = {};
@@ -41,6 +48,9 @@ in {
       path = [ pkgs.coreutils ];
       serviceConfig = {
         ExecStartPre = pkgs.writeDash "bindfs-init-${name}" ''
+          ${optionalString mount.clearTarget ''
+            rm -rf '${mount.target}'
+          ''}
           mkdir -p '${mount.source}'
           mkdir -p '${mount.target}'
         '';
-- 
cgit v1.2.3


From cefb50f5f1509c06f92453e09fb63ad71a746fe0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Jan 2021 11:26:39 +0100
Subject: bindfs: l -> krebs

---
 lass/3modules/bindfs.nix | 61 ------------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 lass/3modules/bindfs.nix

(limited to 'lass/3modules/bindfs.nix')

diff --git a/lass/3modules/bindfs.nix b/lass/3modules/bindfs.nix
deleted file mode 100644
index c489ef163..000000000
--- a/lass/3modules/bindfs.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }:
-let
-  cfg = config.lass.bindfs;
-in {
-  options.lass.bindfs = mkOption {
-    type = types.attrsOf (types.submodule ({ config, ... }: {
-      options = {
-        target = mkOption {
-          description = ''
-            destination where bindfs mounts to.
-            second positional argument to bindfs.
-          '';
-          default = config._module.args.name;
-          type = types.absolute-pathname;
-        };
-        source = mkOption {
-          description = ''
-            source folder where the mounted directory is originally.
-            first positional argument to bindfs.
-          '';
-          type = types.absolute-pathname;
-        };
-        options = mkOption {
-          description = ''
-            additional arguments to bindfs
-          '';
-          type = types.listOf types.str;
-          default = [];
-        };
-        clearTarget = mkOption {
-          description = ''
-            whether to clear the target folder before mounting
-          '';
-          type = types.bool;
-          default = false;
-        };
-      };
-    }));
-    default = {};
-  };
-
-  config = mkIf (cfg != {}) {
-    systemd.services = mapAttrs' (n: mount: let
-      name = replaceStrings [ "/" ] [ "_" ] n;
-    in nameValuePair "bindfs-${name}" {
-      wantedBy = [ "local-fs.target" ];
-      path = [ pkgs.coreutils ];
-      serviceConfig = {
-        ExecStartPre = pkgs.writeDash "bindfs-init-${name}" ''
-          ${optionalString mount.clearTarget ''
-            rm -rf '${mount.target}'
-          ''}
-          mkdir -p '${mount.source}'
-          mkdir -p '${mount.target}'
-        '';
-        ExecStart = "${pkgs.bindfs}/bin/bindfs -f ${concatStringsSep " " mount.options} ${mount.source} ${mount.target}";
-      };
-    }) cfg;
-  };
-}
-- 
cgit v1.2.3