4 files changed, 57 insertions, 60 deletions
diff --git a/users/wpcarro/common.nix b/users/wpcarro/common.nix
new file mode 100644
index 0000000000..79e2eecf5a
--- /dev/null
+++ b/users/wpcarro/common.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+
+{
+  # Command-line tools I commonly used and want available on most (or all) of my
+  # machines.
+  shell-utils = with pkgs; [
+    bat
+    dig
+    direnv
+    diskus
+    emacs
+    exa
+    fd
+    fzf
+    git
+    jq
+    mkpasswd
+    nmap
+    python3
+    ripgrep
+    tldr
+    tokei
+    tree
+    vim
+    xclip
+  ];
+}
diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix
index b12e6410ee..3645f880ee 100644
--- a/users/wpcarro/emacs/default.nix
+++ b/users/wpcarro/emacs/default.nix
@@ -5,33 +5,20 @@
 let
   inherit (builtins) path;
   inherit (depot.third_party.nixpkgs) emacsPackagesGen emacs27;
+  inherit (depot.users) wpcarro;
   inherit (pkgs) writeShellScript writeShellScriptBin;
   inherit (pkgs.lib.strings) concatStringsSep makeBinPath;
 
-  emacsBinPath = makeBinPath (with pkgs; [
-    bat
-    clipmenu
-    direnv
-    diskus
-    exa
-    fd
-    fzf
-    gitAndTools.hub
-    google-cloud-sdk
-    ispell
-    jq
-    kubectl
-    nix
-    nmap
-    pass
-    pup
-    ripgrep
-    scrot
-    tldr
-    tokei
-    xorg.xset
-    xsv
-  ]);
+  emacsBinPath = makeBinPath (
+    wpcarro.common.shell-utils ++
+    (with pkgs; [
+      clipmenu
+      ispell
+      nix
+      pass
+      scrot
+      xorg.xset
+    ]));
 
   emacsWithPackages = (emacsPackagesGen emacs27).emacsWithPackages;
 
diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix
index 979ad2c45f..540034ace9 100644
--- a/users/wpcarro/nixos/diogenes/default.nix
+++ b/users/wpcarro/nixos/diogenes/default.nix
@@ -2,7 +2,7 @@
 { ... }:
 
 let
-  inherit (depot.users.wpcarro) keys;
+  inherit (depot.users) wpcarro;
 in {
   imports = [
     "${depot.path}/ops/modules/quassel.nix"
@@ -29,7 +29,7 @@ in {
       wpcarro = {
         isNormalUser = true;
         extraGroups = [ "wheel" "quassel" ];
-        openssh.authorizedKeys.keys = keys.all;
+        openssh.authorizedKeys.keys = wpcarro.keys.all;
         shell = pkgs.fish;
       };
     };
@@ -57,16 +57,7 @@ in {
     '';
   };
 
-  environment.systemPackages = with pkgs; [
-    dig
-    fd
-    fzf
-    mkpasswd
-    ripgrep
-    tldr
-    tree
-    vim
-  ];
+  environment.systemPackages = wpcarro.common.shell-utils;
 
   services = {
     depot.automatic-gc = {
@@ -123,12 +114,12 @@ in {
         "wpcarro.dev" = {
           addSSL = true;
           enableACME = true;
-          root = depot.users.wpcarro.website;
+          root = wpcarro.website;
         };
         "blog.wpcarro.dev" = {
           addSSL = true;
           enableACME = true;
-          root = depot.users.wpcarro.website.blog;
+          root = wpcarro.website.blog;
         };
       };
     };
diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix
index c2162637f8..d03da2b910 100644
--- a/users/wpcarro/nixos/marcus/default.nix
+++ b/users/wpcarro/nixos/marcus/default.nix
@@ -2,7 +2,8 @@
 { ... }:
 
 let
-  wpcarrosEmacs = depot.users.wpcarro.emacs.nixos;
+  inherit (depot.users) wpcarro;
+  wpcarrosEmacs = wpcarro.emacs.nixos;
 
   quasselClient = pkgs.quassel.override {
     client = true;
@@ -116,27 +117,18 @@ in {
     VISUAL = "emacsclient";
   };
 
-  environment.systemPackages = with pkgs; [
-    alacritty
-    dig
-    direnv
-    emacs
-    fd
-    firefox
-    fzf
-    git
-    pavucontrol
-    python3
-    quasselClient
-    ripgrep
-    tdesktop
-    tree
-    vim
-    weechat
-    wpcarrosEmacs
-    xclip
-    xsecurelock
-  ];
+  environment.systemPackages =
+    wpcarro.common.shell-utils ++
+    (with pkgs; [
+      alacritty
+      firefox
+      pavucontrol
+      quasselClient
+      tdesktop
+      weechat
+      wpcarrosEmacs
+      xsecurelock
+    ]);
 
   system.stateVersion = "21.11";
 }