1 files changed, 14 insertions, 22 deletions
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";
 }