diff options
| author | William Carroll <wpcarro@gmail.com> | 2021-12-25T02·12-0500 |
|---|---|---|
| committer | wpcarro <wpcarro@gmail.com> | 2021-12-25T16·07+0000 |
| commit | d21bc0afc3eb5bd84c0d576370ccc8a94018f0ab (patch) | |
| tree | 0a43d08ad53dc896705d6b4a79f7f3104722da15 /users/wpcarro/nixos | |
| parent | 4eb0dea713bec8aa79dd7dc5540e5daafd301cf9 (diff) | |
refactor(wpcarro/nixos): Define common.programs mixin r/3395
DRYing-up more configuration. Change-Id: I390cedd6a325ac17ef06c0887d3e0ac2b387b85b Reviewed-on: https://cl.tvl.fyi/c/depot/+/4601 Reviewed-by: wpcarro <wpcarro@gmail.com> Autosubmit: wpcarro <wpcarro@gmail.com> Tested-by: BuildkiteCI
Diffstat (limited to 'users/wpcarro/nixos')
| -rw-r--r-- | users/wpcarro/nixos/diogenes/default.nix | 10 | ||||
| -rw-r--r-- | users/wpcarro/nixos/marcus/default.nix | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix index 105c31793d4c..472a0eb5a688 100644 --- a/users/wpcarro/nixos/diogenes/default.nix +++ b/users/wpcarro/nixos/diogenes/default.nix @@ -50,15 +50,7 @@ in { sudo.wheelNeedsPassword = false; }; - programs = { - fish.enable = true; - ssh = { - startAgent = true; - extraConfig = '' - AddKeysToAgent yes - ''; - }; - }; + programs = wpcarro.common.programs; # I won't have an Emacs server running on diogenes, and I'll likely be in an # SSH session from within vterm. As such, Vim is one of the few editors that I diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index 57b9124b2cc6..a3113b0c16ff 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -92,15 +92,8 @@ in { }; }; - programs = { - fish.enable = true; + programs = wpcarro.common.programs // { light.enable = true; - ssh = { - startAgent = true; - extraConfig = '' - AddKeysToAgent yes - ''; - }; }; environment.variables = { |