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

3 files changed, 21 insertions, 17 deletions

diff --git a/users/wpcarro/common.nix b/users/wpcarro/common.nix
index 7093b5f1d43b..b8ecc6843ce8 100644
--- a/users/wpcarro/common.nix
+++ b/users/wpcarro/common.nix
@@ -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;
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 = {