liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-05 15:15:39 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

chore: merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
Ahwx 2025-07-09 10:12:04 +02:00
commit b1e9c97d0b
3 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/services/borg.nix
View file

@ -26,6 +26,9 @@ in
fi fi
''; '';
user = "${username}"; user = "${username}";
extraCreateArgs = [
"--stats"
];
environment = { environment = {
BORG_RSH = "ssh -p 9123 -i /home/liv/.ssh/id_ed25519"; BORG_RSH = "ssh -p 9123 -i /home/liv/.ssh/id_ed25519";
}; };
@ -46,6 +49,9 @@ in
fi fi
''; '';
# user = "${username}"; # user = "${username}";
extraCreateArgs = [
"--stats"
];
environment = { environment = {
BORG_RSH = "ssh -p 9123 -i /home/liv/.ssh/id_ed25519"; BORG_RSH = "ssh -p 9123 -i /home/liv/.ssh/id_ed25519";
}; };

3
modules/services/violet.nix
View file

@ -7,7 +7,6 @@
++ [ (import ./binternet-proxy.nix) ] ++ [ (import ./binternet-proxy.nix) ]
++ [ (import ./bluemap-proxy.nix) ] ++ [ (import ./bluemap-proxy.nix) ]
++ [ (import ./docker.nix) ] ++ [ (import ./docker.nix) ]
# ++ [ (import ./frp.nix) ]
++ [ (import ./forgejo.nix) ] ++ [ (import ./forgejo.nix) ]
++ [ (import ./grafana.nix) ] ++ [ (import ./grafana.nix) ]
++ [ (import ./guacamole.nix) ] ++ [ (import ./guacamole.nix) ]
@ -24,7 +23,7 @@
++ [ (import ./readarr.nix) ] ++ [ (import ./readarr.nix) ]
++ [ (import ./sharkey-proxy.nix) ] ++ [ (import ./sharkey-proxy.nix) ]
# ++ [ (import ./komga.nix) ] # ++ [ (import ./komga.nix) ]
# ++ [ (import ./prosody.nix) ] # ++ [ (import ./xmpp.nix) ]
++ [ (import ./tailscale.nix) ]; ++ [ (import ./tailscale.nix) ];
# ++ [ (import ./smart-monitoring.nix) ] # ++ [ (import ./smart-monitoring.nix) ]
# ++ [ (import ./jitsi-meet.nix) ] # ++ [ (import ./jitsi-meet.nix) ]

54
modules/services/xmpp.nix
View file

@ -1,29 +1,29 @@
{ {
# services.prosody = { services.prosody = {
# enable = false; enable = true;
# user = "acme"; user = "root";
# modules = { modules = {
# welcome = true; welcome = true;
# websocket = true; websocket = true;
# watchregistrations = true; watchregistrations = true;
# }; };
# admins = [ "liv@liv.town" ]; admins = [ "liv@liv.town" ];
# allowRegistration = false; allowRegistration = false;
# ssl.cert = "/var/lib/acme/liv.town/cert.pem"; ssl.cert = "/var/lib/acme/liv.town/cert.pem";
# ssl.key = "/var/lib/acme/liv.town/key.pem"; ssl.key = "/var/lib/acme/liv.town/key.pem";
# virtualHosts."liv.town" = { virtualHosts."liv.town" = {
# enabled = true; enabled = true;
# domain = "liv.town"; domain = "liv.town";
# ssl.cert = "/var/lib/acme/liv.town/fullchain.pem"; ssl.cert = "/var/lib/acme/liv.town/fullchain.pem";
# ssl.key = "/var/lib/acme/liv.town/key.pem"; ssl.key = "/var/lib/acme/liv.town/key.pem";
# }; };
# muc = [ muc = [
# { {
# domain = "conference.liv.town"; domain = "conference.liv.town";
# } }
# ]; ];
# uploadHttp = { uploadHttp = {
# domain = "upload.liv.town"; domain = "upload.liv.town";
# }; };
# }; };
} }