about summary refs log tree commit diff
path: root/users/grfn/system/system
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-01-30T16·06+0300
committertazjin <tazjin@tvl.su>2022-01-31T16·11+0000
commitaa122cbae78ce97d60c0c98ba14df753d97e40b1 (patch)
tree12b98d85c4b18fe870feb26de70db9ba61837bd7 /users/grfn/system/system
parent2d10d60fac0fd00a71b65cfdcb9fba0477b2086c (diff)
style: format entire depot with nixpkgs-fmt r/3723
This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn/system/system')
-rw-r--r--users/grfn/system/system/iso.nix3
-rw-r--r--users/grfn/system/system/machines/mugwump.nix156
-rw-r--r--users/grfn/system/system/modules/common.nix2
-rw-r--r--users/grfn/system/system/modules/fonts.nix2
-rw-r--r--users/grfn/system/system/modules/reusable/battery.nix14
-rw-r--r--users/grfn/system/system/modules/tvl.nix4
-rw-r--r--users/grfn/system/system/modules/work/kolide.nix10
7 files changed, 104 insertions, 87 deletions
diff --git a/users/grfn/system/system/iso.nix b/users/grfn/system/system/iso.nix
index 4adccebfb8..92a13f6552 100644
--- a/users/grfn/system/system/iso.nix
+++ b/users/grfn/system/system/iso.nix
@@ -12,6 +12,7 @@ let
     networking.firewall.enable = false;
     networking.wireless.enable = lib.mkForce false;
   };
