format + tree-sitter

flake.nix

@@ -37,7 +37,8 @@
 
   };
 
-  outputs = inputs:
+  outputs =
+    inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         ./modules/flake/parts.nix

modules/flake/lib.nix

@@ -8,33 +8,39 @@ let
   hasDotfilesHome = builtins.pathExists dotfilesHome;
 in
 {
-  mkHost = {
+  mkHost =
-    nixpkgs,
+    {
-    disko,
+      nixpkgs,
-    lolcat,
+      disko,
-    nixosModules,
+      lolcat,
-    hostModules ? [ ],
+      nixosModules,
-  }:
+      hostModules ? [ ],
+    }:
     nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inputs = inputs // { "lolcat++" = lolcat; };
+        inputs = inputs // {
+          "lolcat++" = lolcat;
+        };
         inherit nixosModules;
       };
       modules = [ disko.nixosModules.disko ] ++ hostModules;
     };
 
-  mkDesktopHost = {
+  mkDesktopHost =
-    nixpkgs,
+    {
-    disko,
+      nixpkgs,
-    lolcat,
+      disko,
-    nixosModules,
+      lolcat,
-    hostModules ? [ ],
+      nixosModules,
-  }:
+      hostModules ? [ ],
+    }:
     nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inputs = inputs // { "lolcat++" = lolcat; };
+        inputs = inputs // {
+          "lolcat++" = lolcat;
+        };
         inherit nixosModules;
       };
       modules = [
@@ -55,6 +61,7 @@ in
                 programs.home-manager.enable = true;
               };
         }
-      ] ++ hostModules;
+      ]
+      ++ hostModules;
     };
 }

modules/hosts/default.nix

@@ -1,2 +1 @@
-args:
+args: (import ./hermes args) // (import ./kronos args)
-(import ./hermes args) // (import ./kronos args)

modules/hosts/hermes/hardware.nix

@@ -1,14 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];

modules/nixos/luks-initrd-ssh-unlock.nix

@@ -44,7 +44,10 @@ in
     };
 
     system.activationScripts.initrdSshHostKey = {
-      deps = [ "users" "groups" ];
+      deps = [
+        "users"
+        "groups"
+      ];
       text = ''
         install -d -m 700 "$(dirname "${cfg.hostKeyPath}")"
         if [ ! -f "${cfg.hostKeyPath}" ]; then

modules/nixos/mail-server/autodiscover.nix

@@ -7,7 +7,8 @@
 let
   radicaleHostFor = domain: "cal.${domain}";
 
-  mkThunderbirdAutoconfig = domain:
+  mkThunderbirdAutoconfig =
+    domain:
     pkgs.writeText "autoconfig-${domain}.xml" ''
       <?xml version="1.0" encoding="UTF-8"?>
       <clientConfig version="1.1">
@@ -47,7 +48,8 @@ let
       </clientConfig>
     '';
 
-  mkOutlookAutodiscover = domain:
+  mkOutlookAutodiscover =
+    domain:
     pkgs.writeText "autodiscover-${domain}.xml" ''
       <?xml version="1.0" encoding="utf-8"?>
       <Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
@@ -80,40 +82,39 @@ let
       </Autodiscover>
     '';
 
-  mailDiscoveryVirtualHosts =
+  mailDiscoveryVirtualHosts = lib.listToAttrs (
-    lib.listToAttrs (
+    lib.concatMap (
-      lib.concatMap (
+      domain:
-        domain:
+      let
-        let
+        autoconfigXml = mkThunderbirdAutoconfig domain;
-          autoconfigXml = mkThunderbirdAutoconfig domain;
+        autodiscoverXml = mkOutlookAutodiscover domain;
-          autodiscoverXml = mkOutlookAutodiscover domain;
+      in
-        in
+      [
-        [
+        {
-          {
+          name = "autoconfig.${domain}";
-            name = "autoconfig.${domain}";
+          value = {
-            value = {
+            enableACME = true;
-              enableACME = true;
+            forceSSL = true;
-              forceSSL = true;
+            locations."= /mail/config-v1.1.xml".extraConfig = ''
-              locations."= /mail/config-v1.1.xml".extraConfig = ''
+              default_type application/xml;
-                default_type application/xml;
+              alias ${autoconfigXml};
-                alias ${autoconfigXml};
+            '';
-              '';
+          };
-            };
+        }
-          }
+        {
-          {
+          name = "autodiscover.${domain}";
-            name = "autodiscover.${domain}";
+          value = {
-            value = {
+            enableACME = true;
-              enableACME = true;
+            forceSSL = true;
-              forceSSL = true;
+            locations."= /autodiscover/autodiscover.xml".extraConfig = ''
-              locations."= /autodiscover/autodiscover.xml".extraConfig = ''
+              default_type application/xml;
-                default_type application/xml;
+              alias ${autodiscoverXml};
-                alias ${autodiscoverXml};
+            '';
-              '';
+          };
-            };
+        }
-          }
+      ]
-        ]
+    ) config.mailserver.domains
-      ) config.mailserver.domains
+  );
-    );
 in
 {
   services.nginx.virtualHosts = mailDiscoveryVirtualHosts // {

modules/nixos/mail-server/default.nix

@@ -1,5 +1,8 @@
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   security.acme = {
     acceptTerms = true;

modules/nixos/mail-server/mobileconfig.nix

@@ -60,14 +60,21 @@ lib.mkIf hasMailDiscoveryConfig (
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         DynamicUser = true;
-        ExecStart = lib.concatStringsSep " " [
+        ExecStart =
-          "${pkgs.python3}/bin/python3"
+          lib.concatStringsSep " " [
-          "${generatorScript}"
+            "${pkgs.python3}/bin/python3"
-          "--domain" domain
+            "${generatorScript}"
-          "--mail-host" cfg.fqdn
+            "--domain"
-          "--radicale-host" radicaleHost
+            domain
-          "--port" (toString mobileconfigPort)
+            "--mail-host"
-        ] + defaultUsernameArg + accountArgs;
+            cfg.fqdn
+            "--radicale-host"
+            radicaleHost
+            "--port"
+            (toString mobileconfigPort)
+          ]
+          + defaultUsernameArg
+          + accountArgs;
         NoNewPrivileges = true;
         PrivateTmp = true;
         ProtectHome = true;

modules/nixos/packages/lua.nix

@@ -3,5 +3,6 @@
   environment.systemPackages = with pkgs; [
     lua-language-server
     stylua
+    tree-sitter
   ];
 }