diff --git a/nixos/profiles/graphical/distributed.nix b/nixos/profiles/graphical/distributed.nix
new file mode 100644
index 00000000..2300636b
--- /dev/null
+++ b/nixos/profiles/graphical/distributed.nix
@@ -0,0 +1,28 @@
+{config, ...}: {
+  programs.ssh.extraConfig = ''
+    Host daiyousei-build
+        HostName daiyousei.inskip.me
+        User root
+        IdentityAgent /run/user/${config.users.users.kat.uid}/gnupg/S.gpg-agent.ssh
+        ControlMaster auto
+        ControlPath ${config.users.users.kat.home}/.ssh/master-%r@%n:%p
+        ControlPersist 10m
+  '';
+  nix = {
+    buildMachines = [
+      {
+        hostName = "daiyousei-build";
+        system = "aarch64-linux";
+        protocol = "ssh-ng";
+        maxJobs = 100;
+        speedFactor = 1;
+        supportedFeatures = ["benchmark" "big-parallel" "kvm"];
+        mandatoryFeatures = [];
+      }
+    ];
+    distributedBuilds = true;
+    extraOptions = ''
+      builders-use-substitutes = true
+    '';
+  };
+}
diff --git a/nixos/profiles/graphical/kernel.nix b/nixos/profiles/performance/kernel.nix
similarity index 100%
rename from nixos/profiles/graphical/kernel.nix
rename to nixos/profiles/performance/kernel.nix
diff --git a/nixos/profiles/performance/scx.nix b/nixos/profiles/performance/scx.nix
new file mode 100644
index 00000000..9e02f7b3
--- /dev/null
+++ b/nixos/profiles/performance/scx.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  services.scx = {
+    enable = true;
+    package = pkgs.scx_git.full;
+    scheduler = "scx_lavd";
+  };
+}
diff --git a/nixos/profiles/performance/zram.nix b/nixos/profiles/performance/zram.nix
new file mode 100644
index 00000000..3a26c5d7
--- /dev/null
+++ b/nixos/profiles/performance/zram.nix
@@ -0,0 +1,3 @@
+_: {
+  zramSwap.enable = true;
+}
diff --git a/systems/daiyousei.nix b/systems/daiyousei.nix
index d1d020c6..cb0aa4d8 100644
--- a/systems/daiyousei.nix
+++ b/systems/daiyousei.nix
@@ -1,5 +1,6 @@
 _: let
   hostConfig = {
+    pkgs,
     tree,
     modulesPath,
     ...
@@ -28,6 +29,10 @@ _: let
         web
       ]);
 
+    environment.systemPackages = [
+      pkgs.numix-icon-theme
+    ];
+
     # TODO: Add config.microvm.stateDir to backup schedule?
     # TODO: figure out updateFlake?
     #microvm = {
diff --git a/systems/goliath.nix b/systems/goliath.nix
index 859a1c73..a69c15b1 100644
--- a/systems/goliath.nix
+++ b/systems/goliath.nix
@@ -50,6 +50,7 @@ _: let
         quiet-boot
         wireless
         gaming
+        performance
         dev
       ])
       ++ (with tree.nixos.environments; [
@@ -172,30 +173,6 @@ _: let
 
     networking.hostId = "c3b94e85";
 
-    programs.ssh.extraConfig = ''
-      Host daiyousei-build
-          HostName 140.238.156.121
-          User root
-          IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh
-    '';
-    nix = {
-      buildMachines = [
-        {
-          hostName = "daiyousei-build";
-          system = "aarch64-linux";
-          protocol = "ssh-ng";
-          maxJobs = 100;
-          speedFactor = 1;
-          supportedFeatures = ["benchmark" "big-parallel" "kvm"];
-          mandatoryFeatures = [];
-        }
-      ];
-      distributedBuilds = true;
-      extraOptions = ''
-        builders-use-substitutes = true
-      '';
-    };
-
     services.xserver.videoDrivers = ["nvidia"];
 
     hardware.nvidia = {
@@ -206,14 +183,6 @@ _: let
       powerManagement.enable = true;
     };
 
-    services.scx = {
-      enable = false;
-      package = pkgs.scx_git.full;
-      scheduler = "scx_lavd";
-    };
-
-    zramSwap.enable = true;
-
     boot = {
       zfs.requestEncryptionCredentials = true;
       loader = {
diff --git a/systems/koishi.nix b/systems/koishi.nix
index 9761d3af..7c0f7572 100644
--- a/systems/koishi.nix
+++ b/systems/koishi.nix
@@ -1,7 +1,6 @@
 _: let
   hostConfig = {
     tree,
-    pkgs,
     lib,
     config,
     ...
@@ -53,6 +52,7 @@ _: let
         wireless
         laptop
         gaming
+        performance
       ])
       ++ (with tree.nixos.environments; [
         niri
@@ -106,39 +106,6 @@ _: let
         ];
       };
 
-      services.scx = {
-        enable = true;
-        package = pkgs.scx_git.full;
-        scheduler = "scx_lavd";
-      };
-
-      zramSwap.enable = true;
-
-      programs.ssh.extraConfig = ''
-        Host daiyousei-build
-            HostName 140.238.156.121
-            User root
-            IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh
-      '';
-
-      nix = {
-        buildMachines = [
-          {
-            hostName = "daiyousei-build";
-            system = "aarch64-linux";
-            protocol = "ssh-ng";
-            maxJobs = 100;
-            speedFactor = 1;
-            supportedFeatures = ["benchmark" "big-parallel" "kvm"];
-            mandatoryFeatures = [];
-          }
-        ];
-        distributedBuilds = true;
-        extraOptions = ''
-          builders-use-substitutes = true
-        '';
-      };
-
       # optional, useful when the builder has a faster internet connection than yours
       services = {
         printing.enable = true;