diff --git a/nixosModules/default.nix b/nixosModules/default.nix index 69c9435..b6d5196 100755 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -46,7 +46,7 @@ let ./essentials ./users.nix ./options.nix - + disko.nixosModules.disko # disko module sops-nix.nixosModules.sops # sops module ]; diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index 15c5b89..4854ee1 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -122,36 +122,35 @@ in fonts.packages = [ work.corefonts ]; - # networking.hosts = { # }; systemd.services.nextcloud-config-collabora = - let - inherit (config.services.nextcloud) occ; - wopi_url = "http://localhost:${toString config.services.collabora-online.port}"; - public_wopi_url = "https://office.zeroq.ru"; - wopi_allowlist = lib.concatStringsSep "," [ - "0.0.0.0/0" - ]; - in - { - wantedBy = [ "multi-user.target" ]; - after = [ - "nextcloud-setup.service" - "coolwsd.service" - ]; - requires = [ "coolwsd.service" ]; - script = '' - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} - ${occ}/bin/nextcloud-occ richdocuments:setup - ''; - serviceConfig = { - Type = "oneshot"; + let + inherit (config.services.nextcloud) occ; + wopi_url = "http://localhost:${toString config.services.collabora-online.port}"; + public_wopi_url = "https://office.zeroq.ru"; + wopi_allowlist = lib.concatStringsSep "," [ + "0.0.0.0/0" + ]; + in + { + wantedBy = [ "multi-user.target" ]; + after = [ + "nextcloud-setup.service" + "coolwsd.service" + ]; + requires = [ "coolwsd.service" ]; + script = '' + ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} + ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} + ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} + ${occ}/bin/nextcloud-occ richdocuments:setup + ''; + serviceConfig = { + Type = "oneshot"; + }; }; - }; fileSystems."${config.services.nextcloud.home}" = { device = "${xlib.dirs.services-folder}/nextcloud";