From 392fe3e0fffb3585dddef99c5d97d4dd8928f1ff Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 8 Jul 2025 22:50:58 +0200 Subject: [PATCH 1/3] chore: update xmpp config????????????/ --- modules/services/xmpp.nix | 54 +++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/services/xmpp.nix b/modules/services/xmpp.nix index f9c5cf1..96fe3c7 100644 --- a/modules/services/xmpp.nix +++ b/modules/services/xmpp.nix @@ -1,29 +1,29 @@ { - # services.prosody = { - # enable = false; - # user = "acme"; - # modules = { - # welcome = true; - # websocket = true; - # watchregistrations = true; - # }; - # admins = [ "liv@liv.town" ]; - # allowRegistration = false; - # ssl.cert = "/var/lib/acme/liv.town/cert.pem"; - # ssl.key = "/var/lib/acme/liv.town/key.pem"; - # virtualHosts."liv.town" = { - # enabled = true; - # domain = "liv.town"; - # ssl.cert = "/var/lib/acme/liv.town/fullchain.pem"; - # ssl.key = "/var/lib/acme/liv.town/key.pem"; - # }; - # muc = [ - # { - # domain = "conference.liv.town"; - # } - # ]; - # uploadHttp = { - # domain = "upload.liv.town"; - # }; - # }; + services.prosody = { + enable = true; + user = "root"; + modules = { + welcome = true; + websocket = true; + watchregistrations = true; + }; + admins = [ "liv@liv.town" ]; + allowRegistration = false; + ssl.cert = "/var/lib/acme/liv.town/cert.pem"; + ssl.key = "/var/lib/acme/liv.town/key.pem"; + virtualHosts."liv.town" = { + enabled = true; + domain = "liv.town"; + ssl.cert = "/var/lib/acme/liv.town/fullchain.pem"; + ssl.key = "/var/lib/acme/liv.town/key.pem"; + }; + muc = [ + { + domain = "conference.liv.town"; + } + ]; + uploadHttp = { + domain = "upload.liv.town"; + }; + }; } From f112dd0c3f2baccefed035cce0e691c60c5b81bd Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 8 Jul 2025 22:51:04 +0200 Subject: [PATCH 2/3] chore: reorder some things --- modules/services/violet.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/violet.nix b/modules/services/violet.nix index e87f7ff..2f31873 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -7,7 +7,6 @@ ++ [ (import ./binternet-proxy.nix) ] ++ [ (import ./bluemap-proxy.nix) ] ++ [ (import ./docker.nix) ] - # ++ [ (import ./frp.nix) ] ++ [ (import ./forgejo.nix) ] ++ [ (import ./grafana.nix) ] ++ [ (import ./guacamole.nix) ] @@ -24,7 +23,7 @@ ++ [ (import ./readarr.nix) ] ++ [ (import ./sharkey-proxy.nix) ] # ++ [ (import ./komga.nix) ] - # ++ [ (import ./prosody.nix) ] + # ++ [ (import ./xmpp.nix) ] ++ [ (import ./tailscale.nix) ]; # ++ [ (import ./smart-monitoring.nix) ] # ++ [ (import ./jitsi-meet.nix) ] From 86df37a4f0c4c783d05e2c756cd142ebf11c36d7 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 8 Jul 2025 22:51:16 +0200 Subject: [PATCH 3/3] chore: adds stats to borg jobs --- modules/services/borg.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/services/borg.nix b/modules/services/borg.nix index f068108..fad706a 100644 --- a/modules/services/borg.nix +++ b/modules/services/borg.nix @@ -26,6 +26,9 @@ in fi ''; user = "${username}"; + extraCreateArgs = [ + "--stats" + ]; environment = { BORG_RSH = "ssh -p 9123 -i /home/liv/.ssh/id_ed25519"; }; @@ -46,6 +49,9 @@ in fi ''; # user = "${username}"; + extraCreateArgs = [ + "--stats" + ]; environment = { BORG_RSH = "ssh -p 9123 -i /home/liv/.ssh/id_ed25519"; };