refactor(ops): Split //ops/nixos into different locations r/2482

Splits //ops/nixos into:

* //ops/nixos.nix - utility functions for building systems
* //ops/machines - shared machine definitions (read by readTree)
* //ops/modules - shared NixOS modules (skipped by readTree)

This simplifies working with the configuration fixpoint in whitby, and
is overall a bit more in line with how NixOS systems in user folders
currently work.

Change-Id: I1322ec5cc76c0207c099c05d44828a3df0b3ffc1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2931
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: glittershark <grfn@gws.fyi>

32 files changed, 28 insertions, 44 deletions

diff --git a/ops/nixos/all-systems.nix b/ops/machines/all-systems.nix
index 05a89e05ab..493d39e06b 100644
--- a/ops/nixos/all-systems.nix
+++ b/ops/machines/all-systems.nix
@@ -1,6 +1,6 @@
 { depot, ... }:
 
-(with depot.ops.nixos; [
+(with depot.ops.machines; [
   whitby
 ]) ++
 
diff --git a/ops/nixos/whitby/OWNERS b/ops/machines/whitby/OWNERS
index b1b749e871..b1b749e871 100644
--- a/ops/nixos/whitby/OWNERS
+++ b/ops/machines/whitby/OWNERS
diff --git a/ops/nixos/whitby/README.md b/ops/machines/whitby/README.md
index 55287c5412..55287c5412 100644
--- a/ops/nixos/whitby/README.md
+++ b/ops/machines/whitby/README.md
diff --git a/ops/nixos/whitby/default.nix b/ops/machines/whitby/default.nix
index 394b79c21b..eb5ee4ed6d 100644
--- a/ops/nixos/whitby/default.nix
+++ b/ops/machines/whitby/default.nix
@@ -1,30 +1,31 @@
-{ depot, lib, pkgs, ... }:
+{ depot, lib, pkgs, ... }: # readTree options
+config: # passed by module system
 
 let
   inherit (builtins) listToAttrs;
   inherit (lib) range;
 in lib.fix(self: {
   imports = [
-    "${depot.depotPath}/ops/nixos/clbot.nix"
-    "${depot.depotPath}/ops/nixos/irccat.nix"
-    "${depot.depotPath}/ops/nixos/monorepo-gerrit.nix"
-    "${depot.depotPath}/ops/nixos/panettone.nix"
-    "${depot.depotPath}/ops/nixos/paroxysm.nix"
-    "${depot.depotPath}/ops/nixos/smtprelay.nix"
-    "${depot.depotPath}/ops/nixos/sourcegraph.nix"
-    "${depot.depotPath}/ops/nixos/tvl-buildkite.nix"
-    "${depot.depotPath}/ops/nixos/tvl-slapd/default.nix"
-    "${depot.depotPath}/ops/nixos/tvl-sso/default.nix"
-    "${depot.depotPath}/ops/nixos/www/b.tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/cache.tvl.su.nix"
-    "${depot.depotPath}/ops/nixos/www/cl.tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/code.tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/cs.tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/login.tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/tazj.in.nix"
-    "${depot.depotPath}/ops/nixos/www/todo.tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/tvl.fyi.nix"
-    "${depot.depotPath}/ops/nixos/www/wigglydonke.rs.nix"
+    "${depot.depotPath}/ops/modules/clbot.nix"
+    "${depot.depotPath}/ops/modules/irccat.nix"
+    "${depot.depotPath}/ops/modules/monorepo-gerrit.nix"
+    "${depot.depotPath}/ops/modules/panettone.nix"
+    "${depot.depotPath}/ops/modules/paroxysm.nix"
+    "${depot.depotPath}/ops/modules/smtprelay.nix"
+    "${depot.depotPath}/ops/modules/sourcegraph.nix"
+    "${depot.depotPath}/ops/modules/tvl-buildkite.nix"
+    "${depot.depotPath}/ops/modules/tvl-slapd/default.nix"
+    "${depot.depotPath}/ops/modules/tvl-sso/default.nix"
+    "${depot.depotPath}/ops/modules/www/b.tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/cache.tvl.su.nix"
+    "${depot.depotPath}/ops/modules/www/cl.tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/code.tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/cs.tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/login.tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/tazj.in.nix"
+    "${depot.depotPath}/ops/modules/www/todo.tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/tvl.fyi.nix"
+    "${depot.depotPath}/ops/modules/www/wigglydonke.rs.nix"
     "${pkgs.path}/nixos/modules/services/web-apps/gerrit.nix"
   ];
 
diff --git a/ops/nixos/.skip-subtree b/ops/modules/.skip-subtree
index 09520f8c83..09520f8c83 100644
--- a/ops/nixos/.skip-subtree
+++ b/ops/modules/.skip-subtree
diff --git a/ops/nixos/README.md b/ops/modules/README.md
index 595b4c3344..595b4c3344 100644
--- a/ops/nixos/README.md
+++ b/ops/modules/README.md
diff --git a/ops/nixos/clbot.nix b/ops/modules/clbot.nix
index ad33e25a4d..ad33e25a4d 100644
--- a/ops/nixos/clbot.nix
+++ b/ops/modules/clbot.nix
diff --git a/ops/modules/default.nix b/ops/modules/default.nix
new file mode 100644
index 0000000000..8bdfecdf41
--- /dev/null
+++ b/ops/modules/default.nix
@@ -0,0 +1,2 @@
+# Make readTree happy at this level.
+_: {}
diff --git a/ops/nixos/irccat.nix b/ops/modules/irccat.nix
index e4b30b7355..e4b30b7355 100644
--- a/ops/nixos/irccat.nix
+++ b/ops/modules/irccat.nix
diff --git a/ops/nixos/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix
index eaea386ecd..eaea386ecd 100644
--- a/ops/nixos/monorepo-gerrit.nix
+++ b/ops/modules/monorepo-gerrit.nix
diff --git a/ops/nixos/panettone.nix b/ops/modules/panettone.nix
index 51a7468578..51a7468578 100644
--- a/ops/nixos/panettone.nix
+++ b/ops/modules/panettone.nix
diff --git a/ops/nixos/paroxysm.nix b/ops/modules/paroxysm.nix
index cd9cd3866e..cd9cd3866e 100644
--- a/ops/nixos/paroxysm.nix
+++ b/ops/modules/paroxysm.nix
diff --git a/ops/nixos/quassel.nix b/ops/modules/quassel.nix
index df26a39455..df26a39455 100644
--- a/ops/nixos/quassel.nix
+++ b/ops/modules/quassel.nix
diff --git a/ops/nixos/smtprelay.nix b/ops/modules/smtprelay.nix
index d8e03b5794..d8e03b5794 100644
--- a/ops/nixos/smtprelay.nix
+++ b/ops/modules/smtprelay.nix
diff --git a/ops/nixos/sourcegraph.nix b/ops/modules/sourcegraph.nix
index a24328f3e3..a24328f3e3 100644
--- a/ops/nixos/sourcegraph.nix
+++ b/ops/modules/sourcegraph.nix
diff --git a/ops/nixos/tvl-buildkite.nix b/ops/modules/tvl-buildkite.nix
index 2aa3b81811..2aa3b81811 100644
--- a/ops/nixos/tvl-buildkite.nix
+++ b/ops/modules/tvl-buildkite.nix
diff --git a/ops/nixos/tvl-slapd/default.nix b/ops/modules/tvl-slapd/default.nix
index ae99fced74..ae99fced74 100644
--- a/ops/nixos/tvl-slapd/default.nix
+++ b/ops/modules/tvl-slapd/default.nix
diff --git a/ops/nixos/tvl-sso/default.nix b/ops/modules/tvl-sso/default.nix
index 8e33c708b7..8e33c708b7 100644
--- a/ops/nixos/tvl-sso/default.nix
+++ b/ops/modules/tvl-sso/default.nix
diff --git a/ops/nixos/v4l2loopback.nix b/ops/modules/v4l2loopback.nix
index 636b2ff6cf..636b2ff6cf 100644
--- a/ops/nixos/v4l2loopback.nix
+++ b/ops/modules/v4l2loopback.nix
diff --git a/ops/nixos/www/b.tvl.fyi.nix b/ops/modules/www/b.tvl.fyi.nix
index 45f6c6ed51..45f6c6ed51 100644
--- a/ops/nixos/www/b.tvl.fyi.nix
+++ b/ops/modules/www/b.tvl.fyi.nix
diff --git a/ops/nixos/www/base.nix b/ops/modules/www/base.nix
index 4b956cd95e..4b956cd95e 100644
--- a/ops/nixos/www/base.nix
+++ b/ops/modules/www/base.nix
diff --git a/ops/nixos/www/cache.tvl.su.nix b/ops/modules/www/cache.tvl.su.nix
index 182306bebf..182306bebf 100644
--- a/ops/nixos/www/cache.tvl.su.nix
+++ b/ops/modules/www/cache.tvl.su.nix
diff --git a/ops/nixos/www/cl.tvl.fyi.nix b/ops/modules/www/cl.tvl.fyi.nix
index 470122c395..470122c395 100644
--- a/ops/nixos/www/cl.tvl.fyi.nix
+++ b/ops/modules/www/cl.tvl.fyi.nix
diff --git a/ops/nixos/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix
index c8a4b27b1b..c8a4b27b1b 100644
--- a/ops/nixos/www/code.tvl.fyi.nix
+++ b/ops/modules/www/code.tvl.fyi.nix
diff --git a/ops/nixos/www/cs.tvl.fyi.nix b/ops/modules/www/cs.tvl.fyi.nix
index fac814baf0..fac814baf0 100644
--- a/ops/nixos/www/cs.tvl.fyi.nix
+++ b/ops/modules/www/cs.tvl.fyi.nix
diff --git a/ops/nixos/www/login.tvl.fyi.nix b/ops/modules/www/login.tvl.fyi.nix
index 05b7cee253..05b7cee253 100644
--- a/ops/nixos/www/login.tvl.fyi.nix
+++ b/ops/modules/www/login.tvl.fyi.nix
diff --git a/ops/nixos/www/tazj.in.nix b/ops/modules/www/tazj.in.nix
index 7d658a5ec4..7d658a5ec4 100644
--- a/ops/nixos/www/tazj.in.nix
+++ b/ops/modules/www/tazj.in.nix
diff --git a/ops/nixos/www/todo.tvl.fyi.nix b/ops/modules/www/todo.tvl.fyi.nix
index b53f5437e7..b53f5437e7 100644
--- a/ops/nixos/www/todo.tvl.fyi.nix
+++ b/ops/modules/www/todo.tvl.fyi.nix
diff --git a/ops/nixos/www/tvl.fyi.nix b/ops/modules/www/tvl.fyi.nix
index 45fd35803d..45fd35803d 100644
--- a/ops/nixos/www/tvl.fyi.nix
+++ b/ops/modules/www/tvl.fyi.nix
diff --git a/ops/nixos/www/wigglydonke.rs.nix b/ops/modules/www/wigglydonke.rs.nix
index 0bc67898c6..0bc67898c6 100644
--- a/ops/nixos/www/wigglydonke.rs.nix
+++ b/ops/modules/www/wigglydonke.rs.nix
diff --git a/ops/nixos/default.nix b/ops/nixos.nix
index 8be700b104..465a2eed31 100644
--- a/ops/nixos/default.nix
+++ b/ops/nixos.nix
@@ -1,21 +1,8 @@
-# Most of the Nix expressions in this folder are NixOS modules, which
-# are not readTree compatible.
-#
-# Some things (such as system configurations) are, and we import them
-# here manually.
-#
-# TODO(tazjin): Find a more elegant solution for the whole module
-# situation.
+# Helper functions for instantiating depot-compatible NixOS machines.
 { depot, lib, pkgs, ... }@args:
 
 let inherit (lib) findFirst isAttrs;
 in rec {
-  whitby = import ./whitby/default.nix args;
-
-  # System installation
-
-  allSystems = import ./all-systems.nix args;
-
   # This provides our standard set of arguments to all NixOS modules.
   baseModule = { ... }: {
     _module.args = {
@@ -36,7 +23,7 @@ in rec {
     (findFirst
       (system: system.config.networking.hostName == hostname)
       (throw "${hostname} is not a known NixOS host")
-      (map nixosFor allSystems));
+      (map nixosFor depot.ops.machines.all-systems));
 
   rebuild-system = pkgs.writeShellScriptBin "rebuild-system" ''
     set -ue
@@ -53,9 +40,6 @@ in rec {
   '';
 
   # Systems that should be built in CI
-  #
-  # TODO(tazjin): Refactor the whole systems setup, it's a bit
-  # inconsistent at the moment.
-  whitbySystem = (nixosFor whitby).system;
+  whitbySystem = (nixosFor depot.ops.machines.whitby).system;
   meta.targets = [ "whitbySystem" ];
 }
diff --git a/ops/nixos/.gitignore b/ops/nixos/.gitignore
deleted file mode 100644
index 773fa16670..0000000000
--- a/ops/nixos/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-hardware-configuration.nix
-local-configuration.nix
-result