From 0a6f6b794d8c7a823939985729e932d809497806 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Sun, 17 Oct 2021 23:33:07 -0700
Subject: [PATCH] Various fixes to sea-store

---
 config/host-config/nostromo.nix | 4 ++--
 lib/fudo/host-filesystems.nix   | 8 ++++----
 lib/types/host.nix              | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/host-config/nostromo.nix b/config/host-config/nostromo.nix
index 65e32e9..efc50a0 100644
--- a/config/host-config/nostromo.nix
+++ b/config/host-config/nostromo.nix
@@ -43,10 +43,10 @@ in {
     filesystem-type = "btrfs";
     options = [ "noatime" "nodiratime" "compress=zstd" "noexec" ];
     mountpoints = {
-      "/share/downloads" = {
+      "/export/downloads" = {
         options = [ "subvol=@downloads" ];
       };
-      "/share/documents" = {
+      "/export/documents" = {
         options = [ "subvol=@documents" ];
       };
     };
diff --git a/lib/fudo/host-filesystems.nix b/lib/fudo/host-filesystems.nix
index 12717ae..4e98fe2 100644
--- a/lib/fudo/host-filesystems.nix
+++ b/lib/fudo/host-filesystems.nix
@@ -12,10 +12,10 @@ in {
           (fs: opts: { filesystem = fs; opts = opts; })
           host-filesystems;
 
-        mounts = builtins.listToAttrs (concatMap
+        mounts = concatMap
           (fs: mapAttrsToList
             (mp: mp-opts:
-              nameValuePair "${fs.filesystem}-${mp}-mount" {
+              {
                 what = "/dev/mapper/${fs.filesystem}";
                 type = fs.opts.filesystem-type;
                 where = mp;
@@ -25,8 +25,8 @@ in {
                 requires = [ "${fs.filesystem}-decrypt.service" ];
               })
             fs.opts.mountpoints)
-          filesystems);
-      in mounts;
+          filesystems;
+      in builtins.trace mounts mounts;
 
       services = mapAttrs' (filesystem-name: opts:
         nameValuePair "${filesystem-name}-decrypt"
diff --git a/lib/types/host.nix b/lib/types/host.nix
index 1257bc5..3ffd311 100644
--- a/lib/types/host.nix
+++ b/lib/types/host.nix
@@ -41,7 +41,7 @@ rec {
       };
 
       options = mkOption {
-        type = str;
+        type = listOf str;
         description = "List of filesystem options with which to mount.";
       };