chore: format with nixfmt-rfc-style

tie-infra · Sep 9, 2024 · df9418b · df9418b
1 parent 623f677
commit df9418b
Show file tree

Hide file tree

Showing 49 changed files with 2,377 additions and 714 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,6 +10,9 @@
     flake-parts.url = "flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 
+    treefmt-nix.url = "github:numtide/treefmt-nix";
+    treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
+
     sops-nix.url = "sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
@@ -26,16 +29,19 @@
     steam-games.inputs.flake-parts.follows = "flake-parts";
   };
 
-  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-    systems = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-
-    imports = [
-      inputs.minimal-shell.flakeModule
-      ./nixpkgs.nix
-      ./top-level.nix
-    ];
-  };
+  outputs =
+    inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [
+        "aarch64-linux"
+        "x86_64-linux"
+      ];
+
+      imports = [
+        inputs.treefmt-nix.flakeModule
+        inputs.minimal-shell.flakeModule
+        ./nixpkgs.nix
+        ./top-level.nix
+      ];
+    };
 }
diff --git a/hosts/akane/configuration.nix b/hosts/akane/configuration.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   system.stateVersion = "23.11";
 
   time.timeZone = "Europe/Moscow";
@@ -55,8 +61,7 @@
 
   systemd.network =
     let
-      interfaceRange = a: b:
-        map (i: "enp${toString i}s0") (lib.range a b);
+      interfaceRange = a: b: map (i: "enp${toString i}s0") (lib.range a b);
 
       ispInterfaces = interfaceRange 2 2;
       lanInterfaces = interfaceRange 3 9;
@@ -141,26 +146,34 @@
           #};
           addresses =
             let
-              makeAddress = { cidr, tempAddr ? false, ... }: {
-                addressConfig = {
-                  Address = cidr;
-                  AddPrefixRoute = false;
-                } // lib.optionalAttrs tempAddr {
-                  ManageTemporaryAddress = true;
+              makeAddress =
+                {
+                  cidr,
+                  tempAddr ? false,
+                  ...
+                }:
+                {
+                  addressConfig = {
+                    Address = cidr;
+                    AddPrefixRoute = false;
+                  } // lib.optionalAttrs tempAddr { ManageTemporaryAddress = true; };
                 };
-              };
             in
             map makeAddress lanConfiguration;
           routes =
             let
