moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

comments out no longer needed mounts

Browse source
This commit is contained in:
Moritz Böhme 2021-11-04 17:29:28 +01:00
parent cb33921e13
commit 33df9ff591
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
modules/services/diskstation/default.nix
View file

@ -1,26 +1,26 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
services.davfs2 = { # services.davfs2 = {
enable = true; # enable = true;
extraConfig = '' # extraConfig = ''
[/auto/keepass] # [/auto/keepass]
trust_server_cert home-boehmies-de.pem # trust_server_cert home-boehmies-de.pem
''; # '';
}; # };
services.autofs = { # services.autofs = {
enable = true; # enable = true;
autoMaster = let # autoMaster = let
mapConf = pkgs.writeText "auto" '' # mapConf = pkgs.writeText "auto" ''
keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/ # keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/
''; # '';
in '' # in ''
/auto file:${mapConf} # /auto file:${mapConf}
''; # '';
}; # };
environment.etc."davfs2/certs/home-boehmies-de.pem" = { # environment.etc."davfs2/certs/home-boehmies-de.pem" = {
text = builtins.readFile ./home-boehmies-de.pem; # text = builtins.readFile ./home-boehmies-de.pem;
}; # };
fileSystems."/media/media" = { fileSystems."/media/media" = {
device = "//192.168.0.2/media"; device = "//192.168.0.2/media";
@ -35,18 +35,18 @@
]; ];
}; };
fileSystems."/media/diskstation" = { # fileSystems."/media/diskstation" = {
device = "//192.168.0.2/home/Drive"; # device = "//192.168.0.2/home/Drive";
fsType = "cifs"; # fsType = "cifs";
options = let # options = let
# this line prevents hanging on network split # # this line prevents hanging on network split
automount_opts = # automount_opts =
"x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; # "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in [ # in [
"${automount_opts},credentials=/run/secrets/smbMoritz,uid=1000,gid=100" # "${automount_opts},credentials=/run/secrets/smbMoritz,uid=1000,gid=100"
]; # ];
}; # };
# home-manager.users.moritz = { # home-manager.users.moritz = {
# services.unison = { # services.unison = {