diff --git a/home.nix b/home.nix index 9514662..9f0ea3c 100644 --- a/home.nix +++ b/home.nix @@ -82,6 +82,7 @@ in { # office apps libreoffice-fresh recoll + taskwarrior-tui # spell check ispell hunspell @@ -518,4 +519,10 @@ in { git_branch.disabled = true; }; }; + + # task management + programs.taskwarrior = { + enable = true; + package = pkgs.taskwarrior3; + }; } diff --git a/void.nix b/void.nix index 7c266f8..b0fe9ed 100644 --- a/void.nix +++ b/void.nix @@ -122,6 +122,7 @@ "**/target" "**/result" "/var/log" + "/pile/void2backup" ]; repo = "ssh://u480566-sub1@u480566-sub1.your-storagebox.de:23/./repo"; encryption = { @@ -183,7 +184,7 @@ rsyncSSHKeys = [""]; serverConfig = { server-port = 25565; - motd = "Welcome to logistic-bot's TerraFirmaGreg server (v0.9.11)"; + motd = "Welcome to logistic-bot's TerraFirmaGreg server (v0.10.7)"; allow-flight = true; allow-nether = false; difficulty = 0; @@ -334,6 +335,34 @@ configureRedis = true; maxUploadSize = "64G"; }; + services.nextcloud-whiteboard-server = { + enable = true; + secrets = ["/etc/nixos/secrets/nextcloud/whiteboard_secrets"]; + settings = { + NEXTCLOUD_URL = "https://nextcloud.005540.xyz"; + }; + }; + services.collabora-online = { + enable = true; + settings = { + ssl = { + enable = false; + termination = true; + }; + + net = { + listen = "loopback"; + post_allow.host = ["::1"]; + }; + + storage.wopi = { + "@allow" = true; + host = ["nextcloud.005540.xyz"]; + }; + + server_name = "collabora.005540.xyz"; + }; + }; # dynamic dns services.ddclient = { @@ -445,6 +474,18 @@ }; "nextcloud.005540.xyz" = { locations."/".proxyWebsockets = true; + locations."/whiteboard/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:3002/"; + }; + enableACME = true; + forceSSL = true; + }; + "collabora.005540.xyz" = { + locations."/" = { + proxyPass = "http://[::1]:${toString config.services.collabora-online.port}"; + proxyWebsockets = true; + }; enableACME = true; forceSSL = true; };