From 649145f4e1b540cc7331e1d7f0908562032106ad Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 2 Apr 2021 12:19:41 +0000 Subject: refactor(glittershark/machines): switch to depot module arg 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 --- users/glittershark/system/system/machines/roswell.nix | 4 ++-- users/glittershark/system/system/machines/yeren.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'users/glittershark/system') diff --git a/users/glittershark/system/system/machines/roswell.nix b/users/glittershark/system/system/machines/roswell.nix index c0ed2264a0..4b0cdec95d 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 0237f71410..a8f7df5dc5 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 = [ -- cgit 1.4.1