From cab2969d30f39b98b2d1b29f6c980ec834770251 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 30 Apr 2018 14:59:27 +0200
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hel.nix | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/hel.nix b/hel.nix
index 024429f0..4958a58f 100644
--- a/hel.nix
+++ b/hel.nix
@@ -454,13 +454,21 @@
   };
 
   systemd.automounts = [
-    { enable = true;
+    { 
       where = "/run/media/var/media";
       automountConfig = {
         DirectoryMode = "700";
       };
       wantedBy = [ "local-fs.target" ];
     }
+    {
+      where = "/media";
+      automountConfig = {
+        TimeoutIdleSec = "5min";
+        DirectoryMode = "755";
+      };
+      wantedBy = [ "remote-fs.target" ];
+    }
   ];
 
   systemd.mounts = [
@@ -473,6 +481,14 @@
         DirectoryMode = "700";
       };
     }
+    {
+      where = "/media";
+      what = "\\\\odin.asgard.yggdrasil\\media";
+      type = "cifs";
+      options = lib.concatStringsSep ","
+        [ "guest"
+        ];
+    }
   ];
 
   systemd.user.services."pulseaudio".enable = lib.mkForce false;
@@ -568,25 +584,5 @@
       disable spoolss = yes
     '';
   };
-
-  systemd.mounts = [
-    {
-      where = "/media";
-      what = "\\\\odin.asgard.yggdrasil\\media";
-      type = "cifs";
-      options = lib.concatStringsSep ","
-        [ "guest"
-        ];
-    }
-  ];
-
-  systemd.automounts = [
-    {
-      where = "/media";
-      automountConfig = {
-        TimeoutIdleSec = "5min";
-      };
-    }
-  ];
 }
 
-- 
cgit v1.2.3