From b7f58b72be9cbd05380b11d2762d224b5b8a7cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 26 Dec 2022 22:46:35 +0100
Subject: [PATCH] Sort

---
 flake.nix | 531 +++++++++++++++++++++++++++---------------------------
 1 file changed, 265 insertions(+), 266 deletions(-)

diff --git a/flake.nix b/flake.nix
index 43ed8987..7f23731e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -282,6 +282,21 @@
           ];
         };
 
+        bind = nixosSystem' {
+          modules = [
+            { nixpkgs.overlays = with secrets.overlays; [ bind ]; }
+            self.nixosModules.microvm
+            ./hosts/bind
+          ];
+        };
+
+        blogs = nixosSystem' {
+          modules = [
+            self.nixosModules.plume
+            self.nixosModules.microvm
+            ./hosts/blogs
+          ];
+        };
         broker = nixosSystem' {
           modules = [
             self.nixosModules.microvm
@@ -289,6 +304,57 @@
           ];
         };
 
+        buzzrelay = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            buzzrelay.nixosModules.default
+            ./hosts/buzzrelay
+          ];
+        };
+
+        c3d2-web = nixosSystem' {
+          modules = [
+            { _module.args = { inherit nixos; }; }
+            self.nixosModules.microvm
+            ./hosts/c3d2-web
+            { nixpkgs.overlays = [ secrets.overlays.c3d2-web ]; }
+          ];
+        };
+
+        caveman = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            caveman.nixosModule
+            ./hosts/caveman
+          ];
+        };
+
+        dacbert = nixosSystem' {
+          modules = [
+            nixos-hardware.nixosModules.raspberry-pi-4
+            self.nixosModules.rpi-netboot
+            ./hosts/dacbert
+          ];
+          system = "aarch64-linux";
+        };
+
+        dn42 = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/dn42
+            {
+              nixpkgs.overlays = [ secrets.overlays.dn42 ];
+            }
+          ];
+        };
+
+        direkthilfe = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/direkthilfe
+          ];
+        };
+
         factorio = nixosSystem' {
           modules = [
             self.nixosModules.microvm
@@ -332,6 +398,20 @@
           ];
         };
 
+        gnunet = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            ./hosts/gnunet
+          ];
+        };
+
+        grafana = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/grafana
+          ];
+        };
+
         hedgedoc = nixosSystem' {
           modules = [
             self.nixosModules.microvm
@@ -339,6 +419,156 @@
           ];
         };
 
+        hydra = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster
+            skyflake.nixosModules.default
+            (harmonia + "/module.nix")
+            ./hosts/hydra
+            {
+              _module.args = {
+                inherit self;
+                inherit (inputs) hydra-ca;
+              };
+            }
+          ];
+        };
+
+        jabber = nixosSystem' {
+          modules = [
+            { nixpkgs.overlays = with secrets.overlays; [ jabber ]; }
+            self.nixosModules.microvm
+            ./hosts/jabber
+          ];
+        };
+
+        kibana = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            buzz2elastic.nixosModules.default
+            ./hosts/kibana
+          ];
+        };
+
+        leon = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            ./hosts/leon
+          ];
+        };
+
+        leoncloud = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            ./hosts/leoncloud
+          ];
+        };
+
+        mailtngbert = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/mailtngbert
+          ];
+          system = "x86_64-linux";
+        };
+
+        mastodon = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/mastodon
+          ];
+        };
+
+        matemat = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/matemat
+            yammat.nixosModule
+            # TODO: migrate away from secrets repo
+            secrets.nixosModules.admins
+            { nixpkgs.overlays = [ secrets.overlays.matemat ]; }
+          ];
+        };
+
+        mediawiki = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/mediawiki
+          ];
+        };
+
+        mobilizon = nixosSystem' {
+          # TODO: pending https://github.com/NixOS/nixpkgs/pull/119132
+          # cherry-picked by sandro into his 22.11 fork
+          # nixpkgs = inputs.nixos-mobilizon;
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/mobilizon
+          ];
+        };
+
+        mucbot = nixosSystem' {
+          modules = [
+            { _module.args = { inherit tigger; }; }
+            "${tigger}/module.nix"
+            { nixpkgs.overlays = [ secrets.overlays.mucbot ]; }
+            ./hosts/mucbot
+            self.nixosModules.cluster-options
+          ];
+        };
+
+        network-homepage = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/network-homepage
+          ];
+        };
+
+        nfsroot = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/nfsroot
+            {
+              _module.args.tftproots = nixos.lib.filterAttrs (name: _:
+                builtins.match ".+-tftproot" name != null
+              ) self.packages.x86_64-linux;
+            }
+          ];
+        };
+
+        nncp = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            self.nixosModules.nncp
+            ./hosts/nncp
+          ];
+        };
+
+        oparl = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/oparl
+            {
+              _module.args = { inherit oparl-scraper; };
+            }
+          ];
+        };
+
+        owncast = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            ./hosts/owncast
+          ];
+        };
+
+        prometheus = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            alert2muc.nixosModules.default
+            ./hosts/prometheus
+          ];
+        };
+
         pulsebert = nixosSystem' {
           modules = [
             ./hosts/pulsebert
@@ -354,6 +584,13 @@
           ];
         };
 
