diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-02T12·19+0000 |
|---|---|---|
| committer | lukegb <lukegb@tvl.fyi> | 2021-04-02T18·00+0000 |
| commit | 649145f4e1b540cc7331e1d7f0908562032106ad (patch) | |
| tree | cf73ced7f6d729da24a4b55b0aa51d1126a1f539 | |
| parent | b35e358eb5841b62caa8408ce2dbee105bf8d9c8 (diff) | |
refactor(glittershark/machines): switch to depot module arg r/2408
Previously the tvl depot attrset was provided as the config.depot argument, but to make NixOS modules look more like the rest of the depot this is being switched to being provided as the "depot" argument instead. Change-Id: I7e011fe5c44ac3e4142177afd168f1bbc602d56f Reviewed-on: https://cl.tvl.fyi/c/depot/+/2764 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
| -rw-r--r-- | users/glittershark/system/system/machines/roswell.nix | 4 | ||||
| -rw-r--r-- | users/glittershark/system/system/machines/yeren.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/users/glittershark/system/system/machines/roswell.nix b/users/glittershark/system/system/machines/roswell.nix index c0ed2264a0e0..4b0cdec95d18 100644 --- a/users/glittershark/system/system/machines/roswell.nix +++ b/users/glittershark/system/system/machines/roswell.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ depot, config, lib, pkgs, modulesPath, ... }: { imports = [ @@ -12,6 +12,6 @@ networking.hostName = "roswell"; users.users.grfn.openssh.authorizedKeys.keys = [ - config.depot.users.glittershark.keys.main + depot.users.glittershark.keys.main ]; } diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix index 0237f71410ef..a8f7df5dc512 100644 --- a/users/glittershark/system/system/machines/yeren.nix +++ b/users/glittershark/system/system/machines/yeren.nix @@ -1,4 +1,4 @@ -{ modulesPath, config, lib, pkgs, ... }: +{ depot, modulesPath, config, lib, pkgs, ... }: { imports = [ @@ -86,12 +86,12 @@ # the fprintd module hardcodes pkgs.fprintd :'( nixpkgs.overlays = [(_: _: { - fprintd = config.depot.users.glittershark.pkgs.fprintd; + fprintd = depot.users.glittershark.pkgs.fprintd; })]; services.fprintd = { enable = true; - package = config.depot.users.glittershark.pkgs.fprintd; + package = depot.users.glittershark.pkgs.fprintd; }; security.pam.loginLimits = [ |