From d21bc0afc3eb5bd84c0d576370ccc8a94018f0ab Mon Sep 17 00:00:00 2001 From: William Carroll Date: Fri, 24 Dec 2021 21:12:15 -0500 Subject: refactor(wpcarro/nixos): Define common.programs mixin DRYing-up more configuration. Change-Id: I390cedd6a325ac17ef06c0887d3e0ac2b387b85b Reviewed-on: https://cl.tvl.fyi/c/depot/+/4601 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/nixos/diogenes/default.nix | 10 +--------- users/wpcarro/nixos/marcus/default.nix | 9 +-------- 2 files changed, 2 insertions(+), 17 deletions(-) (limited to 'users/wpcarro/nixos') diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix index 105c31793d..472a0eb5a6 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 57b9124b2c..a3113b0c16 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 = { -- cgit 1.4.1