diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index c1933f1..a648c0b 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -109,34 +109,34 @@ let automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; perm_opts = "uid=1000,gid=100"; - cifs_opts = "vers=2.0,credentials=/home/tristand/.smb-secrets"; - mount_opts = "${automount_opts},${perm_opts},${cifs_opts}"; + smb_opts = [ + "vers=2.0,credentials=/home/tristand/.smb-secrets" + perm_opts + automount_opts + ]; + sshfs_opts = [ + "allow_other,_netdev,reconnect,ServerAliveInterval=15,IdentityFile=/var/secrets/id_ed25519" + perm_opts + automount_opts + ]; in { "/mnt/ServerF" = { # device = "//srv-nas-01.local/Server_F"; device = "//192.168.0.1/Server_F"; fsType = "cifs"; - options = [ mount_opts ]; + options = smb_opts; }; "/mnt/Scans" = { # device = "//srv-nas-01.local/Server_F"; device = "//192.168.0.1/Scans"; fsType = "cifs"; - options = [ mount_opts ]; + options = smb_opts; }; "/mnt/media_v2" = { device = "root@23.88.68.113:/media_v2"; fsType = "sshfs"; - options = [ - automount_opts - perm_opts - "allow_other" - "_netdev" - "reconnect" - "ServerAliveInterval=15" - "IdentityFile=/var/secrets/id_ed25519" - ]; + options = sshfs_opts; }; }; system.fsPackages = [ pkgs.sshfs ];