diff --git a/modules/nixos/deertopia/copyparty.nix b/modules/nixos/deertopia/copyparty.nix index 48a3cc2..6a1f014 100644 --- a/modules/nixos/deertopia/copyparty.nix +++ b/modules/nixos/deertopia/copyparty.nix @@ -49,13 +49,13 @@ in { access.r = "*"; }; "/Media library" = { - path = "/persist/media/library"; + path = "/media/library"; # View and upload, but no deleting. access.rw = "*"; access.rwmd = "@jellyfin-admin"; }; "/Torrents" = { - path = "/persist/media/torrents"; + path = "/media/torrents"; access.r = "*"; access.rwmd = "@jellyfin-admin"; }; diff --git a/modules/nixos/deertopia/servarr.nix b/modules/nixos/deertopia/servarr.nix index a579e51..ad76bf5 100644 --- a/modules/nixos/deertopia/servarr.nix +++ b/modules/nixos/deertopia/servarr.nix @@ -35,10 +35,10 @@ in { ]; # Mount our NAS's 'media' share. - fileSystems."/persist/media/library" = { + fileSystems."/media" = { # DNS is seemingly unavailable to the mount service. device = "//192.168.68.62/media"; - mountPoint = "/persist/media/library"; + mountPoint = "/media"; fsType = "cifs"; options = [ "vers=2.0" @@ -72,22 +72,22 @@ in { requiredBy = [ "wg.service" ]; }; - systemd.services.test-mullvad-connection = { - script = '' - ${pkgs.curl}/bin/curl -s https://am.i.mullvad.net/connected >&2 - ${pkgs.curl}/bin/curl -s https://am.i.mullvad.net/connected 2>/dev/null - ''; - vpnconfinement = { - enable = true; - vpnnamespace = "wg"; - }; - }; + # systemd.services.test-mullvad-connection = { + # script = '' + # ${pkgs.curl}/bin/curl -s https://am.i.mullvad.net/connected >&2 + # ${pkgs.curl}/bin/curl -s https://am.i.mullvad.net/connected 2>/dev/null + # ''; + # vpnconfinement = { + # enable = true; + # vpnnamespace = "wg"; + # }; + # }; nixarr = { enable = true; # The default value is overly anti-FHS. stateDir = "/var/lib/nixarr"; - mediaDir = "/persist/media"; + mediaDir = "/media"; vpn = { enable = true; wgConf = "${config.nixarr.stateDir}/wg.conf";