diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index 50258f22..eb4b91c2 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../../modules/mixins/docker.nix
+    ../../modules/mixins/phpactor
 
     ../common
     ../../users/opdavies
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 3c8e8da7..13fa2d3b 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -10,6 +10,7 @@
 
     ../../modules/mixins/bluetooth.nix
     ../../modules/mixins/docker.nix
+    ../../modules/mixins/phpactor
 
     ../common
     ../../users/opdavies
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 444b3fe5..c88ae407 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -9,7 +9,6 @@
     ./neovim
     ./newsboat
     ./notes.nix
-    ./phpactor
     ./starship.nix
     ./tmux.nix
     ./tmux-sessionizer.nix
diff --git a/modules/home-manager/cli/phpactor/default.nix b/modules/home-manager/cli/phpactor/default.nix
deleted file mode 100644
index 0f514d8c..00000000
--- a/modules/home-manager/cli/phpactor/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  xdg.configFile.phpactor = {
-    source = ./config;
-    recursive = true;
-  };
-}
diff --git a/modules/home-manager/cli/phpactor/config/phpactor.yml b/modules/mixins/phpactor/config/phpactor.yml
similarity index 100%
rename from modules/home-manager/cli/phpactor/config/phpactor.yml
rename to modules/mixins/phpactor/config/phpactor.yml
diff --git a/modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig b/modules/mixins/phpactor/config/templates/collection/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig
rename to modules/mixins/phpactor/config/templates/collection/SourceCode.php.twig
diff --git a/modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig b/modules/mixins/phpactor/config/templates/default/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig
rename to modules/mixins/phpactor/config/templates/default/SourceCode.php.twig
diff --git a/modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig b/modules/mixins/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
rename to modules/mixins/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig b/modules/mixins/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
rename to modules/mixins/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig b/modules/mixins/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
rename to modules/mixins/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/modules/mixins/phpactor/default.nix b/modules/mixins/phpactor/default.nix
new file mode 100644
index 00000000..e4d1929d
--- /dev/null
+++ b/modules/mixins/phpactor/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    phpactor
+  ];
+
+  home-manager.users.opdavies.xdg.configFile.phpactor = {
+    source = ./config;
+    recursive = true;
+  };
+}