diff --git a/nix/modules/home-manager/cli/default.nix b/nix/modules/home-manager/cli/default.nix
index 2becbafc..2116a53e 100644
--- a/nix/modules/home-manager/cli/default.nix
+++ b/nix/modules/home-manager/cli/default.nix
@@ -10,7 +10,7 @@
     ./neovim.nix
     ./newsboat.nix
     ./notes.nix
-    ./phpactor.nix
+    ./phpactor
     ./starship.nix
     ./tmux.nix
     ./tmux-sessionizer.nix
diff --git a/phpactor/phpactor.yml b/nix/modules/home-manager/cli/phpactor/config/phpactor.yml
similarity index 100%
rename from phpactor/phpactor.yml
rename to nix/modules/home-manager/cli/phpactor/config/phpactor.yml
diff --git a/phpactor/templates/collection/SourceCode.php.twig b/nix/modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig
similarity index 100%
rename from phpactor/templates/collection/SourceCode.php.twig
rename to nix/modules/home-manager/cli/phpactor/config/templates/collection/SourceCode.php.twig
diff --git a/phpactor/templates/default/SourceCode.php.twig b/nix/modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig
similarity index 100%
rename from phpactor/templates/default/SourceCode.php.twig
rename to nix/modules/home-manager/cli/phpactor/config/templates/default/SourceCode.php.twig
diff --git a/phpactor/templates/drupal-functional-test/SourceCode.php.twig b/nix/modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from phpactor/templates/drupal-functional-test/SourceCode.php.twig
rename to nix/modules/home-manager/cli/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/phpactor/templates/drupal-kernel-test/SourceCode.php.twig b/nix/modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from phpactor/templates/drupal-kernel-test/SourceCode.php.twig
rename to nix/modules/home-manager/cli/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/phpactor/templates/drupal-unit-test/SourceCode.php.twig b/nix/modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from phpactor/templates/drupal-unit-test/SourceCode.php.twig
rename to nix/modules/home-manager/cli/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/nix/modules/home-manager/cli/phpactor.nix b/nix/modules/home-manager/cli/phpactor/default.nix
similarity index 55%
rename from nix/modules/home-manager/cli/phpactor.nix
rename to nix/modules/home-manager/cli/phpactor/default.nix
index 98bc31bb..0f514d8c 100644
--- a/nix/modules/home-manager/cli/phpactor.nix
+++ b/nix/modules/home-manager/cli/phpactor/default.nix
@@ -1,7 +1,6 @@
-{ self, ... }:
 {
   xdg.configFile.phpactor = {
-    source = "${self}/phpactor";
+    source = ./config;
     recursive = true;
   };
 }