diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index da7d9eeb..19d2c35b 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -12,10 +12,6 @@
       starship.enable = true;
       zsh.enable = true;
     };
-
-    coding = {
-      phpactor.enable = true;
-    };
   };
 
   home.packages = with pkgs; [
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index b1766be5..c6588ff6 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -19,10 +19,6 @@
       zsh.enable = true;
     };
 
-    coding = {
-      phpactor.enable = true;
-    };
-
     desktop = {
       browsers = {
         chromium.enable = true;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index b29c1831..5d4b558e 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -13,7 +13,6 @@
     ./media/handbrake.nix
     ./media/mpv.nix
     ./node.nix
-    ./phpactor
     ./ranger.nix
     ./redshift.nix
     ./screenkey.nix
diff --git a/modules/home-manager/phpactor/default.nix b/modules/home-manager/phpactor/default.nix
deleted file mode 100644
index f135b1dc..00000000
--- a/modules/home-manager/phpactor/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.coding.phpactor;
-in
-{
-  options.features.coding.phpactor.enable = mkEnableOption "Enable phpactor";
-
-  config = mkIf cfg.enable {
-    xdg.configFile.phpactor = {
-      source = ./config;
-      recursive = true;
-    };
-  };
-}
diff --git a/modules/home-manager/phpactor/config/phpactor.yml b/modules2/phpactor/config/phpactor.yml
similarity index 100%
rename from modules/home-manager/phpactor/config/phpactor.yml
rename to modules2/phpactor/config/phpactor.yml
diff --git a/modules/home-manager/phpactor/config/templates/action/SourceCode.php.twig b/modules2/phpactor/config/templates/action/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/phpactor/config/templates/action/SourceCode.php.twig
rename to modules2/phpactor/config/templates/action/SourceCode.php.twig
diff --git a/modules/home-manager/phpactor/config/templates/collection/SourceCode.php.twig b/modules2/phpactor/config/templates/collection/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/phpactor/config/templates/collection/SourceCode.php.twig
rename to modules2/phpactor/config/templates/collection/SourceCode.php.twig
diff --git a/modules/home-manager/phpactor/config/templates/default/SourceCode.php.twig b/modules2/phpactor/config/templates/default/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/phpactor/config/templates/default/SourceCode.php.twig
rename to modules2/phpactor/config/templates/default/SourceCode.php.twig
diff --git a/modules/home-manager/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig b/modules2/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
rename to modules2/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/modules/home-manager/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig b/modules2/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
rename to modules2/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/modules/home-manager/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig b/modules2/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
rename to modules2/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/modules2/phpactor/phpactor.nix b/modules2/phpactor/phpactor.nix
new file mode 100644
index 00000000..a3583515
--- /dev/null
+++ b/modules2/phpactor/phpactor.nix
@@ -0,0 +1,6 @@
+{
+  flake.modules.homeManager.base.xdg.configFile.phpactor = {
+    source = ./config;
+    recursive = true;
+  };
+}