refactor(wpcarro): Define common.shell-utils r/3380

DRYing up some of my configuration.

Change-Id: I137692789426efc6a6c6880029e605813674fdbe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4592
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI

1 files changed, 5 insertions, 14 deletions

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;
         };
       };
     };