diff --git a/ops/nixos/lib/client.nix b/ops/nixos/lib/client.nix
new file mode 100644
index 0000000000..4e44db8d8d
--- /dev/null
+++ b/ops/nixos/lib/client.nix
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{ pkgs, depot, lib, ... }:
+let 
+  inherit (lib) mkBefore;
+in
+{
+  users.users.lukegb.packages = mkBefore (with pkgs; [
+    depot.nix.pkgs.copybara
+    direnv
+    git
+    go
+    graphicsmagick-imagemagick-compat
+    ripgrep
+    whois
+  ]);
+}
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 828264b28d..0b39d6cc54 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -18,6 +18,7 @@ let
 in {
   imports = [
     ../lib/zfs.nix
+    ../lib/client.nix
   ];
 
   boot.initrd.availableKernelModules = [
@@ -165,21 +166,14 @@ in {
         };
       })
       chromium
-      depot.nix.pkgs.copybara
-      direnv
       efibootmgr
-      git
-      go
-      graphicsmagick-imagemagick-compat
       iotop
       iw
       lutris
       pavucontrol
-      ripgrep
       rxvt_unicode
       teamspeak_client
       vulkan-tools
-      whois
       xclip
       yubioath-desktop
     ];