From dfb7c997bb5c446f5d01e64dc2090a540e1abde0 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Tue, 14 Jun 2022 00:13:39 -0700
Subject: [PATCH] tidy up servo /mnt points

now we maintain /mnt/servo-media as a link to the "fastest" mountpoint
---
 modules/universal/fs.nix                       |  4 ++--
 pkgs/sane-scripts/src/bin/sane-mount-servo     | 18 ++++++++++++++++++
 pkgs/sane-scripts/src/bin/sane-sync            | 16 ----------------
 pkgs/sane-scripts/src/bin/sane-sync-from-servo |  6 ++++++
 4 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100755 pkgs/sane-scripts/src/bin/sane-mount-servo
 delete mode 100755 pkgs/sane-scripts/src/bin/sane-sync
 create mode 100755 pkgs/sane-scripts/src/bin/sane-sync-from-servo

diff --git a/modules/universal/fs.nix b/modules/universal/fs.nix
index a392addd..12d7182c 100644
--- a/modules/universal/fs.nix
+++ b/modules/universal/fs.nix
@@ -17,11 +17,11 @@ let sshOpts = {
 };
 in
 {
-  fileSystems."/mnt/media-uninsane" = {
+  fileSystems."/mnt/servo-media-wan" = {
     device = "colin@uninsane.org:/opt/uninsane/media";
     inherit (sshOpts) fsType options;
   };
-  fileSystems."/mnt/media-uninsane-lan" = {
+  fileSystems."/mnt/servo-media-lan" = {
     device = "colin@servo:/opt/uninsane/media";
     inherit (sshOpts) fsType options;
   };
diff --git a/pkgs/sane-scripts/src/bin/sane-mount-servo b/pkgs/sane-scripts/src/bin/sane-mount-servo
new file mode 100755
index 00000000..30ae9d0b
--- /dev/null
+++ b/pkgs/sane-scripts/src/bin/sane-mount-servo
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -ex
+
+mnt=/mnt/servo-media-wan
+# if lan not mounted, then try to mount it
+if ! (test -d /mnt/servo-media-lan/Music)
+then
+  sudo mount /mnt/servo-media-lan && mnt=/mnt/servo-media-lan
+fi
+
+# if the needed mount isn't mounted, mount it
+if ! (test -d $mnt/Music)
+then
+  sudo mount $mnt
+fi
+
+# symlink the fastest mount point into place
+sudo ln -sf $mnt /mnt/servo-media
diff --git a/pkgs/sane-scripts/src/bin/sane-sync b/pkgs/sane-scripts/src/bin/sane-sync
deleted file mode 100755
index 89432f9a..00000000
--- a/pkgs/sane-scripts/src/bin/sane-sync
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-mnt=/mnt/media-uninsane
-if ! (test -d /mnt/media-uninsane-lan/Music)
-then
-  sudo mount /mnt/media-uninsane-lan && mnt=/mnt/media-uninsane-lan
-fi
-
-if ! (test -d $mnt/Music)
-then
-  sudo mount $mnt
-fi
-
-rsync -arv --delete --progress $mnt/Music/ ~/Music/
-
diff --git a/pkgs/sane-scripts/src/bin/sane-sync-from-servo b/pkgs/sane-scripts/src/bin/sane-sync-from-servo
new file mode 100755
index 00000000..4b5f5824
--- /dev/null
+++ b/pkgs/sane-scripts/src/bin/sane-sync-from-servo
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ex
+sane-mount-servo
+
+rsync -arv --delete --progress $mnt/Music/ ~/Music/
+