diff --git a/modules/services/default.nix b/modules/services/default.nix index 97aba6e..349a56f 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -3,9 +3,9 @@ { imports = [ ./dunst + ./diskstation ./emacs ./agenix.nix - ./diskstation.nix ./picom.nix ]; diff --git a/modules/services/diskstation.nix b/modules/services/diskstation.nix deleted file mode 100644 index 4476c34..0000000 --- a/modules/services/diskstation.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - services.davfs2.enable = true; - - services.autofs = { - enable = true; - autoMaster = - let - mapConf = pkgs.writeText "auto" '' - keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/ - ''; - in - '' - /auto file:${mapConf} - ''; - debug = true; - }; - - home-manager.users.moritz = { - services.unison = { - enable = true; - pairs.keepass.roots = [ - "/home/moritz/Keepass" - "/auto/keepass" - ]; - }; - }; -} diff --git a/modules/services/diskstation/default.nix b/modules/services/diskstation/default.nix new file mode 100644 index 0000000..89fd86b --- /dev/null +++ b/modules/services/diskstation/default.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +{ + services.davfs2 = { + enable = true; + extraConfig = "trust_server_cert diskstation.pem"; + }; + services.autofs = { + enable = true; + autoMaster = + let + mapConf = pkgs.writeText "auto" '' + keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/ + ''; + in + '' + /auto file:${mapConf} + ''; + debug = true; + }; + + home-manager.users.moritz = { + services.unison = { + enable = true; + pairs = { + keepass.roots = [ + "/home/moritz/Keepass" + "/auto/keepass" + ]; + diskstation.roots = [ + "/home/moritz/Documents" + "/auto/diskstation" + ]; + }; + }; + }; +} diff --git a/modules/services/diskstation/diskstation.pem b/modules/services/diskstation/diskstation.pem new file mode 100644 index 0000000..ebeaf75 --- /dev/null +++ b/modules/services/diskstation/diskstation.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDtjCCAp6gAwIBAgIJAOZN5L9GVaTiMA0GCSqGSIb3DQEBCwUAMFExCzAJBgNV +BAYTAlRXMQ8wDQYDVQQHDAZUYWlwZWkxFjAUBgNVBAoMDVN5bm9sb2d5IEluYy4x +GTAXBgNVBAMMEFN5bm9sb2d5IEluYy4gQ0EwHhcNMjEwNjE4MDkwMzM5WhcNMjIw +NjE5MDkwMzM5WjBJMQswCQYDVQQGEwJUVzEPMA0GA1UEBwwGVGFpcGVpMRYwFAYD +VQQKDA1TeW5vbG9neSBJbmMuMREwDwYDVQQDDAhzeW5vbG9neTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBALrIzrQf022JpvS5Ku8lu3C5G3YzaDXpvLMv +LEHKk3eXKUu2RiyXvrTh3y0ZIW9IuOI5sSCKXlQix7NWIddXPAZkMLObe4qDzp7R +G+fPa5Tec34sphhBVpgjwHdzNRwQxhQDtMRrtMGGHpiZYXjjNDWhm9q/LBl2XBOO +CwHbsBIo8bgd8tPws1zaGtY5CAh4IaPC4lCyktxiwXKbXPBnwkpxGV5gGKIqUS/W +GicrXOxfduWqty+5msBkm/Bagf+lR7hZ1IsXKyAFelyjrfgeBRnn57VkbSlfnq+s +41A0mjGegqD5ZEqe4FPK1WcmRjRDqUuetzEjE4m5AL65/h4CaQcCAwEAAaOBmDCB +lTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDAgBgNVHSUBAf8EFjAUBggr +BgEFBQcDAQYIKwYBBQUHAwIwEwYDVR0RBAwwCoIIc3lub2xvZ3kwHQYDVR0OBBYE +FGICvrtQkLRMgp1eCbxnq0ww0NL/MB8GA1UdIwQYMBaAFEFKBxQKEgaHDckFtcoU +iVq0AzkVMA0GCSqGSIb3DQEBCwUAA4IBAQBBKyKdRl9n5mGi1uY5qGC4u3fHdXaU +5iQvF22dOT6Z9szivs31x7sNzgpQgm3hWu5wGPHaTYNjkJu3L+IqHsi6wQC4hSV8 +sVc83XDCoes5flMsmwgogzzf3DiIN+kJPiOxgwhRdAHtwpC/BxoLF/j83x8Jt96Q +TVuauRtg/WZTXAmLL/JdbT6UL/l9IigZ3mettD1oLB9ASgk+53w4Jr/CzBaXcVIQ +YLYIK/R5+9gQDYYG6zZMcpIhaj6arJOLkGXT9aBB+GZyAbuDaT48H7by+q372aoL +o/s9ONOUCsM2qNUpMi5cRRfIUlzp79tpem3+KFuc6yM3NxyxkZkHss4w +-----END CERTIFICATE-----