format

Author: LennyPenny

README.md

@@ -13,26 +13,33 @@ nix flake update
 ```
 
 ### VM Tests
-There are some VM tests in `checks/` testing some critical services. You can run them like this:
+
+There are some VM tests in `checks/` testing some critical services. You can run
+them like this:
+
 ```bash
 nix build .#checks.x86_64-linux.<check-name>
 ```
 
-Note: `nix flake check` cannot be used as currently the repo is unformatted (formatter check is inherited from flakelight)
+Note: `nix flake check` cannot be used as currently the repo is unformatted
+(formatter check is inherited from flakelight)
 
 ### Rolling back
 
-Use the `rollback` script on any machine provisioned by this repo to revert to a previous version.
+Use the `rollback` script on any machine provisioned by this repo to revert to a
+previous version.
 
 ### Secrets
 
-* Manage secrets
+- Manage secrets
+
 ```
   lib/pass.h
 ```
 
-* Add new keys in `secrets/.public-keys`
+- Add new keys in `secrets/.public-keys`
 
 ### ToDo
-* give routing tables names that can be read by humans
-* schedule DSL reconnect
+
+- give routing tables names that can be read by humans
+- schedule DSL reconnect

flake.nix

@@ -23,7 +23,7 @@
           pkgs.alejandra
           pkgs.git
           pkgs.colmena
-#          pkgs.prometheus-snmp-exporter
+          #          pkgs.prometheus-snmp-exporter
         ];
         env.DIRENV_LOG_FORMAT = "";
       };
@@ -53,8 +53,8 @@
           router = { ... }: {
             deployment.targetHost = "router.xhain.space";
             imports = [
-             kea-lease-viewer.nixosModules.default
-  ]         ;
+              kea-lease-viewer.nixosModules.default
+            ];
           };
 
           files = { ... }: {

hosts/files/configuration.nix

@@ -28,7 +28,7 @@
     virtualHosts."files.xhain.space" = {
       root = "/media/storage";
       extraConfig = ''
-      autoindex on;
+        autoindex on;
       '';
     };
   };
@@ -45,7 +45,7 @@
     openFirewall = true;
     securityType = "user";
 
-    settings.global = { 
+    settings.global = {
       "server string" = "Files";
       "map to guest" = "Bad User";
       "passdb backend" = "tdbsam";

hosts/router/dhcp.nix

@@ -114,7 +114,7 @@ in
         hooks-libraries = [
           {
             library = "${pkgs.kea}/lib/kea/hooks/libdhcp_lease_cmds.so";
-            parameters = {};
+            parameters = { };
           }
         ];
 
@@ -184,7 +184,7 @@ in
     keaSocketPath = controlSocket;
   };
 
-   services.nginx.virtualHosts.${config.networking.hostName + "." + config.networking.domain} =  {
+  services.nginx.virtualHosts.${config.networking.hostName + "." + config.networking.domain} = {
     locations."/leases" = {
       recommendedProxySettings = true;
       proxyPass = "http://${config.services.kea-lease-viewer.listenAddress}:${toString config.services.kea-lease-viewer.port}/";

hosts/router/dns.nix

@@ -29,18 +29,18 @@ in
     before = [ "bind.service" ];
     wantedBy = [ "bind.service" ];
     script = ''
-    mkdir -p /var/lib/bind
-    chown named /var/lib/bind
-      ${concatStrings (
-        map (zone: ''
-      if [[ ! -f /var/lib/bind/${zone}zone ]]; then
-        cp "${templateFile}" "/var/lib/bind/${zone}zone"
-      fi
-      chmod 0644 "/var/lib/bind/${zone}zone"
-      chown named "/var/lib/bind/${zone}zone"
-        '') dynamicZones
-      )}
-  '';
+      mkdir -p /var/lib/bind
+      chown named /var/lib/bind
+        ${concatStrings (
+          map (zone: ''
+        if [[ ! -f /var/lib/bind/${zone}zone ]]; then
+          cp "${templateFile}" "/var/lib/bind/${zone}zone"
+        fi
+        chmod 0644 "/var/lib/bind/${zone}zone"
+        chown named "/var/lib/bind/${zone}zone"
+          '') dynamicZones
+        )}
+    '';
     serviceConfig = {
       Type = "oneshot";
       User = "root";

hosts/router/local_modules/prometheus/blackbox-exporter.yml

@@ -1,5 +1,4 @@
 ---
-
 modules:
   icmp:
     prober: icmp
@@ -13,7 +12,7 @@ modules:
     timeout: 3s
     tcp:
       query_response:
-      - expect: "^SSH-2.0-"
+        - expect: "^SSH-2.0-"
 
   https:
     prober: http

hosts/router/local_modules/prometheus/blackbox.nix

@@ -7,11 +7,13 @@
     configFile = "${ ./blackbox-exporter.yml }";
   };
 
-  services.nginx.virtualHosts.${config.networking.hostName + "." + config.networking.domain} = let
-    addr = config.services.prometheus.exporters.blackbox.listenAddress;
-    port = toString config.services.prometheus.exporters.blackbox.port;
-  in {
-    locations."/blackbox-exporter/metrics".proxyPass = "http://${addr}:${port}/metrics";
-    locations."/blackbox-exporter/probe".proxyPass = "http://${addr}:${port}/probe";
-  };
+  services.nginx.virtualHosts.${config.networking.hostName + "." + config.networking.domain} =
+    let
+      addr = config.services.prometheus.exporters.blackbox.listenAddress;
+      port = toString config.services.prometheus.exporters.blackbox.port;
+    in
+    {
+      locations."/blackbox-exporter/metrics".proxyPass = "http://${addr}:${port}/metrics";
+      locations."/blackbox-exporter/probe".proxyPass = "http://${addr}:${port}/probe";
+    };
 }