Merge branch 'master' of git:nixos

2 files changed, 23 insertions, 23 deletions

diff --git a/vali.nix b/vali.nix
index 6711e0f8..d6e6df4c 100644
--- a/vali.nix
+++ b/vali.nix
@@ -170,26 +170,26 @@ rec {
     '';
   };
 
-  systemd.automounts = [
-    { enable = true;
-      where = "/var/media";
-      automountConfig = {
-        DirectoryMode = "555";
-      };
-      wantedBy = [ "remote-fs.target" ];
-    }
-  ];
-
-  systemd.mounts = [
-    { enable = true;
-      where = "/var/media";
-      what = "media@hel.asgard.yggdrasil:/var/media";
-      type = "fuse.sshfs";
-      options = "idmap=user,IdentityFile=/home/gkleen/.ssh/media@hel,allow_other,reconnect,_netdev";
-      mountConfig = {
-        Environment = "PATH=/run/current-system/sw/bin:/run/current/system/sw/sbin";
-        DirectoryMode = "555";
-      };
-    }
-  ];
+  # systemd.automounts = [
+  #   { enable = true;
+  #     where = "/var/media";
+  #     automountConfig = {
+  #       DirectoryMode = "555";
+  #     };
+  #     wantedBy = [ "remote-fs.target" ];
+  #   }
+  # ];
+
+  # systemd.mounts = [
+  #   { enable = true;
+  #     where = "/var/media";
+  #     what = "media@hel.asgard.yggdrasil:/var/media";
+  #     type = "fuse.sshfs";
+  #     options = "idmap=user,IdentityFile=/home/gkleen/.ssh/media@hel,allow_other,reconnect,_netdev";
+  #     mountConfig = {
+  #       Environment = "PATH=/run/current-system/sw/bin:/run/current/system/sw/sbin";
+  #       DirectoryMode = "555";
+  #     };
+  #   }
+  # ];
 }
diff --git a/ymir.nix b/ymir.nix
index c0424354..fc794677 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -384,7 +384,7 @@ in rec {
       luser_relay = gkleen+''${local}
       
       # 1 GiB
-      message_size_limit = 1073741824
+      message_size_limit = 0
       # 10 GiB
       mailbox_size_limit = 10737418240