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>

3 files changed, 10 insertions, 13 deletions

diff --git a/users/tazjin/nixos/README.md b/users/tazjin/nixos/README.md
index 0093f4ac65e1..662f2a36acac 100644
--- a/users/tazjin/nixos/README.md
+++ b/users/tazjin/nixos/README.md
@@ -1,20 +1,17 @@
 NixOS configuration
 ===================
 
-My NixOS configuration! It configures most of the packages I require
+My NixOS configurations! It configures most of the packages I require
 on my systems, sets up Emacs the way I need and does a bunch of other
 interesting things.
 
-System configuration lives in folders for each machine and a custom
-fixed point evaluation (similar to standard NixOS module
-configuration) is used to combine configuration together.
+System configuration lives in folders, and some of the modules stem
+from `//ops/modules`.
 
-Building `ops.nixos.rebuilder` yields a script that will automatically
-build and activate the newest configuration based on the current
-hostname.
+Machines are deployed with the script at `ops.nixos.rebuild-system`.
 
 ## Configured hosts:
 
-* `frog` - weapon of mass computation at home
-* `camden` - NUC serving tazj.in, tvl.fyi & co
-* ~~`urdhva` - T470s~~ (currently with edef)
+* `tverskoy` - X13 AMD that's travelling around with me
+* `frog` - weapon of mass computation (in storage in London)
+* `camden` - NUC formerly serving tazj.in (in storage in London)
diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix
index f334320b381b..2659db5e91d9 100644
--- a/users/tazjin/nixos/camden/default.nix
+++ b/users/tazjin/nixos/camden/default.nix
@@ -25,8 +25,8 @@ in lib.fix(self: {
       sha256 = "157c64220lf825ll4c0cxsdwg7cxqdx4z559fdp7kpz0g6p8fhhr";
     };
     in [
-      "${depot.depotPath}/ops/nixos/quassel.nix"
-      "${depot.depotPath}/ops/nixos/smtprelay.nix"
+      "${depot.depotPath}/ops/modules/quassel.nix"
+      "${depot.depotPath}/ops/modules/smtprelay.nix"
       "${oldChannel}/nixos/modules/security/acme.nix"
     ];
 
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 7f709da7eec5..1394f9cf4e91 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -16,7 +16,7 @@ config: let
   };
 in lib.fix(self: {
   imports = [
-    "${depot.depotPath}/ops/nixos/v4l2loopback.nix"
+    "${depot.depotPath}/ops/modules/v4l2loopback.nix"
   ];
 
   boot = {