-in (depot.third_party.nixos {
+in
+(depot.third_party.nixos {
   inherit configuration;
 }).config.system.build.isoImage
diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix
index 7de6555878..a8bf91caac 100644
--- a/users/grfn/system/system/machines/mugwump.nix
+++ b/users/grfn/system/system/machines/mugwump.nix
@@ -23,7 +23,12 @@ with lib;
     initrd = {
       availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
       kernelModules = [
-        "uas" "usbcore" "usb_storage" "vfat" "nls_cp437" "nls_iso8859_1"
+        "uas"
+        "usbcore"
+        "usb_storage"
+        "vfat"
+        "nls_cp437"
+        "nls_iso8859_1"
       ];
 
       postDeviceCommands = pkgs.lib.mkBefore ''
@@ -60,31 +65,33 @@ with lib;
   networking.firewall.allowedTCPPorts = [ 22 80 443 ];
 
   security.sudo.extraRules = [{
-    groups = ["wheel"];
-    commands = [{ command = "ALL"; options = ["NOPASSWD"]; }];
+    groups = [ "wheel" ];
+    commands = [{ command = "ALL"; options = [ "NOPASSWD" ]; }];
   }];
 
   nix.gc.dates = "monthly";
 
-  age.secrets = let
-    secret = name: depot.users.grfn.secrets."${name}.age";
-  in {
-    bbbg.file = secret "bbbg";
-    cloudflare.file = secret "cloudflare";
-    ddclient-password.file = secret "ddclient-password";
-
-    buildkite-ssh-key = {
-      file = secret "buildkite-ssh-key";
-      group = "keys";
-      mode = "0440";
-    };
+  age.secrets =
+    let
+      secret = name: depot.users.grfn.secrets."${name}.age";
+    in
+    {
+      bbbg.file = secret "bbbg";
+      cloudflare.file = secret "cloudflare";
+      ddclient-password.file = secret "ddclient-password";
+
+      buildkite-ssh-key = {
+        file = secret "buildkite-ssh-key";
+        group = "keys";
+        mode = "0440";
+      };
 
-    buildkite-token = {
-      file = secret "buildkite-token";
-      group = "keys";
-      mode = "0440";
+      buildkite-token = {
+        file = secret "buildkite-token";
+        group = "keys";
+        mode = "0440";
+      };
     };
-  };
 
   services.depot.auto-deploy = {
     enable = true;
@@ -207,44 +214,49 @@ with lib;
       job_name = "node";
       scrape_interval = "5s";
       static_configs = [{
-        targets = ["localhost:${toString config.services.prometheus.exporters.node.port}"];
-      }];
-    } {
-      job_name = "nginx";
-      scrape_interval = "5s";
-      static_configs = [{
-        targets = ["localhost:${toString config.services.prometheus.exporters.nginx.port}"];
+        targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ];
       }];
-    } {
-      job_name = "xanthous_server";
-      scrape_interval = "1s";
-      static_configs = [{
-        targets = ["localhost:${toString config.services.xanthous-server.metricsPort}"];
+    }
+      {
+        job_name = "nginx";
+        scrape_interval = "5s";
+        static_configs = [{
+          targets = [ "localhost:${toString config.services.prometheus.exporters.nginx.port}" ];
+        }];
+      }
+      {
+        job_name = "xanthous_server";
+        scrape_interval = "1s";
+        static_configs = [{
+          targets = [ "localhost:${toString config.services.xanthous-server.metricsPort}" ];
+        }];
+      }
+      {
+        job_name = "blackbox";
+        metrics_path = "/probe";
+        params.module = [ "https_2xx" ];
+        scrape_interval = "5s";
+        static_configs = [{
+          targets = [
+            "https://gws.fyi"
+            "https://windtunnel.ci"
+            "https://app.windtunnel.ci"
+            "https://metrics.gws.fyi"
+          ];
+        }];
+        relabel_configs = [{
+          source_labels = [ "__address__" ];
+          target_label = "__param_target";
+        }
+          {
+            source_labels = [ "__param_target" ];
+            target_label = "instance";
+          }
+          {
+            target_label = "__address__";
+            replacement = "localhost:${toString config.services.prometheus.exporters.blackbox.port}";
+          }];
       }];
-    } {
-      job_name = "blackbox";
-      metrics_path = "/probe";
-      params.module = ["https_2xx"];
-      scrape_interval = "5s";
-      static_configs = [{
-        targets = [
-          "https://gws.fyi"
-          "https://windtunnel.ci"
-          "https://app.windtunnel.ci"
-          "https://metrics.gws.fyi"
-        ];
-      }];
-      relabel_configs = [{
-        source_labels = ["__address__"];
-        target_label = "__param_target";
-      } {
-        source_labels = ["__param_target"];
-        target_label = "instance";
-      } {
-        target_label = "__address__";
-        replacement = "localhost:${toString config.services.prometheus.exporters.blackbox.port}";
-      }];
-    }];
   };
 
   services.xanthous-server.enable = true;
@@ -256,21 +268,23 @@ with lib;
 
   virtualisation.docker.enable = true;
 
-  services.buildkite-agents = listToAttrs (map (n: rec {
-    name = "mugwump-${toString n}";
-    value = {
-      inherit name;
-      enable = true;
-      tokenPath = "/run/agenix/buildkite-agent-token";
-      privateSshKeyPath = "/run/agenix/buildkite-ssh-key";
-      runtimePackages = with pkgs; [
-        docker
-        nix
-        gnutar
-        gzip
-      ];
-    };
-  }) (range 1 1));
+  services.buildkite-agents = listToAttrs (map
+    (n: rec {
+      name = "mugwump-${toString n}";
+      value = {
+        inherit name;
+        enable = true;
+        tokenPath = "/run/agenix/buildkite-agent-token";
+        privateSshKeyPath = "/run/agenix/buildkite-ssh-key";
+        runtimePackages = with pkgs; [
+          docker
+          nix
+          gnutar
+          gzip
+        ];
+      };
+    })
+    (range 1 1));
 
   users.users."buildkite-agent-mugwump-1" = {
     isSystemUser = true;
diff --git a/users/grfn/system/system/modules/common.nix b/users/grfn/system/system/modules/common.nix
index 91723973f5..635747d118 100644
--- a/users/grfn/system/system/modules/common.nix
+++ b/users/grfn/system/system/modules/common.nix
@@ -2,7 +2,7 @@
 
 let
 
-  depot = import ../../../../.. {};
+  depot = import ../../../../.. { };
 
 in
 
diff --git a/users/grfn/system/system/modules/fonts.nix b/users/grfn/system/system/modules/fonts.nix
index babe30d427..f30600b28b 100644
--- a/users/grfn/system/system/modules/fonts.nix
+++ b/users/grfn/system/system/modules/fonts.nix
@@ -7,6 +7,6 @@
       twitter-color-emoji
     ];
 
-    fontconfig.defaultFonts.emoji = ["Twitter Color Emoji"];
+    fontconfig.defaultFonts.emoji = [ "Twitter Color Emoji" ];
   };
 }
