samba instead of nfs

2 files changed, 7 insertions, 27 deletions

diff --git a/bragi.nix b/bragi.nix
index f2c9d5aa..ba615e97 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -142,10 +142,6 @@ in rec {
   systemd.automounts = [
     {
       wantedBy = [ "multi-user.target" ];
-      where = "/media/odin";
-    }
-    {
-      wantedBy = [ "multi-user.target" ];
       where = "/media/dellingr";
       automountConfig.TimoutIdleSec = "30s";
     }
@@ -158,12 +154,6 @@ in rec {
 
   systemd.mounts = [
     {
-      what = "odin.asgard.yggdrasil:/srv/media";
-      where = "/media/odin";
-      type = "nfs";
-      options = "ro";
-    }
-    {
       what = "/dev/disk/by-uuid/6436-3432";
       where = "/media/dellingr";
       type = "vfat";
@@ -234,7 +224,7 @@ in rec {
 
   services.mpd = {
     enable = true;
-    musicDirectory = "/media/odin/music";
+    musicDirectory = "smb://odin.asgard.yggdrasil/media/music";
     network.listenAddress = "any"; # Just so the module won't produce a bind_to_adress line
     extraConfig = ''
       bind_to_address "bragi.bragisheimr.yggdrasil"
@@ -267,8 +257,6 @@ in rec {
     group = "audio";
   };
 
-  security.wrappers = { "mount.nfs".source = "${pkgs.nfs-utils}/bin/mount.nfs"; };
-
   programs.bash.promptInit = ''
     PROMPT_COLOR="1;31m"
     return $UID && PROMPT_COLOR="1;32m"
diff --git a/odin.nix b/odin.nix
index 34ad166e..cddbb5a4 100644
--- a/odin.nix
+++ b/odin.nix
@@ -64,16 +64,12 @@
     allowPing = true;
     allowedTCPPorts = [ 22 # ssh
                         139 445 # samba
-                        111 2049 # nfs
                       ];
     allowedTCPPortRanges = [ { from = 8080; to = 8080; } # motion
-                             { from = 4000; to = 4002; } # nfs
                            ];
     allowedUDPPorts = [ 137 138 # samba
-                        111 2049 # nfs
                       ];
     allowedUDPPortRanges = [ { from = 60000; to = 61000; } # mosh
-                             { from = 4000; to = 4002; } # nfs
                            ];
   };
 
@@ -208,6 +204,12 @@
         writable = true;
         path = "/srv/eos";
       };
+
+      media = {
+        browseable = true;
+        writable = false;
+        path = "/srv/media";
+      };
     };
     extraConfig = ''
       domain master = true
@@ -299,16 +301,6 @@
     members = [ "motion" ];
   };
 
-  services.nfs.server = {
-    enable = true;
-    exports = ''
-      /srv/media *(ro,insecure,all_squash,no_subtree_check,mp)
-    '';
-    lockdPort = 4001;
-    mountdPort = 4002;
-    statdPort = 4000;
-  };
-
   virtualisation.libvirtd = {
     enable = true;
   };