-              makeRoute = { network, address, ... }: {
-                routeConfig = {
-                  Destination = network;
-                  PreferredSource = address;
+              makeRoute =
+                { network, address, ... }:
+                {
+                  routeConfig = {
+                    Destination = network;
+                    PreferredSource = address;
+                  };
                 };
-              };
               routes = map makeRoute lanConfiguration;
-              withTable = routeTable: { routeConfig }:
+              withTable =
+                routeTable:
+                { routeConfig }:
                 {
                   routeConfig = routeConfig // {
                     Table = routeTable;
@@ -170,23 +183,39 @@
             routes ++ map (withTable "wireguard") routes;
           ipv6Prefixes =
             let
-              makeIPv6Prefix = { network, ... }: {
-                ipv6PrefixConfig = {
-                  Prefix = network;
+              makeIPv6Prefix =
+                { network, ... }:
+                {
+                  ipv6PrefixConfig = {
+                    Prefix = network;
+                  };
                 };
-              };
-              radv = lib.filter ({ radv ? false, ... }: radv) lanConfiguration;
+              radv = lib.filter (
+                {
+                  radv ? false,
+                  ...
+                }:
+                radv
+              ) lanConfiguration;
             in
             map makeIPv6Prefix radv;
           # NB seems to be working fine without IPv6RoutePrefix.
           ipv6RoutePrefixes =
             let
-              makeIPv6RoutePrefix = { network, ... }: {
-                ipv6RoutePrefixConfig = {
-                  Route = network;
+              makeIPv6RoutePrefix =
+                { network, ... }:
+                {
+                  ipv6RoutePrefixConfig = {
+                    Route = network;
+                  };
                 };
-              };
-              radv = lib.filter ({ radv ? false, ... }: radv) lanConfiguration;
+              radv = lib.filter (
+                {
+                  radv ? false,
+                  ...
+                }:
+                radv
+              ) lanConfiguration;
             in
             map makeIPv6RoutePrefix radv;
           linkConfig = {
@@ -220,33 +249,39 @@
           };
           addresses =
             let
-              makeAddress = { cidr, ... }: {
-                addressConfig = {
-                  Address = cidr;
-                  AddPrefixRoute = false;
+              makeAddress =
+                { cidr, ... }:
+                {
+                  addressConfig = {
+                    Address = cidr;
+                    AddPrefixRoute = false;
+                  };
                 };
-              };
             in
             map makeAddress wireguardConfiguration;
           routes =
             let
-              makeRoute = { network, address, ... }: {
-                routeConfig = {
-                  Destination = network;
-                  PreferredSource = address;
+              makeRoute =
+                { network, address, ... }:
+                {
+                  routeConfig = {
+                    Destination = network;
+                    PreferredSource = address;
+                  };
                 };
-              };
             in
             map makeRoute wireguardConfiguration;
           routingPolicyRules =
             let
-              makeRoutingPolicyRule = { network, ... }: {
-                routingPolicyRuleConfig = {
-                  From = network;
-                  Table = "wireguard";
-                  Priority = 1000;
+              makeRoutingPolicyRule =
+                { network, ... }:
+                {
+                  routingPolicyRuleConfig = {
+                    From = network;
+                    Table = "wireguard";
+                    Priority = 1000;
+                  };
                 };
-              };
             in
             map makeRoutingPolicyRule wireguardConfiguration;
           linkConfig = {
@@ -276,7 +311,10 @@
           wireguardPeers = [
             {
               wireguardPeerConfig = {
-                AllowedIPs = [ "::/0" "0.0.0.0/0" ];
+                AllowedIPs = [
+                  "::/0"
+                  "0.0.0.0/0"
+                ];
                 RouteTable = "wireguard";
                 PublicKey = "8LgfPosHOG0SpUGqIlYesskq00Y6wihLtgZFUkutdE0=";
                 Endpoint = wireguardEndpoint;

diff --git a/hosts/akane/default.nix b/hosts/akane/default.nix
@@ -1,3 +1,4 @@
-{ nixosWithSystem, ... }: {
+{ nixosWithSystem, ... }:
+{
   flake.nixosConfigurations.akane = nixosWithSystem "x86_64-linux" [ ./configuration.nix ];
 }
diff --git a/hosts/bootstrap/configuration.nix b/hosts/bootstrap/configuration.nix
@@ -1,7 +1,6 @@
-{ lib, modulesPath, ... }: {
-  imports = [
-    (modulesPath + "/profiles/all-hardware.nix")
-  ];
+{ lib, modulesPath, ... }:
+{
+  imports = [ (modulesPath + "/profiles/all-hardware.nix") ];
 
   system.stateVersion = lib.trivial.release;
 

diff --git a/hosts/bootstrap/default.nix b/hosts/bootstrap/default.nix
@@ -1,3 +1,4 @@
-{ nixosWithSystem, ... }: {
+{ nixosWithSystem, ... }:
+{
   flake.nixosConfigurations.bootstrap-x86-64 = nixosWithSystem "x86_64-linux" [ ./configuration.nix ];
 }
diff --git a/hosts/brim/configuration.nix b/hosts/brim/configuration.nix
@@ -1,4 +1,5 @@
-{ lib, pkgs, config, ... }: {
+{ pkgs, config, ... }:
+{
   system.stateVersion = "23.11";
 
   time.timeZone = "Europe/Moscow";
@@ -11,7 +12,10 @@
       configurationLimit = 10;
     };
 
-    initrd.availableKernelModules = [ "mpt3sas" "i7core_edac" ];
+    initrd.availableKernelModules = [
+      "mpt3sas"
+      "i7core_edac"
+    ];
   };
 
   environment.machineInfo = {
@@ -33,9 +37,15 @@
       ];
       allowedTCPPortRanges = [
         # Brim Minecraft
-        { from = 25500; to = 25599; }
+        {
+          from = 25500;
+          to = 25599;
+        }
         # Shared Minecraft (for Tie)
-        { from = 22500; to = 22599; }
+        {
+          from = 22500;
+          to = 22599;
+        }
       ];
       allowedUDPPorts = [
         # Caddy HTTP/3
@@ -158,12 +168,16 @@
           server_port = "25511";
           activity_format = "BrimWorld: {online}/{max}";
           players_format = "Игроков: {online}/{max}";
-          status_online = "Сервер в сети " +
-            # Honey Pot U+1F36F
-            builtins.fromJSON ''"\uD83C\uDF6F"'';
-          status_offline = "Сервер не в сети " +
-            # Broken Heart U+1F494
-            builtins.fromJSON ''"\uD83D\uDC94"'';
+          status_online =
+            "Сервер в сети "
+            +
+              # Honey Pot U+1F36F
+              builtins.fromJSON ''"\uD83C\uDF6F"'';
+          status_offline =
+            "Сервер не в сети "
+            +
+              # Broken Heart U+1F494
+              builtins.fromJSON ''"\uD83D\uDC94"'';
         };
         channels = {
           enable_channels = true;
@@ -245,9 +259,8 @@
       TLS_CERTIFICATE_PATH_FOR_BRIM_SU = ./certs/brim-su.pem;
       TLS_CERTIFICATE_PATH_FOR_BRIMWORLD_ONLINE = ./certs/brimworld-online.pem;
     };
-    serviceConfig.LoadCredential =
-      map
-        (name: name + ":" + config.sops.secrets."caddy/${name}".path)
-        config.passthru.caddySecrets;
+    serviceConfig.LoadCredential = map (
+      name: name + ":" + config.sops.secrets."caddy/${name}".path
+    ) config.passthru.caddySecrets;
   };
 }
diff --git a/hosts/brim/default.nix b/hosts/brim/default.nix
@@ -1,4 +1,5 @@
-{ nixosWithSystem, ... }: {
+{ nixosWithSystem, ... }:
+{
   flake.nixosConfigurations.brim = nixosWithSystem "x86_64-linux" [
     ./configuration.nix
     ./sops.nix