From b71362f198531474bc011bed596cdfe30d9ae5e9 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Fri, 2 Apr 2021 12:15:18 +0000
Subject: refactor(users/glittershark/system): switch to ops.nixos.nixosFor

ops.nixos.nixosFor is intended to provide the "basic" readTree-like
system arguments to NixOS systems; in particular, it provides "depot" as
a module argument, as well as, for the moment, config.depot.

Change-Id: I442c7d79ac0eb2ff8e1bf606f4e083e15eb0a8f4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2761
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
---
 users/glittershark/system/system/default.nix | 40 ++++++++++------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix
index aa0afb4c5935..a640b3337c9c 100644
--- a/users/glittershark/system/system/default.nix
+++ b/users/glittershark/system/system/default.nix
@@ -19,36 +19,24 @@ rec {
 
   roswell = import ./machines/roswell.nix;
 
-  roswellSystem = (pkgs.nixos {
-    configuration = { ... }: {
-      imports = [
-        ./machines/roswell.nix
-        "${nixpkgs.home-manager.src}/nixos"
-        "${depot.depotPath}/ops/nixos/depot.nix"
-      ];
-      inherit depot;
-
-      home-manager.users.grfn = { config, lib, ... }: {
-        imports = [ ../home/machines/roswell.nix ];
-        lib.depot = depot;
-        _module.args.pkgs = lib.mkForce
-          (import pkgs.nixpkgsSrc
-            (lib.filterAttrs (n: v: v != null) config.nixpkgs));
-      };
+  roswellSystem = (depot.ops.nixos.nixosFor ({ ... }: {
+    imports = [
+      ./machines/roswell.nix
+      "${nixpkgs.home-manager.src}/nixos"
+    ];
+
+    home-manager.users.grfn = { config, lib, ... }: {
+      imports = [ ../home/machines/roswell.nix ];
+      lib.depot = depot;
+      _module.args.pkgs = lib.mkForce
+        (import pkgs.nixpkgsSrc
+          (lib.filterAttrs (n: v: v != null) config.nixpkgs));
     };
-  }).system;
+  })).system;
 
   yeren = import ./machines/yeren.nix;
 
-  yerenSystem = (pkgs.nixos {
-    configuration = { ... }: {
-      imports = [
-        ./machines/yeren.nix
-        "${depot.depotPath}/ops/nixos/depot.nix"
-      ];
-      inherit depot;
-    };
-  }).system;
+  yerenSystem = depot.ops.nixos.nixosFor yeren;
 
   iso = import ./iso.nix args;
 
-- 
cgit 1.4.1