format + tree-sitter

This commit is contained in:
2026-04-15 11:28:48 +02:00
parent 6ee0af88cd
commit d191299966
10 changed files with 107 additions and 72 deletions
+4 -1
View File
@@ -44,7 +44,10 @@ in
};
system.activationScripts.initrdSshHostKey = {
deps = [ "users" "groups" ];
deps = [
"users"
"groups"
];
text = ''
install -d -m 700 "$(dirname "${cfg.hostKeyPath}")"
if [ ! -f "${cfg.hostKeyPath}" ]; then
+37 -36
View File
@@ -7,7 +7,8 @@
let
radicaleHostFor = domain: "cal.${domain}";
mkThunderbirdAutoconfig = domain:
mkThunderbirdAutoconfig =
domain:
pkgs.writeText "autoconfig-${domain}.xml" ''
<?xml version="1.0" encoding="UTF-8"?>
<clientConfig version="1.1">
@@ -47,7 +48,8 @@ let
</clientConfig>
'';
mkOutlookAutodiscover = domain:
mkOutlookAutodiscover =
domain:
pkgs.writeText "autodiscover-${domain}.xml" ''
<?xml version="1.0" encoding="utf-8"?>
<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
@@ -80,40 +82,39 @@ let
</Autodiscover>
'';
mailDiscoveryVirtualHosts =
lib.listToAttrs (
lib.concatMap (
domain:
let
autoconfigXml = mkThunderbirdAutoconfig domain;
autodiscoverXml = mkOutlookAutodiscover domain;
in
[
{
name = "autoconfig.${domain}";
value = {
enableACME = true;
forceSSL = true;
locations."= /mail/config-v1.1.xml".extraConfig = ''
default_type application/xml;
alias ${autoconfigXml};
'';
};
}
{
name = "autodiscover.${domain}";
value = {
enableACME = true;
forceSSL = true;
locations."= /autodiscover/autodiscover.xml".extraConfig = ''
default_type application/xml;
alias ${autodiscoverXml};
'';
};
}
]
) config.mailserver.domains
);
mailDiscoveryVirtualHosts = lib.listToAttrs (
lib.concatMap (
domain:
let
autoconfigXml = mkThunderbirdAutoconfig domain;
autodiscoverXml = mkOutlookAutodiscover domain;
in
[
{
name = "autoconfig.${domain}";
value = {
enableACME = true;
forceSSL = true;
locations."= /mail/config-v1.1.xml".extraConfig = ''
default_type application/xml;
alias ${autoconfigXml};
'';
};
}
{
name = "autodiscover.${domain}";
value = {
enableACME = true;
forceSSL = true;
locations."= /autodiscover/autodiscover.xml".extraConfig = ''
default_type application/xml;
alias ${autodiscoverXml};
'';
};
}
]
) config.mailserver.domains
);
in
{
services.nginx.virtualHosts = mailDiscoveryVirtualHosts // {
+4 -1
View File
@@ -1,5 +1,8 @@
{
networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedTCPPorts = [
80
443
];
security.acme = {
acceptTerms = true;
+15 -8
View File
@@ -60,14 +60,21 @@ lib.mkIf hasMailDiscoveryConfig (
wantedBy = [ "multi-user.target" ];
serviceConfig = {
DynamicUser = true;
ExecStart = lib.concatStringsSep " " [
"${pkgs.python3}/bin/python3"
"${generatorScript}"
"--domain" domain
"--mail-host" cfg.fqdn
"--radicale-host" radicaleHost
"--port" (toString mobileconfigPort)
] + defaultUsernameArg + accountArgs;
ExecStart =
lib.concatStringsSep " " [
"${pkgs.python3}/bin/python3"
"${generatorScript}"
"--domain"
domain
"--mail-host"
cfg.fqdn
"--radicale-host"
radicaleHost
"--port"
(toString mobileconfigPort)
]
+ defaultUsernameArg
+ accountArgs;
NoNewPrivileges = true;
PrivateTmp = true;
ProtectHome = true;
+1 -1
View File
@@ -18,7 +18,7 @@
];
dicts = with pkgs.aspellDicts; [
# https://search.nixos.org/packages?query=aspellDicts
en
en
sv
];
maxAttachmentSize = config.mailserver.messageSizeLimit / 1024 / 1024;
+1
View File
@@ -3,5 +3,6 @@
environment.systemPackages = with pkgs; [
lua-language-server
stylua
tree-sitter
];
}