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 <wpcarro@gmail.com> Autosubmit: wpcarro <wpcarro@gmail.com> Tested-by: BuildkiteCI
This commit is contained in:
parent
4eb0dea713
commit
d21bc0afc3
3 changed files with 21 additions and 17 deletions
|
@ -1,6 +1,25 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs = {
|
||||
fish.enable = true;
|
||||
|
||||
ssh = {
|
||||
startAgent = true;
|
||||
extraConfig = ''
|
||||
AddKeysToAgent yes
|
||||
'';
|
||||
};
|
||||
|
||||
git = {
|
||||
enable = true;
|
||||
config = {
|
||||
user.name = "William Carroll";
|
||||
user.email = "wpcarro@gmail.com";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
depot.automatic-gc = {
|
||||
enable = true;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -92,15 +92,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
fish.enable = true;
|
||||
programs = wpcarro.common.programs // {
|
||||
light.enable = true;
|
||||
ssh = {
|
||||
startAgent = true;
|
||||
extraConfig = ''
|
||||
AddKeysToAgent yes
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
environment.variables = {
|
||||
|
|
Loading…
Reference in a new issue