changes: remove zellij from default modules

system/dev/dn-lap/default.nix

@@ -1,6 +1,5 @@
 { hostname }:
 {
-  config,
   ...
 }:
 let

system/dev/dn-pre7780/default.nix

@@ -1,11 +1,7 @@
 { hostname }:
 {
-  self,
-  inputs,
   pkgs,
-  config,
   helper,
-  lib,
   ...
 }:
 let

system/dev/dn-pre7780/home/default.nix

@@ -8,6 +8,7 @@ in
   home-manager.users."${username}" = {
     imports = [
       ../../../../home/presets/basic.nix
+      ../../../../home/user/zellij.nix
       ./expr
       ./wm
 

system/dev/dn-pre7780/home/expr/default.nix

@@ -2,6 +2,5 @@
 {
   imports = [
     ./helix.nix
-    ../../../../../home/user/zellij.nix
   ];
 }

system/dev/dn-pre7780/services/mail.nix

@@ -39,7 +39,7 @@ in
         base-dn = "ou=people,dc=net,dc=dn";
         attributes = {
           name = "uid";
-          email = "mail";
+          email = "mailRoutingAddress";
           secret = "userPassword";
           description = [
             "cn"
@@ -48,8 +48,8 @@ in
           class = "objectClass";
         };
         filter = {
-          name = "(&(objectClass=inetOrgPerson)(|(uid=?)(mail=?)))";
-          email = "(&(objectClass=inetOrgPerson)(mail=?))";
+          name = "(&(objectClass=inetOrgPerson)(|(uid=?)(mail=?)(mailRoutingAddress=?)))";
+          email = "(&(objectClass=inetOrgPerson)(mailRoutingAddress=?))";
         };
         bind = {
           dn = "cn=admin,dc=net,dc=dn";

system/dev/dn-server/default.nix

@@ -1,10 +1,6 @@
 { hostname }:
 {
   pkgs,
-  lib,
-  inputs,
-  system,
-  config,
   ...
 }:
 let
@@ -40,6 +36,12 @@ in
     };
   };
 
+  services.journald.extraConfig = ''
+    SystemMaxUse=10G
+    SystemKeepFree=100M
+    MaxFileSec=1month
+  '';
+
   imports = [
     ./common
     ./home

system/dev/dn-server/network/services.nix

@@ -392,11 +392,21 @@ in
         "10.0.0.0/24"
         "192.168.100.0/24"
       ];
+      dns.port = 5300;
       yaml-settings = {
         webservice.webserver = true;
       };
     };
 
+    dnsdist = {
+      enable = true;
+      extraConfig = ''
+        newServer("127.0.0.1:${toString config.services.pdns-recursor.dns.port}")
+        addDOHLocal("0.0.0.0:8053", nil, nil, "/", { reusePort = true })
+        getPool(""):setCache(newPacketCache(65535, {maxTTL=86400, minTTL=0, temporaryFailureTTL=60, staleTTL=60, dontAge=false}))
+      '';
+    };
+
     powerdns-admin = {
       enable = true;
       secretKeyFile = config.sops.secrets."powerdns-admin/secret".path;
@@ -457,13 +467,29 @@ in
   };
 
   services.nginx.virtualHosts = {
+    "dns.${config.networking.domain}" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/dns-query" = {
+        extraConfig = ''
+          grpc_pass grpc://127.0.0.1:${toString 8053};
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-Host $host;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+          proxy_set_header X-Forwarded-Protocol $scheme;
+          proxy_set_header Range $http_range;
+          proxy_set_header If-Range $http_if_range;
+        '';
+      };
+    };
     "powerdns.${config.networking.domain}" = {
       enableACME = true;
       forceSSL = true;
       locations."/api".proxyPass = "http://127.0.0.1:8081";
       locations."/".proxyPass = "http://127.0.0.1:8000";
     };
-
     "uptime.${config.networking.domain}" = {
       enableACME = true;
       forceSSL = true;