diff --git a/hosts/direkthilfe/default.nix b/hosts/direkthilfe/default.nix
index c9276448..cc7d6e55 100644
--- a/hosts/direkthilfe/default.nix
+++ b/hosts/direkthilfe/default.nix
@@ -4,87 +4,93 @@
   microvm.mem = 1024;
   c3d2.deployment.server = "server10";
 
+  environment.systemPackages = with pkgs; [ vim git ];
+
   networking = {
     firewall.allowedTCPPorts = [ 22 80 443 ];
     hostName = "direkthilfe";
   };
 
-  service.openssh = {
-    enable = true;
-    extraConfig = ''
-      Match Group sftponly
-        # ChrootDirectory /home/%u
-        ForceCommand internal-sftp
-        AllowTcpForwarding no
-    '';
-  };
+  services = {
+    openssh = {
+      enable = true;
+      extraConfig = ''
+        Match Group sftponly
+          # ChrootDirectory /home/%u
+          ForceCommand internal-sftp
+          AllowTcpForwarding no
+      '';
+    };
 
-  users.groups.sftponly = {};
-  users.users.hilfe = {
-    isNormalUser = true;
-    group = "users";
-    extraGroups = [ "sftponly" ];
-  };
-
-  environment.systemPackages = with pkgs; [ vim git ];
-
-  services.engelsystem = {
-    enable = true;
-    domain = "direkthilfe.c3d2.de";
-    createDatabase = true;
-    package = pkgs.engelsystem.override { php = pkgs.php74; };
-    config = {
-      database = {
-        host = "localhost";
-        database = "engelsystem";
-        username = "engelsystem";
-      };
-      timezone = "Europe/Berlin";
-      signup_requires_arrival = true;
-      autoarrive = true;
-      signup_advance_hours = 0;
-      last_unsubscribe = 24;
-      enable_dect = false;
-      enable_planned_arrival = false;
-      enable_tshirt_size = false;
-      enable_goody = false;
-      max_freeloadable_shifts = 20;
-      night_shifts.enabled = false;
-      default_locale = "de_DE";
-      footer_items.Contact = "mailto:direkthilfe@notraces.net";
-      footer_items.FAQ = "https://www.c3d2.de/kontakt.html";
-      email = {
-        driver = "smtp";
-        from.address = "mail@c3d2.de";
-        from.name = "Engelsystem";
-        host = "mail.c3d2.de";
-        port = 587;
-        tls = true;
-        #sendmail = "${pkgs.ssmtp}/bin/sendmail -bs";
+    engelsystem = {
+      enable = true;
+      domain = "direkthilfe.c3d2.de";
+      createDatabase = true;
+      package = pkgs.engelsystem.override { php = pkgs.php74; };
+      config = {
+        database = {
+          host = "localhost";
+          database = "engelsystem";
+          username = "engelsystem";
+        };
+        timezone = "Europe/Berlin";
+        signup_requires_arrival = true;
+        autoarrive = true;
+        signup_advance_hours = 0;
+        last_unsubscribe = 24;
+        enable_dect = false;
+        enable_planned_arrival = false;
+        enable_tshirt_size = false;
+        enable_goody = false;
+        max_freeloadable_shifts = 20;
+        night_shifts.enabled = false;
+        default_locale = "de_DE";
+        footer_items.Contact = "mailto:direkthilfe@notraces.net";
+        footer_items.FAQ = "https://www.c3d2.de/kontakt.html";
+        email = {
+          driver = "smtp";
+          from.address = "mail@c3d2.de";
+          from.name = "Engelsystem";
+          host = "mail.c3d2.de";
+          port = 587;
+          tls = true;
+          #sendmail = "${pkgs.ssmtp}/bin/sendmail -bs";
+        };
       };
     };
-  };
-  services.phpfpm.phpPackage = pkgs.php74;
-  services.nginx = {
-    enable = true;
-    virtualHosts."${config.services.engelsystem.domain}" = {
-      default = true;
-      forceSSL = true;
-      enableACME = true;
-    };
-  };
 
-  #  services.ssmtp = {
-  #    enable = true;
-  #    root = "mail@c3d2.de";
-  #    useTLS = true;
-  #    useSTARTTLS = true;
-  #    hostName = "mail.c3d2.de:587";
-  #    domain = "direkthilfe.c3d2.de";
-  #    settings = {
-  #      hostname = "direkthilfe.serv.zentralwerk.org";
-  #    };
-  #  };
+    nginx = {
+      enable = true;
+      virtualHosts."${config.services.engelsystem.domain}" = {
+        default = true;
+        forceSSL = true;
+        enableACME = true;
+      };
+    };
+
+    phpfpm.phpPackage = pkgs.php74;
+
+    #  ssmtp = {
+    #    enable = true;
+    #    root = "mail@c3d2.de";
+    #    useTLS = true;
+    #    useSTARTTLS = true;
+    #    hostName = "mail.c3d2.de:587";
+    #    domain = "direkthilfe.c3d2.de";
+    #    settings = {
+    #      hostname = "direkthilfe.serv.zentralwerk.org";
+    #    };
+    #  };
+  };
 
   system.stateVersion = "21.11";
+
+  users = {
+    groups.sftponly = {};
+    users.hilfe = {
+      isNormalUser = true;
+      group = "users";
+      extraGroups = [ "sftponly" ];
+    };
+  };
 }