From cb01f5c303e1ac4dad18d360054ac6b62974230f Mon Sep 17 00:00:00 2001
From: Dmitriy Holkin <alukard.develop@gmail.com>
Date: Sun, 29 Sep 2019 14:59:51 +0400
Subject: [PATCH] fix mount, iperf

---
 modules/applications/packages.nix |  1 +
 modules/filesystems.nix           | 55 ++++++++++++++++---------------
 modules/samba.nix                 |  8 ++---
 modules/services.nix              |  4 +--
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index 4bebc22..6efeaa3 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -33,6 +33,7 @@ with deviceSpecific; {
     lm_sensors
     libnotify
     tree
+    iperf
     (youtube-to-mpv.override { isLaptop = isLaptop; })
     # Other
     (vivaldi.override { proprietaryCodecs = true; })
diff --git a/modules/filesystems.nix b/modules/filesystems.nix
index 29b2dfa..98cabed 100644
--- a/modules/filesystems.nix
+++ b/modules/filesystems.nix
@@ -43,18 +43,32 @@ with deviceSpecific; {
         "gid=${toString config.users.groups.smbgrp.gid}"
       ];
     };
-    "/shared/data" = lib.mkIf (isHost) {
+    "/media/data" = if isHost then {
+      # Samba host
       fsType = "ntfs";
       device = "/dev/disk/by-partuuid/f9f853f5-498a-4981-8082-02feeae85377";
       options = [
-        "ro"
+        # "ro"
         # "noatime"
         "nofail"
         "uid=${toString config.users.users.alukard.uid}"
         "gid=${toString config.users.groups.smbgrp.gid}"
       ];
+    } else {
+      # Linux samba
+      fsType = "cifs";
+      device = "//192.168.0.100/data";
+      options = [
+        "ro"
+        "user=${secrets.linux-samba.user}"
+        "password=${secrets.linux-samba.password}"
+        # "nofail"
+        "uid=${toString config.users.users.alukard.uid}"
+        "gid=${toString config.users.groups.users.gid}"
+      ];
     };
-    "/shared/files" = lib.mkIf (isHost) {
+    "/media/files" = if isHost then {
+      # Samba host
       fsType = "ntfs";
       device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f";
       options = [
@@ -64,6 +78,17 @@ with deviceSpecific; {
         "uid=${toString config.users.users.alukard.uid}"
         "gid=${toString config.users.groups.smbgrp.gid}"
       ];
+    } else {
+      # Linux samba
+      fsType = "cifs";
+      device = "//192.168.0.100/files";
+      options = [
+        "user=${secrets.linux-samba.user}"
+        "password=${secrets.linux-samba.password}"
+        # "nofail"
+        "uid=${toString config.users.users.alukard.uid}"
+        "gid=${toString config.users.groups.users.gid}"
+      ];
     };
     # Samba Windows
     "/media/windows/files" = lib.mkIf (!isHost) {
@@ -89,30 +114,6 @@ with deviceSpecific; {
         "gid=${toString config.users.groups.users.gid}"
       ];
     };
-    # Samba Linux
-    "/media/linux/files" = lib.mkIf (!isHost) {
-      fsType = "cifs";
-      device = "//192.168.0.100/files";
-      options = [
-        "user=${secrets.linux-samba.user}"
-        "password=${secrets.linux-samba.password}"
-        # "nofail"
-        "uid=${toString config.users.users.alukard.uid}"
-        "gid=${toString config.users.groups.users.gid}"
-      ];
-    };
-    "/media/linux/data" = lib.mkIf (!isHost) {
-      fsType = "cifs";
-      device = "//192.168.0.100/data";
-      options = [
-        "ro"
-        "user=${secrets.linux-samba.user}"
-        "password=${secrets.linux-samba.password}"
-        # "nofail"
-        "uid=${toString config.users.users.alukard.uid}"
-        "gid=${toString config.users.groups.users.gid}"
-      ];
-    };
   };
   swapDevices = [
     {
diff --git a/modules/samba.nix b/modules/samba.nix
index 870df4a..48d59db 100644
--- a/modules/samba.nix
+++ b/modules/samba.nix
@@ -33,21 +33,19 @@ with deviceSpecific; {
       smb ports = 445
 
       [data]
-      path = /shared/data
+      path = /media/data
       browsable = yes
-      read only = yes
+      read only = no
       force create mode = 0660
       force directory mode = 2770
       valid users = @smbgrp
 
       [files]
-      path = /shared/files
+      path = /media/files
       browsable = yes
       read only = no
-      # guest only = yes
       force create mode = 0660
       force directory mode = 2770
-      # force user = smbuser
       valid users = @smbgrp
     '';
   };
diff --git a/modules/services.nix b/modules/services.nix
index 0fcd22a..5fa218b 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -14,7 +14,7 @@
       [local]
       enabled = true
       library = sqlite
-      media_dir = /shared/files/Music
+      media_dir = /media/files/Music
       scan_timeout = 1000
       scan_flush_threshold = 100
       scan_follow_symlinks = false
@@ -32,7 +32,7 @@
   home-manager.users.alukard.home.file.".ncmpcpp/config".text = ''
     mpd_host = 127.0.0.1
     mpd_port = 6600
-    mpd_music_dir = "/shared/files/Music"
+    mpd_music_dir = "/media/files/Music"
   '';
 
   # services.mopidy = {