hosts/ami/forgejo.nix

@@ -10,21 +10,10 @@ in {
       enable = true;
       package = pkgs.unstable.forgejo;
       settings = {
-        DEFAULT = {
+        DEFAULT.APP_NAME = "buffet's kitchen";
-          APP_NAME = "buffet's kitchen";
+        admin.SEND_NOTIFICATION_EMAIL_ON_NEW_USER = true;
-        };
+        cron.ENABLED = true;
-
+        federation.ENABLED = true;
-        admin = {
-          SEND_NOTIFICATION_EMAIL_ON_NEW_USER = true;
-        };
-
-        cron = {
-          ENABLED = true;
-        };
-
-        federation = {
-          ENABLED = true;
-        };
 
         mailer = {
           ENABLED = true;
@@ -33,6 +22,23 @@ in {
           SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
         };
 
+        repository = {
+          ENABLE_PUSH_CREATE_USER = true;
+          ENABLE_PUSH_CREATE_ORG = true;
+        };
+
+        server = {
+          DOMAIN = "buffets.kitchen";
+          ROOT_URL = "https://buffets.kitchen/";
+          HTTP_PORT = port;
+          LANDING_PAGE = "/kitchen";
+        };
+
+        service = {
+          DISABLE_REGISTRATION = true;
+          ENABLE_NOTIFY_MAIL = true;
+        };
+
         "markup.asciidoc" = {
           ENABLED = true;
           NEED_POSTPROCESS = true;
@@ -48,27 +54,6 @@ in {
           RENDER_COMMAND = ''"timeout 30s ${pkgs.pandoc}/bin/pandoc +RTS -M512M -RTS -f rst"'';
           IS_INPUT_FILE = false;
         };
-
-        repository = {
-          ENABLE_PUSH_CREATE_USER = true;
-          ENABLE_PUSH_CREATE_ORG = true;
-        };
-
-        "repository.pull-request" = {
-          DEFAULT_MERGE_STYLE = "rebase";
-        };
-
-        server = {
-          DOMAIN = "buffets.kitchen";
-          ROOT_URL = "https://buffets.kitchen/";
-          HTTP_PORT = port;
-          LANDING_PAGE = "/kitchen";
-        };
-
-        service = {
-          DISABLE_REGISTRATION = true;
-          ENABLE_NOTIFY_MAIL = true;
-        };
       };
     };