2 files changed, 19 insertions, 36 deletions
diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix
index 979ad2c45fa8..540034ace9f5 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 c2162637f833..d03da2b910eb 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";
 }