diff --git a/common/fragments/graphical/bspwm.nix b/common/fragments/graphical/bspwm.nix index a13d78b..78a399b 100644 --- a/common/fragments/graphical/bspwm.nix +++ b/common/fragments/graphical/bspwm.nix @@ -13,6 +13,7 @@ startup = startOnce [ "firefox" "element-desktop" + "dino" "telegram-desktop" "spotify" "geary" diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index c95da02..ad3a825 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -37,6 +37,7 @@ bspm colmena darktable + dino element-desktop exiftool ffmpeg diff --git a/common/fragments/prosody.nix b/common/fragments/prosody.nix new file mode 100644 index 0000000..d2da303 --- /dev/null +++ b/common/fragments/prosody.nix @@ -0,0 +1,29 @@ +{ config, ... }: +let + ssl = { + cert = "${ + config.security.acme.certs."technogothic.net".directory + }/fullchain.pem"; + key = "${config.security.acme.certs."technogothic.net".directory}/key.pem"; + }; +in { + services.prosody = { + enable = true; + admins = [ "Agatha@argent.technogothic.net" ]; + inherit ssl; + + virtualHosts."argent.technogothic.net" = { + enabled = true; + domain = "argent.technogothic.net"; + inherit ssl; + }; + + muc = [{ domain = "muc.argent.technogothic.net"; }]; + uploadHttp.domain = "upload.argent.technogothic.net"; + }; + + users.users."${config.services.prosody.user}".extraGroups = + [ "acme" "nginx" ]; + + networking.firewall.allowedTCPPorts = [ 5000 5222 5269 5281 ]; +} diff --git a/hosts/bloodletting/configuration.nix b/hosts/bloodletting/configuration.nix index c1b5d68..dda3c1d 100644 --- a/hosts/bloodletting/configuration.nix +++ b/hosts/bloodletting/configuration.nix @@ -14,6 +14,7 @@ ../../common/fragments/nyandroid.nix ../../common/fragments/postgres.nix ../../common/fragments/prometheus_exporters.nix + ../../common/fragments/prosody.nix ../../common/fragments/vsftpd.nix ../../common/home_manager/common.nix ]; @@ -89,7 +90,7 @@ group = "nginx"; }; - security.acme.defaults.reloadServices = [ "nginx" "vsftpd" ]; + security.acme.defaults.reloadServices = [ "nginx" "vsftpd" "prosody" ]; systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; # Nginx diff --git a/hosts/ritual/configuration.nix b/hosts/ritual/configuration.nix index 5498e7b..40d0860 100644 --- a/hosts/ritual/configuration.nix +++ b/hosts/ritual/configuration.nix @@ -39,6 +39,7 @@ rules = { "Element".desktop = "II"; "TelegramDesktop".desktop = "III"; + "dino".desktop = "III"; "Spotify".desktop = "IV"; "Geary".desktop = "V"; "firefox" = { diff --git a/hosts/tears/configuration.nix b/hosts/tears/configuration.nix index cff2a5b..7ae8df9 100644 --- a/hosts/tears/configuration.nix +++ b/hosts/tears/configuration.nix @@ -41,6 +41,7 @@ rules = { "Element".desktop = "I"; "TelegramDesktop".desktop = "II"; + "dino".desktop = "II"; "Spotify".desktop = "III"; "Geary".desktop = "IV"; "firefox" = {