+        public-access-proxy = nixosSystem' {
+          modules = [
+            self.nixosModules.microvm
+            ./hosts/public-access-proxy
+          ];
+        };
+
         radiobert = nixosSystem' {
           modules = [
             ({ ... }:
@@ -365,31 +602,28 @@
           system = "aarch64-linux";
         };
 
-        nncp = nixosSystem' {
+        rc3ticker = nixosSystem' {
           modules = [
-            self.nixosModules.microvm
-            self.nixosModules.nncp
-            ./hosts/nncp
+            self.nixosModules.cluster-options
+            ticker.nixosModules.ticker
+            ./hosts/rc3ticker
           ];
         };
 
-        mailtngbert = nixosSystem' {
+        riscbert = nixosSystem' {
           modules = [
-            self.nixosModules.microvm
-            ./hosts/mailtngbert
+            nixos-hardware.nixosModules.starfive-visionfive-v1
+            ./hosts/riscbert
+            {
+              nixpkgs.crossSystem = {
+                config = "riscv64-unknown-linux-gnu";
+                system = "riscv64-linux";
+              };
+            }
           ];
           system = "x86_64-linux";
         };
 
-        dacbert = nixosSystem' {
-          modules = [
-            nixos-hardware.nixosModules.raspberry-pi-4
-            self.nixosModules.rpi-netboot
-            ./hosts/dacbert
-          ];
-          system = "aarch64-linux";
-        };
-
         rpi-netboot = nixosSystem' {
           modules = [
             { _module.args = { inherit nixos; }; }
@@ -408,17 +642,6 @@
           system = "x86_64-linux";
         };
 
-        matemat = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/matemat
-            yammat.nixosModule
-            # TODO: migrate away from secrets repo
-            secrets.nixosModules.admins
-            { nixpkgs.overlays = [ secrets.overlays.matemat ]; }
-          ];
-        };
-
         scrape = nixosSystem' {
           modules = [
             self.nixosModules.microvm
@@ -430,97 +653,6 @@
           ];
         };
 
-        dn42 = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/dn42
-            {
-              nixpkgs.overlays = [ secrets.overlays.dn42 ];
-            }
-          ];
-        };
-
-        grafana = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/grafana
-          ];
-        };
-
-        hydra = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster
-            skyflake.nixosModules.default
-            (harmonia + "/module.nix")
-            ./hosts/hydra
-            {
-              _module.args = {
-                inherit self;
-                inherit (inputs) hydra-ca;
-              };
-            }
-          ];
-        };
-
-        mucbot = nixosSystem' {
-          modules = [
-            { _module.args = { inherit tigger; }; }
-            "${tigger}/module.nix"
-            { nixpkgs.overlays = [ secrets.overlays.mucbot ]; }
-            ./hosts/mucbot
-            self.nixosModules.cluster-options
-          ];
-        };
-
-        public-access-proxy = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/public-access-proxy
-          ];
-        };
-
-        ticker = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ticker.nixosModules.ticker
-            ./hosts/ticker
-          ];
-        };
-
-        spaceapi = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            "${spacemsg}/spaceapi/module.nix"
-            ./hosts/spaceapi
-          ];
-        };
-
-        stream = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            ./hosts/stream
-          ];
-        };
-
-        mobilizon = nixosSystem' {
-          # TODO: pending https://github.com/NixOS/nixpkgs/pull/119132
-          # cherry-picked by sandro into his 22.11 fork
-          # nixpkgs = inputs.nixos-mobilizon;
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/mobilizon
-          ];
-        };
-
-        c3d2-web = nixosSystem' {
-          modules = [
-            { _module.args = { inherit nixos; }; }
-            self.nixosModules.microvm
-            ./hosts/c3d2-web
-            { nixpkgs.overlays = [ secrets.overlays.c3d2-web ]; }
-          ];
-        };
-
         sdrweb = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
