diff --git a/nix/modules/home-manager/cli/default.nix b/nix/modules/home-manager/cli/default.nix
index 2116a53e..726f02e6 100644
--- a/nix/modules/home-manager/cli/default.nix
+++ b/nix/modules/home-manager/cli/default.nix
@@ -7,7 +7,7 @@
     ./direnv.nix
     ./fzf.nix
     ./git.nix
-    ./neovim.nix
+    ./neovim
     ./newsboat.nix
     ./notes.nix
     ./phpactor
diff --git a/nvim/.gitignore b/nix/modules/home-manager/cli/neovim/config/.gitignore
similarity index 100%
rename from nvim/.gitignore
rename to nix/modules/home-manager/cli/neovim/config/.gitignore
diff --git a/nvim/after/ftplugin/gitcommit.lua b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/gitcommit.lua
similarity index 100%
rename from nvim/after/ftplugin/gitcommit.lua
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/gitcommit.lua
diff --git a/nvim/after/ftplugin/markdown.lua b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/markdown.lua
similarity index 100%
rename from nvim/after/ftplugin/markdown.lua
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/markdown.lua
diff --git a/nvim/after/ftplugin/netrw.lua b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/netrw.lua
similarity index 100%
rename from nvim/after/ftplugin/netrw.lua
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/netrw.lua
diff --git a/nvim/after/ftplugin/php.lua b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/php.lua
similarity index 100%
rename from nvim/after/ftplugin/php.lua
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/php.lua
diff --git a/nvim/after/ftplugin/rst.lua b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/rst.lua
similarity index 100%
rename from nvim/after/ftplugin/rst.lua
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/rst.lua
diff --git a/nvim/after/ftplugin/term.vim b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/term.vim
similarity index 100%
rename from nvim/after/ftplugin/term.vim
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/term.vim
diff --git a/nvim/after/ftplugin/text.lua b/nix/modules/home-manager/cli/neovim/config/after/ftplugin/text.lua
similarity index 100%
rename from nvim/after/ftplugin/text.lua
rename to nix/modules/home-manager/cli/neovim/config/after/ftplugin/text.lua
diff --git a/nvim/autoload/opdavies.vim b/nix/modules/home-manager/cli/neovim/config/autoload/opdavies.vim
similarity index 100%
rename from nvim/autoload/opdavies.vim
rename to nix/modules/home-manager/cli/neovim/config/autoload/opdavies.vim
diff --git a/nvim/init.lua b/nix/modules/home-manager/cli/neovim/config/init.lua
similarity index 100%
rename from nvim/init.lua
rename to nix/modules/home-manager/cli/neovim/config/init.lua
diff --git a/nvim/lua/opdavies/globals.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/globals.lua
similarity index 100%
rename from nvim/lua/opdavies/globals.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/globals.lua
diff --git a/nvim/lua/opdavies/init.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/init.lua
similarity index 100%
rename from nvim/lua/opdavies/init.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/init.lua
diff --git a/nvim/lua/opdavies/keymaps.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/keymaps.lua
similarity index 100%
rename from nvim/lua/opdavies/keymaps.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/keymaps.lua
diff --git a/nvim/lua/opdavies/lsp/handlers.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/handlers.lua
similarity index 100%
rename from nvim/lua/opdavies/lsp/handlers.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/handlers.lua
diff --git a/nvim/lua/opdavies/lsp/init.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/init.lua
similarity index 100%
rename from nvim/lua/opdavies/lsp/init.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/lsp/init.lua
diff --git a/nvim/lua/opdavies/options.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/options.lua
similarity index 100%
rename from nvim/lua/opdavies/options.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/options.lua
diff --git a/nvim/lua/opdavies/snippets/javascript.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/javascript.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/javascript.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/javascript.lua
diff --git a/nvim/lua/opdavies/snippets/lua.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/lua.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/lua.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/lua.lua
diff --git a/nvim/lua/opdavies/snippets/php.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/php.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/php.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/php.lua
diff --git a/nvim/lua/opdavies/snippets/rst.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/rst.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/rst.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/rst.lua
diff --git a/nvim/lua/opdavies/snippets/scss.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/scss.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/scss.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/scss.lua
diff --git a/nvim/lua/opdavies/snippets/twig.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/twig.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/twig.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/twig.lua
diff --git a/nvim/lua/opdavies/snippets/yaml.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/yaml.lua
similarity index 100%
rename from nvim/lua/opdavies/snippets/yaml.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/snippets/yaml.lua
diff --git a/nvim/lua/opdavies/telescope/multigrep.lua b/nix/modules/home-manager/cli/neovim/config/lua/opdavies/telescope/multigrep.lua
similarity index 100%
rename from nvim/lua/opdavies/telescope/multigrep.lua
rename to nix/modules/home-manager/cli/neovim/config/lua/opdavies/telescope/multigrep.lua
diff --git a/nvim/plugin/autocommands.lua b/nix/modules/home-manager/cli/neovim/config/plugin/autocommands.lua
similarity index 100%
rename from nvim/plugin/autocommands.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/autocommands.lua
diff --git a/nvim/plugin/colorscheme.lua b/nix/modules/home-manager/cli/neovim/config/plugin/colorscheme.lua
similarity index 100%
rename from nvim/plugin/colorscheme.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/colorscheme.lua
diff --git a/nvim/plugin/comment.lua b/nix/modules/home-manager/cli/neovim/config/plugin/comment.lua
similarity index 100%
rename from nvim/plugin/comment.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/comment.lua
diff --git a/nvim/plugin/completion.lua b/nix/modules/home-manager/cli/neovim/config/plugin/completion.lua
similarity index 100%
rename from nvim/plugin/completion.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/completion.lua
diff --git a/nvim/plugin/conform.lua b/nix/modules/home-manager/cli/neovim/config/plugin/conform.lua
similarity index 100%
rename from nvim/plugin/conform.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/conform.lua
diff --git a/nvim/plugin/dap.lua b/nix/modules/home-manager/cli/neovim/config/plugin/dap.lua
similarity index 100%
rename from nvim/plugin/dap.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/dap.lua
diff --git a/nvim/plugin/edit_alternate.lua b/nix/modules/home-manager/cli/neovim/config/plugin/edit_alternate.lua
similarity index 100%
rename from nvim/plugin/edit_alternate.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/edit_alternate.lua
diff --git a/nvim/plugin/filetype.lua b/nix/modules/home-manager/cli/neovim/config/plugin/filetype.lua
similarity index 100%
rename from nvim/plugin/filetype.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/filetype.lua
diff --git a/nvim/plugin/fugitive.lua b/nix/modules/home-manager/cli/neovim/config/plugin/fugitive.lua
similarity index 100%
rename from nvim/plugin/fugitive.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/fugitive.lua
diff --git a/nvim/plugin/gitsigns.lua b/nix/modules/home-manager/cli/neovim/config/plugin/gitsigns.lua
similarity index 100%
rename from nvim/plugin/gitsigns.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/gitsigns.lua
diff --git a/nvim/plugin/harpoon.lua b/nix/modules/home-manager/cli/neovim/config/plugin/harpoon.lua
similarity index 100%
rename from nvim/plugin/harpoon.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/harpoon.lua
diff --git a/nvim/plugin/lint.lua b/nix/modules/home-manager/cli/neovim/config/plugin/lint.lua
similarity index 100%
rename from nvim/plugin/lint.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/lint.lua
diff --git a/nvim/plugin/mini.lua b/nix/modules/home-manager/cli/neovim/config/plugin/mini.lua
similarity index 100%
rename from nvim/plugin/mini.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/mini.lua
diff --git a/nvim/plugin/netrw.lua b/nix/modules/home-manager/cli/neovim/config/plugin/netrw.lua
similarity index 100%
rename from nvim/plugin/netrw.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/netrw.lua
diff --git a/nvim/plugin/phpactor.lua b/nix/modules/home-manager/cli/neovim/config/plugin/phpactor.lua
similarity index 100%
rename from nvim/plugin/phpactor.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/phpactor.lua
diff --git a/nvim/plugin/refactoring.lua b/nix/modules/home-manager/cli/neovim/config/plugin/refactoring.lua
similarity index 100%
rename from nvim/plugin/refactoring.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/refactoring.lua
diff --git a/nvim/plugin/snippets.lua b/nix/modules/home-manager/cli/neovim/config/plugin/snippets.lua
similarity index 100%
rename from nvim/plugin/snippets.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/snippets.lua
diff --git a/nvim/plugin/telescope.lua b/nix/modules/home-manager/cli/neovim/config/plugin/telescope.lua
similarity index 100%
rename from nvim/plugin/telescope.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/telescope.lua
diff --git a/nvim/plugin/treesitter.lua b/nix/modules/home-manager/cli/neovim/config/plugin/treesitter.lua
similarity index 100%
rename from nvim/plugin/treesitter.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/treesitter.lua
diff --git a/nvim/plugin/undotree.lua b/nix/modules/home-manager/cli/neovim/config/plugin/undotree.lua
similarity index 100%
rename from nvim/plugin/undotree.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/undotree.lua
diff --git a/nvim/plugin/vim-test.lua b/nix/modules/home-manager/cli/neovim/config/plugin/vim-test.lua
similarity index 100%
rename from nvim/plugin/vim-test.lua
rename to nix/modules/home-manager/cli/neovim/config/plugin/vim-test.lua
diff --git a/nvim/spell/en.utf-8.add b/nix/modules/home-manager/cli/neovim/config/spell/en.utf-8.add
similarity index 100%
rename from nvim/spell/en.utf-8.add
rename to nix/modules/home-manager/cli/neovim/config/spell/en.utf-8.add
diff --git a/nvim/stylua.toml b/nix/modules/home-manager/cli/neovim/config/stylua.toml
similarity index 100%
rename from nvim/stylua.toml
rename to nix/modules/home-manager/cli/neovim/config/stylua.toml
diff --git a/nix/modules/home-manager/cli/neovim.nix b/nix/modules/home-manager/cli/neovim/default.nix
similarity index 98%
rename from nix/modules/home-manager/cli/neovim.nix
rename to nix/modules/home-manager/cli/neovim/default.nix
index c6e5c6ea..9815997f 100644
--- a/nix/modules/home-manager/cli/neovim.nix
+++ b/nix/modules/home-manager/cli/neovim/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  self,
   ...
 }:
 
@@ -178,7 +177,7 @@ in
     };
 
     xdg.configFile.nvim = {
-      source = "${self}/nvim";
+      source = ./config;
       recursive = true;
     };