mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(users/glittershark/system): switch to ops.nixos.nixosFor

Browse source 
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>
This commit is contained in:
Luke Granger-Brown 2021-04-02 12:15:18 +00:00 committed by lukegb
parent 4bfcd09682
commit b71362f198
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
users/glittershark/system/system/default.nix
View file

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