From 7535986932845ce43da7f78c85ea8e4fc7759a14 Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 13 Jun 2022 22:25:38 -0700 Subject: [PATCH] fs: add desko mount & rework servo mount to use mdns --- modules/universal/fs.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/universal/fs.nix b/modules/universal/fs.nix index 399fc3af..a392addd 100644 --- a/modules/universal/fs.nix +++ b/modules/universal/fs.nix @@ -1,6 +1,6 @@ { pkgs, ... }: -let uninsane = { +let sshOpts = { fsType = "fuse.sshfs"; options = [ "x-systemd.automount" @@ -18,16 +18,18 @@ let uninsane = { in { fileSystems."/mnt/media-uninsane" = { - # device = "sshfs#colin@uninsane.org:/opt/uninsane/media"; device = "colin@uninsane.org:/opt/uninsane/media"; - inherit (uninsane) fsType options; + inherit (sshOpts) fsType options; }; fileSystems."/mnt/media-uninsane-lan" = { - # device = "sshfs#colin@uninsane.org:/opt/uninsane/media"; - # TODO: use mdns, and replace this with `servo` instead - device = "colin@192.168.0.5:/opt/uninsane/media"; - inherit (uninsane) fsType options; + device = "colin@servo:/opt/uninsane/media"; + inherit (sshOpts) fsType options; }; + fileSystems."/mnt/desko-home" = { + device = "colin@desko:/home/colin"; + inherit (sshOpts) fsType options; + }; + environment.systemPackages = [ pkgs.sshfs-fuse ];