diff --git a/users/grfn/system/system/modules/reusable/battery.nix b/users/grfn/system/system/modules/reusable/battery.nix
index ca92e0c3f6..151c2a246f 100644
--- a/users/grfn/system/system/modules/reusable/battery.nix
+++ b/users/grfn/system/system/modules/reusable/battery.nix
@@ -22,11 +22,11 @@ with lib;
   config =
     let cfg = config.laptop.onLowBattery;
     in mkIf cfg.enable {
-    services.udev.extraRules = concatStrings [
-      ''SUBSYSTEM=="power_supply", ''
-      ''ATTR{status}=="Discharging", ''
-      ''ATTR{capacity}=="[0-${toString cfg.thresholdPercentage}]", ''
-      ''RUN+="${pkgs.systemd}/bin/systemctl ${cfg.action}"''
-    ];
-  };
+      services.udev.extraRules = concatStrings [
+        ''SUBSYSTEM=="power_supply", ''
+        ''ATTR{status}=="Discharging", ''
+        ''ATTR{capacity}=="[0-${toString cfg.thresholdPercentage}]", ''
+        ''RUN+="${pkgs.systemd}/bin/systemctl ${cfg.action}"''
+      ];
+    };
 }
diff --git a/users/grfn/system/system/modules/tvl.nix b/users/grfn/system/system/modules/tvl.nix
index 905ec8ced5..959f8449f6 100644
--- a/users/grfn/system/system/modules/tvl.nix
+++ b/users/grfn/system/system/modules/tvl.nix
@@ -8,7 +8,7 @@
       sshKey = "/root/.ssh/id_rsa";
       system = "x86_64-linux";
       maxJobs = 64;
-      supportedFeatures = ["big-parallel" "kvm" "nixos-test" "benchmark"];
+      supportedFeatures = [ "big-parallel" "kvm" "nixos-test" "benchmark" ];
     }];
 
     extraOptions = ''
@@ -29,7 +29,7 @@
   };
 
   programs.ssh.knownHosts.whitby = {
-    hostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211"];
+    hostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211" ];
     publicKeyFile = pkgs.writeText "whitby.pub" ''
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I
     '';
diff --git a/users/grfn/system/system/modules/work/kolide.nix b/users/grfn/system/system/modules/work/kolide.nix
index 29ee0a0d7c..e4ee786f0c 100644
--- a/users/grfn/system/system/modules/work/kolide.nix
+++ b/users/grfn/system/system/modules/work/kolide.nix
@@ -3,9 +3,10 @@
 let
   deb = ./kolide.deb;
 
-  kolide = pkgs.runCommand "kolide-data" {
-    buildInputs = [ pkgs.binutils-unwrapped ];
-  } ''
+  kolide = pkgs.runCommand "kolide-data"
+    {
+      buildInputs = [ pkgs.binutils-unwrapped ];
+    } ''
     cp ${deb} ./kolide.deb
     ar x kolide.deb
     mkdir result
@@ -19,7 +20,8 @@ let
     mv result $out
   '';
 
-in {
+in
+{
   systemd.services."launcher.kolide-k2" = {
     wantedBy = [ "multi-user.target" ];
     after = [ "network.target" "syslog.service" ];