From 2ce76b55ebc3fe83adfd3bef8dc4aa39e91cd725 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sat, 7 Jan 2023 20:09:37 +0100 Subject: [PATCH] services: nfs fix mount point and move service file to right place --- hosts/desktop/hardware-configuration.nix | 10 ++++++++-- modules/services/{ => nas}/nfs.nix | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) rename modules/services/{ => nas}/nfs.nix (93%) diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index abe9de0..2f9f82c 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -72,11 +72,17 @@ }; fileSystems."/mnt/Pluto" = - { device = "nas:/mnt/Pluto"; + { device = "nas:/Pluto"; fsType = "nfs"; - options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ]; + options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ]; }; +# fileSystems."/mnt/Pluto" = +# { device = "nas:/Pluto/nix"; +# fsType = "nfs"; +# options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2,local_lock=all" ]; +# }; + swapDevices = [ ]; diff --git a/modules/services/nfs.nix b/modules/services/nas/nfs.nix similarity index 93% rename from modules/services/nfs.nix rename to modules/services/nas/nfs.nix index 04e67d8..0d47600 100644 --- a/modules/services/nfs.nix +++ b/modules/services/nas/nfs.nix @@ -7,6 +7,7 @@ /export/Pluto 192.168.2.0/24(rw,no_subtree_check) /export/Mars 192.168.2.0/24(rw,no_subtree_check) ''; + createMountPoints = true; }; # open the firewall networking.firewall = {