diff --git a/ops/nixos/clouvider-fra01/default.nix b/ops/nixos/clouvider-fra01/default.nix
index c29e391fe3..e49df849ec 100644
--- a/ops/nixos/clouvider-fra01/default.nix
+++ b/ops/nixos/clouvider-fra01/default.nix
@@ -107,9 +107,6 @@ in {
     rebuilder
   ];
 
-  programs.mtr.enable = true;
-  services.openssh.enable = true;
-
   # Define a user account.
   users.mutableUsers = false;
   users.users = {
diff --git a/ops/nixos/lib/graphical-client.nix b/ops/nixos/lib/graphical-client.nix
new file mode 100644
index 0000000000..18b576449d
--- /dev/null
+++ b/ops/nixos/lib/graphical-client.nix
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{ pkgs, depot, lib, ... }:
+let
+  inherit (lib) mkBefore;
+in
+{
+  imports = [
+    ./client.nix
+  ];
+
+  fonts.fonts = with pkgs; [
+    iosevka
+  ];
+  services.udev.packages = [ pkgs.libu2f-host ];
+  services.pcscd.enable = true;
+
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+
+  users.users.lukegb.packages = mkBefore (with pkgs; [
+    chromium
+    lutris
+    pavucontrol
+    rxvt_unicode
+    teamspeak_client
+    virtmanager
+    xclip
+    yubioath-desktop
+  ]);
+}
diff --git a/ops/nixos/marukuru/default.nix b/ops/nixos/marukuru/default.nix
index d5be5fc5fb..d0c3e460b4 100644
--- a/ops/nixos/marukuru/default.nix
+++ b/ops/nixos/marukuru/default.nix
@@ -60,8 +60,6 @@ in {
   # $ nix search wget
   environment.systemPackages = with pkgs; [];
 
-  programs.mtr.enable = true;
-  services.openssh.enable = true;
   services.openssh.ports = [ 20022 ];
 
   networking.firewall = {
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index b465c1181e..67353f11d7 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -18,7 +18,7 @@ let
 in {
   imports = [
     ../lib/zfs.nix
-    ../lib/client.nix
+    ../lib/graphical-client.nix
     ../lib/whitby-distributed.nix
   ];
 
@@ -115,32 +115,16 @@ in {
       systemctl reboot
     '')
   ];
-  fonts = {
-    fonts = with pkgs; [
-      iosevka
-    ];
-  };
-
-  services.udev.packages = [ pkgs.libu2f-host ];
-  services.pcscd.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
-  programs.mtr.enable = true;
   # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
 
   # List services that you want to enable:
 
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
   # Enable the X11 windowing system.
   services.xserver.enable = true;
   services.xserver.layout = "us";
@@ -172,18 +156,10 @@ in {
           "OPS_SECRETS_DEFAULT_NIX" = "ops/secrets/default.nix";
         };
       })
-      chromium
       efibootmgr
       iotop
       iw
-      lutris
-      pavucontrol
-      rxvt_unicode
-      teamspeak_client
-      virtmanager
       vulkan-tools
-      xclip
-      yubioath-desktop
     ];
   };