nixfmt: new fmt rules

5 files changed, 30 insertions, 28 deletions

diff --git a/flake.nix b/flake.nix
index 0c60b1f..bf012fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,15 +71,17 @@
       treefmt = forAllSystems (pkgs: _: treefmt-nix.lib.evalModule pkgs ./modules/treefmt.nix);
     in
     {
-      packages = (lib.recursiveUpdate  
-        (forAllSystems (
-          pkgs: _system: {
-            bulwark = pkgs.callPackage ./packages/bulwark/package.nix { };
+      packages = (
+        lib.recursiveUpdate
+          (forAllSystems (
+            pkgs: _system: {
+              bulwark = pkgs.callPackage ./packages/bulwark/package.nix { };
+            }
+          ))
+          {
+            "x86_64-linux".full-iso = self.nixosConfigurations.full-iso.config.system.build.isoImage;
           }
-        ))
-        {
-          "x86_64-linux".full-iso = self.nixosConfigurations.full-iso.config.system.build.isoImage;
-        });
+      );
 
       # for `nix fmt`
       formatter = forAllSystems (_: system: treefmt.${system}.config.build.wrapper);
diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index b1489a5..ab2dcfa 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -29,7 +29,7 @@
     gpg.enable = true;
     virtualisation.guest = true;
   };
-  nix.settings.trusted-users = [ "wilkuu"];
+  nix.settings.trusted-users = [ "wilkuu" ];
   boot.loader.grub = {
     enable = true;
     efiSupport = false;
@@ -67,16 +67,19 @@
       };
       mail = {
         enable = true;
-        startupMode = "normal"; 
+        startupMode = "normal";
         defaultDomain = "mail.wilkuu.xyz";
         wellKnownDomains = [
           "wilkuu.xyz"
           "wilkuu.nl"
         ];
-        domains = [ "wilkuu.xyz" "wilkuu.nl" ];
+        domains = [
+          "wilkuu.xyz"
+          "wilkuu.nl"
+        ];
         doACME = !isVM;
-        extraConfig = []; 
-        extraCreate = [];  
+        extraConfig = [ ];
+        extraCreate = [ ];
       };
       bulwark = {
         enable = true;
@@ -170,14 +173,13 @@
           tryFiles = "$uri $uri/ =404";
         };
       };
-      virualHosts."wilkuu.dedyn.io" = {
-        enableACME = true; 
-        forceSSL   = true; 
+      virtualHosts."wilkuu.dedyn.io" = {
+        forceSSL = true;
         useACMEHost = "wilkuu.dedyn.io";
         root = "/srv/www/wilkuu.dedyn.io/";
-        location."/" = {
-          index = "index.html"; 
-          tryFiles = "$uri $uri/ =404"; 
+        locations."/" = {
+          index = "index.html";
+          tryFiles = "$uri $uri/ =404";
         };
       };
     };
diff --git a/hosts/tacitus/default.nix b/hosts/tacitus/default.nix
index 38de6d0..91fa198 100644
--- a/hosts/tacitus/default.nix
+++ b/hosts/tacitus/default.nix
@@ -13,7 +13,7 @@
     gpg.enable = true;
     virtualisation.host = true;
   };
-  nix.settings.trusted-users = [ "wilkuu"];
+  nix.settings.trusted-users = [ "wilkuu" ];
   # Bootloader and boot setup.
   boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
   boot.loader.limine = {
diff --git a/services/continuwuity.nix b/services/continuwuity.nix
index ca66097..99ff392 100644
--- a/services/continuwuity.nix
+++ b/services/continuwuity.nix
@@ -1,8 +1,6 @@
 {
-  pkgs,
   config,
   lib,
-  inputs,
   ...
 }:
 let
diff --git a/services/mail2.nix b/services/mail2.nix
index ea52388..fe65991 100644
--- a/services/mail2.nix
+++ b/services/mail2.nix
@@ -113,7 +113,7 @@ in
           '';
         };
       };
-      
+
       security.acme.certs.${cfg.defaultDomain}.extraLegoRenewFlags = [
         "--reuse-key"
       ];
@@ -155,18 +155,18 @@ in
           };
         }));
 
-      stalwart-nix.stalwart = let 
-      in {
+      stalwart-nix.stalwart = {
         enable = cfg.enable;
-        url = if cfg.startupMode != "normal" then "http://127.0.0.1:8080/" else "http://${cfg.defaultDomain}";
+        url =
+          if cfg.startupMode != "normal" then "http://127.0.0.1:8080/" else "http://${cfg.defaultDomain}";
         credentialsFile = config.sops.templates.stalwart-config-creds.path;
         recoveryCredentialsFile = config.sops.templates.stalwart-recovery-creds.path;
         startupMode = cfg.startupMode;
         user = "stalwart";
         group = "stalwart";
-        configPlanPre = [];
+        configPlanPre = [ ];
         idempotentCreate = cfg.extraCreate;
-        configPlanPost =   cfg.extraConfig;
+        configPlanPost = cfg.extraConfig;
         credentials =
           (lib.genAttrs secrets toCredfilePath)
           // (builtins.foldl' (a: b: a // b) ({ }) (