@@ -530,30 +662,6 @@
           ];
         };
 
-        bind = nixosSystem' {
-          modules = [
-            { nixpkgs.overlays = with secrets.overlays; [ bind ]; }
-            self.nixosModules.microvm
-            ./hosts/bind
-          ];
-        };
-
-        jabber = nixosSystem' {
-          modules = [
-            { nixpkgs.overlays = with secrets.overlays; [ jabber ]; }
-            self.nixosModules.microvm
-            ./hosts/jabber
-          ];
-        };
-
-        blogs = nixosSystem' {
-          modules = [
-            self.nixosModules.plume
-            self.nixosModules.microvm
-            ./hosts/blogs
-          ];
-        };
-
         server8 = nixosSystem' {
           modules = [
             ./hosts/server8
@@ -588,81 +696,11 @@
           ];
         };
 
-        oparl = nixosSystem' {
+        spaceapi = nixosSystem' {
           modules = [
             self.nixosModules.microvm
-            ./hosts/oparl
-            {
-              _module.args = { inherit oparl-scraper; };
-            }
-          ];
-        };
-
-        leon = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            ./hosts/leon
-          ];
-        };
-
-        leoncloud = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            ./hosts/leoncloud
-          ];
-        };
-
-        nfsroot = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/nfsroot
-            {
-              _module.args.tftproots = nixos.lib.filterAttrs (name: _:
-                builtins.match ".+-tftproot" name != null
-              ) self.packages.x86_64-linux;
-            }
-          ];
-        };
-
-        riscbert = nixosSystem' {
-          modules = [
-            nixos-hardware.nixosModules.starfive-visionfive-v1
-            ./hosts/riscbert
-            {
-              nixpkgs.crossSystem = {
-                config = "riscv64-unknown-linux-gnu";
-                system = "riscv64-linux";
-              };
-            }
-          ];
-          system = "x86_64-linux";
-        };
-
-        direkthilfe = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/direkthilfe
-          ];
-        };
-
-        mediawiki = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/mediawiki
-          ];
-        };
-
-        gnunet = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            ./hosts/gnunet
-          ];
-        };
-
-        zengel = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/zengel
+            "${spacemsg}/spaceapi/module.nix"
+            ./hosts/spaceapi
           ];
         };
 
@@ -674,64 +712,25 @@
           ];
         };
 
-        network-homepage = nixosSystem' {
+        stream = nixosSystem' {
+          modules = [
+            self.nixosModules.cluster-options
+            ./hosts/stream
+          ];
+        };
+
+        ticker = nixosSystem' {
           modules = [
             self.nixosModules.microvm
-            ./hosts/network-homepage
-          ];
-        };
-
-        caveman = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            caveman.nixosModule
-            ./hosts/caveman
-          ];
-        };
-
-        owncast = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            ./hosts/owncast
-          ];
-        };
-
-        prometheus = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            alert2muc.nixosModules.default
-            ./hosts/prometheus
-          ];
-        };
-
-        mastodon = nixosSystem' {
-          modules = [
-            self.nixosModules.microvm
-            ./hosts/mastodon
-          ];
-        };
-
-        buzzrelay = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
-            buzzrelay.nixosModules.default
-            ./hosts/buzzrelay
-          ];
-        };
-
-        rc3ticker = nixosSystem' {
-          modules = [
-            self.nixosModules.cluster-options
             ticker.nixosModules.ticker
-            ./hosts/rc3ticker
+            ./hosts/ticker
           ];
         };
 
-        kibana = nixosSystem' {
+        zengel = nixosSystem' {
           modules = [
-            self.nixosModules.cluster-options
-            buzz2elastic.nixosModules.default
-            ./hosts/kibana
+            self.nixosModules.microvm
+            ./hosts/zengel
           ];
         };
       };