fmt

Author: Defelo

hosts/prod/backend/default.nix

@@ -113,22 +113,14 @@
 
         SENTRY_ENVIRONMENT = "prod";
       }
-      // (lib.mapAttrs' (
-        ms:
-        { port, ... }:
-        {
-          name = "${lib.toUpper ms}_URL";
-          value = "http://127.0.0.1:${toString port}/";
-        }
-      ) config.academy.backend.microservices)
-      // (lib.mapAttrs' (
-        ms:
-        { redis, ... }:
-        {
-          name = "${lib.toUpper ms}_REDIS_URL";
-          value = "redis://127.0.0.1:6379/${toString redis.database}";
-        }
-      ) config.academy.backend.microservices)
+      // (lib.mapAttrs' (ms: { port, ... }: {
+        name = "${lib.toUpper ms}_URL";
+        value = "http://127.0.0.1:${toString port}/";
+      }) config.academy.backend.microservices)
+      // (lib.mapAttrs' (ms: { redis, ... }: {
+        name = "${lib.toUpper ms}_REDIS_URL";
+        value = "redis://127.0.0.1:6379/${toString redis.database}";
+      }) config.academy.backend.microservices)
       // {
         AUTH_URL = "http://127.0.0.1:8000/auth/";
         SHOP_URL = "http://127.0.0.1:8000/shop/";

hosts/test/backend/default.nix

@@ -115,22 +115,14 @@
 
         SENTRY_ENVIRONMENT = "test";
       }
-      // (lib.mapAttrs' (
-        ms:
-        { port, ... }:
-        {
-          name = "${lib.toUpper ms}_URL";
-          value = "http://127.0.0.1:${toString port}/";
-        }
-      ) config.academy.backend.microservices)
-      // (lib.mapAttrs' (
-        ms:
-        { redis, ... }:
-        {
-          name = "${lib.toUpper ms}_REDIS_URL";
-          value = "redis://127.0.0.1:6379/${toString redis.database}";
-        }
-      ) config.academy.backend.microservices)
+      // (lib.mapAttrs' (ms: { port, ... }: {
+        name = "${lib.toUpper ms}_URL";
+        value = "http://127.0.0.1:${toString port}/";
+      }) config.academy.backend.microservices)
+      // (lib.mapAttrs' (ms: { redis, ... }: {
+        name = "${lib.toUpper ms}_REDIS_URL";
+        value = "redis://127.0.0.1:6379/${toString redis.database}";
+      }) config.academy.backend.microservices)
       // {
         AUTH_URL = "http://127.0.0.1:8000/auth/";
         SHOP_URL = "http://127.0.0.1:8000/shop/";

modules/acme.nix

@@ -1,5 +1,4 @@
-{ config, lib, ... }:
-{
+{ config, lib, ... }: {
   security.acme = {
     acceptTerms = true;
     defaults.email = "admin@bootstrap.academy";

modules/backend/default.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
-{
+{ lib, ... }: {
   imports = [
     ./nginx.nix
     ./postgresql.nix

modules/backend/nginx.nix

@@ -34,27 +34,19 @@
             }
           '';
           locations =
-            lib.mapAttrs' (
-              ms:
-              { port, ... }:
-              {
-                name = "/${ms}/";
-                value = {
-                  proxyPass = "http://127.0.0.1:${toString port}/";
-                  proxyWebsockets = true;
-                };
-              }
-            ) cfg.microservices
-            // (lib.mapAttrs' (
-              ms:
-              { port, ... }:
-              {
-                name = "= /${ms}/";
-                value = {
-                  return = "307 /${ms}/docs";
-                };
-              }
-            ) cfg.microservices)
+            lib.mapAttrs' (ms: { port, ... }: {
+              name = "/${ms}/";
+              value = {
+                proxyPass = "http://127.0.0.1:${toString port}/";
+                proxyWebsockets = true;
+              };
+            }) cfg.microservices
+            // (lib.mapAttrs' (ms: { port, ... }: {
+              name = "= /${ms}/";
+              value = {
+                return = "307 /${ms}/docs";
+              };
+            }) cfg.microservices)
             // (lib.optionalAttrs (cfg.protectInternalEndpoints) { "~* (:*/_internal/.*)".return = "403"; })
             // {
               "= /" = {

modules/backend/postgresql.nix

@@ -1,5 +1,4 @@
-{ lib, config, ... }:
-{
+{ lib, config, ... }: {
   config =
     let
       cfg = config.academy.backend;

modules/backend/redis.nix

@@ -1,5 +1,4 @@
-{ config, lib, ... }:
-{
+{ config, lib, ... }: {
   config =
     let
       cfg = config.academy.backend;

modules/filesystems.nix

@@ -1,5 +1,4 @@
-{ config, lib, ... }:
-{
+{ config, lib, ... }: {
   options.filesystems = {
     defaultLayout = lib.mkOption {
       type = lib.types.bool;

modules/monitoring.nix

@@ -1,5 +1,4 @@
-{ config, lib, ... }:
-{
+{ config, lib, ... }: {
   options.monitoring = {
     enable = lib.mkOption {
       type = lib.types.bool;

modules/pkgs.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{ pkgs, ... }: {
   environment.systemPackages = builtins.attrValues {
     inherit (pkgs)
       dig