diff --git a/modules/nvim.nix b/modules/nvim.nix
index d8a81e0..a6cb331 100644
--- a/modules/nvim.nix
+++ b/modules/nvim.nix
@@ -8,6 +8,7 @@
     configure = {
       # Add Fennel to Lua path and require basic implementation
       customRC = ''
+        set runtimepath^=${./nvim}
         lua << EOF
         vim.g.lsp_paths = {
           ['lexical'] = "${pkgs.lexical}/bin/lexical",
diff --git a/vim/.config/nvim/.netrwhist b/modules/nvim/.netrwhist
similarity index 100%
rename from vim/.config/nvim/.netrwhist
rename to modules/nvim/.netrwhist
diff --git a/vim/.config/nvim/after/ftplugin/dhall.vim b/modules/nvim/after/ftplugin/dhall.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/dhall.vim
rename to modules/nvim/after/ftplugin/dhall.vim
diff --git a/vim/.config/nvim/after/ftplugin/elixir.vim b/modules/nvim/after/ftplugin/elixir.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/elixir.vim
rename to modules/nvim/after/ftplugin/elixir.vim
diff --git a/vim/.config/nvim/after/ftplugin/erlang.vim b/modules/nvim/after/ftplugin/erlang.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/erlang.vim
rename to modules/nvim/after/ftplugin/erlang.vim
diff --git a/vim/.config/nvim/after/ftplugin/fish.vim b/modules/nvim/after/ftplugin/fish.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/fish.vim
rename to modules/nvim/after/ftplugin/fish.vim
diff --git a/vim/.config/nvim/after/ftplugin/gitcommit.vim b/modules/nvim/after/ftplugin/gitcommit.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/gitcommit.vim
rename to modules/nvim/after/ftplugin/gitcommit.vim
diff --git a/vim/.config/nvim/after/ftplugin/help.vim b/modules/nvim/after/ftplugin/help.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/help.vim
rename to modules/nvim/after/ftplugin/help.vim
diff --git a/vim/.config/nvim/after/ftplugin/html.vim b/modules/nvim/after/ftplugin/html.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/html.vim
rename to modules/nvim/after/ftplugin/html.vim
diff --git a/vim/.config/nvim/after/ftplugin/javascript.vim b/modules/nvim/after/ftplugin/javascript.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/javascript.vim
rename to modules/nvim/after/ftplugin/javascript.vim
diff --git a/vim/.config/nvim/after/ftplugin/json.vim b/modules/nvim/after/ftplugin/json.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/json.vim
rename to modules/nvim/after/ftplugin/json.vim
diff --git a/vim/.config/nvim/after/ftplugin/make.vim b/modules/nvim/after/ftplugin/make.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/make.vim
rename to modules/nvim/after/ftplugin/make.vim
diff --git a/vim/.config/nvim/after/ftplugin/man.vim b/modules/nvim/after/ftplugin/man.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/man.vim
rename to modules/nvim/after/ftplugin/man.vim
diff --git a/vim/.config/nvim/after/ftplugin/markdown.vim b/modules/nvim/after/ftplugin/markdown.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/markdown.vim
rename to modules/nvim/after/ftplugin/markdown.vim
diff --git a/vim/.config/nvim/after/ftplugin/nix.vim b/modules/nvim/after/ftplugin/nix.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/nix.vim
rename to modules/nvim/after/ftplugin/nix.vim
diff --git a/vim/.config/nvim/after/ftplugin/prr.vim b/modules/nvim/after/ftplugin/prr.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/prr.vim
rename to modules/nvim/after/ftplugin/prr.vim
diff --git a/vim/.config/nvim/after/ftplugin/qf.vim b/modules/nvim/after/ftplugin/qf.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/qf.vim
rename to modules/nvim/after/ftplugin/qf.vim
diff --git a/vim/.config/nvim/after/ftplugin/robots.vim b/modules/nvim/after/ftplugin/robots.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/robots.vim
rename to modules/nvim/after/ftplugin/robots.vim
diff --git a/vim/.config/nvim/after/ftplugin/tf.vim b/modules/nvim/after/ftplugin/tf.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/tf.vim
rename to modules/nvim/after/ftplugin/tf.vim
diff --git a/vim/.config/nvim/after/ftplugin/vim.vim b/modules/nvim/after/ftplugin/vim.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/vim.vim
rename to modules/nvim/after/ftplugin/vim.vim
diff --git a/vim/.config/nvim/after/ftplugin/vimwiki.vim b/modules/nvim/after/ftplugin/vimwiki.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/vimwiki.vim
rename to modules/nvim/after/ftplugin/vimwiki.vim
diff --git a/vim/.config/nvim/after/ftplugin/yaml.vim b/modules/nvim/after/ftplugin/yaml.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/yaml.vim
rename to modules/nvim/after/ftplugin/yaml.vim
diff --git a/vim/.config/nvim/after/ftplugin/zig.vim b/modules/nvim/after/ftplugin/zig.vim
similarity index 100%
rename from vim/.config/nvim/after/ftplugin/zig.vim
rename to modules/nvim/after/ftplugin/zig.vim
diff --git a/vim/.config/nvim/after/plugin/qf.vim b/modules/nvim/after/plugin/qf.vim
similarity index 100%
rename from vim/.config/nvim/after/plugin/qf.vim
rename to modules/nvim/after/plugin/qf.vim
diff --git a/vim/.config/nvim/after/queries/elixir/highlights.scm b/modules/nvim/after/queries/elixir/highlights.scm
similarity index 100%
rename from vim/.config/nvim/after/queries/elixir/highlights.scm
rename to modules/nvim/after/queries/elixir/highlights.scm
diff --git a/vim/.config/nvim/after/queries/erlang/highlights.scm b/modules/nvim/after/queries/erlang/highlights.scm
similarity index 100%
rename from vim/.config/nvim/after/queries/erlang/highlights.scm
rename to modules/nvim/after/queries/erlang/highlights.scm
diff --git a/vim/.config/nvim/after/queries/haskell/highlights.scm b/modules/nvim/after/queries/haskell/highlights.scm
similarity index 100%
rename from vim/.config/nvim/after/queries/haskell/highlights.scm
rename to modules/nvim/after/queries/haskell/highlights.scm
diff --git a/vim/.config/nvim/autoload/dash.vim b/modules/nvim/autoload/dash.vim
similarity index 100%
rename from vim/.config/nvim/autoload/dash.vim
rename to modules/nvim/autoload/dash.vim
diff --git a/vim/.config/nvim/autoload/did_you_mean.vim b/modules/nvim/autoload/did_you_mean.vim
similarity index 100%
rename from vim/.config/nvim/autoload/did_you_mean.vim
rename to modules/nvim/autoload/did_you_mean.vim
diff --git a/vim/.config/nvim/autoload/ft/javascript.vim b/modules/nvim/autoload/ft/javascript.vim
similarity index 100%
rename from vim/.config/nvim/autoload/ft/javascript.vim
rename to modules/nvim/autoload/ft/javascript.vim
diff --git a/vim/.config/nvim/autoload/statusline.vim b/modules/nvim/autoload/statusline.vim
similarity index 100%
rename from vim/.config/nvim/autoload/statusline.vim
rename to modules/nvim/autoload/statusline.vim
diff --git a/vim/.config/nvim/compiler/credo.vim b/modules/nvim/compiler/credo.vim
similarity index 100%
rename from vim/.config/nvim/compiler/credo.vim
rename to modules/nvim/compiler/credo.vim
diff --git a/vim/.config/nvim/compiler/mix-compile.vim b/modules/nvim/compiler/mix-compile.vim
similarity index 100%
rename from vim/.config/nvim/compiler/mix-compile.vim
rename to modules/nvim/compiler/mix-compile.vim
diff --git a/vim/.config/nvim/compiler/mix.vim b/modules/nvim/compiler/mix.vim
similarity index 100%
rename from vim/.config/nvim/compiler/mix.vim
rename to modules/nvim/compiler/mix.vim
diff --git a/vim/.config/nvim/fnl/codestats.fnl b/modules/nvim/fnl/codestats.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/codestats.fnl
rename to modules/nvim/fnl/codestats.fnl
diff --git a/vim/.config/nvim/fnl/langclient.fnl b/modules/nvim/fnl/langclient.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/langclient.fnl
rename to modules/nvim/fnl/langclient.fnl
diff --git a/vim/.config/nvim/fnl/nvim/init.fnl b/modules/nvim/fnl/nvim/init.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/nvim/init.fnl
rename to modules/nvim/fnl/nvim/init.fnl
diff --git a/vim/.config/nvim/fnl/nvim/logger.fnl b/modules/nvim/fnl/nvim/logger.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/nvim/logger.fnl
rename to modules/nvim/fnl/nvim/logger.fnl
diff --git a/vim/.config/nvim/fnl/nvim/macro-init.fnl b/modules/nvim/fnl/nvim/macro-init.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/nvim/macro-init.fnl
rename to modules/nvim/fnl/nvim/macro-init.fnl
diff --git a/vim/.config/nvim/fnl/picker.fnl b/modules/nvim/fnl/picker.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/picker.fnl
rename to modules/nvim/fnl/picker.fnl
diff --git a/vim/.config/nvim/fnl/plugins.fnl b/modules/nvim/fnl/plugins.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/plugins.fnl
rename to modules/nvim/fnl/plugins.fnl
diff --git a/vim/.config/nvim/fnl/projections.fnl b/modules/nvim/fnl/projections.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/projections.fnl
rename to modules/nvim/fnl/projections.fnl
diff --git a/vim/.config/nvim/fnl/relude/init.fnl b/modules/nvim/fnl/relude/init.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/relude/init.fnl
rename to modules/nvim/fnl/relude/init.fnl
diff --git a/vim/.config/nvim/fnl/relude/macro-init.fnl b/modules/nvim/fnl/relude/macro-init.fnl
similarity index 100%
rename from vim/.config/nvim/fnl/relude/macro-init.fnl
rename to modules/nvim/fnl/relude/macro-init.fnl
diff --git a/vim/.config/nvim/ftdetect/custom.vim b/modules/nvim/ftdetect/custom.vim
similarity index 100%
rename from vim/.config/nvim/ftdetect/custom.vim
rename to modules/nvim/ftdetect/custom.vim
diff --git a/vim/.config/nvim/init.fnl b/modules/nvim/init.fnl
similarity index 100%
rename from vim/.config/nvim/init.fnl
rename to modules/nvim/init.fnl
diff --git a/vim/.config/nvim/lua/basic.lua b/modules/nvim/lua/basic.lua
similarity index 100%
rename from vim/.config/nvim/lua/basic.lua
rename to modules/nvim/lua/basic.lua
diff --git a/vim/.config/nvim/plugin/.gitignore b/modules/nvim/plugin/.gitignore
similarity index 100%
rename from vim/.config/nvim/plugin/.gitignore
rename to modules/nvim/plugin/.gitignore
diff --git a/vim/.config/nvim/plugin/did-you-mean.vim b/modules/nvim/plugin/did-you-mean.vim
similarity index 100%
rename from vim/.config/nvim/plugin/did-you-mean.vim
rename to modules/nvim/plugin/did-you-mean.vim
diff --git a/vim/.config/nvim/plugin/pastebin.vim b/modules/nvim/plugin/pastebin.vim
similarity index 100%
rename from vim/.config/nvim/plugin/pastebin.vim
rename to modules/nvim/plugin/pastebin.vim
diff --git a/vim/.config/nvim/plugin/projections.vim b/modules/nvim/plugin/projections.vim
similarity index 100%
rename from vim/.config/nvim/plugin/projections.vim
rename to modules/nvim/plugin/projections.vim
diff --git a/vim/.config/nvim/plugin/qf.vim b/modules/nvim/plugin/qf.vim
similarity index 100%
rename from vim/.config/nvim/plugin/qf.vim
rename to modules/nvim/plugin/qf.vim
diff --git a/vim/.config/nvim/plugin/statusline.vim b/modules/nvim/plugin/statusline.vim
similarity index 100%
rename from vim/.config/nvim/plugin/statusline.vim
rename to modules/nvim/plugin/statusline.vim
diff --git a/vim/.config/nvim/plugin/unimpaired.vim b/modules/nvim/plugin/unimpaired.vim
similarity index 100%
rename from vim/.config/nvim/plugin/unimpaired.vim
rename to modules/nvim/plugin/unimpaired.vim
diff --git a/vim/.config/nvim/plugin/wiki.vim b/modules/nvim/plugin/wiki.vim
similarity index 100%
rename from vim/.config/nvim/plugin/wiki.vim
rename to modules/nvim/plugin/wiki.vim
diff --git a/vim/.config/nvim/snips/apache-v2-license.snip b/modules/nvim/snips/apache-v2-license.snip
similarity index 100%
rename from vim/.config/nvim/snips/apache-v2-license.snip
rename to modules/nvim/snips/apache-v2-license.snip
diff --git a/vim/.config/nvim/snips/bsd-revised-license.snip b/modules/nvim/snips/bsd-revised-license.snip
similarity index 100%
rename from vim/.config/nvim/snips/bsd-revised-license.snip
rename to modules/nvim/snips/bsd-revised-license.snip
diff --git a/vim/.config/nvim/snips/freebsd-license.snip b/modules/nvim/snips/freebsd-license.snip
similarity index 100%
rename from vim/.config/nvim/snips/freebsd-license.snip
rename to modules/nvim/snips/freebsd-license.snip
diff --git a/vim/.config/nvim/snips/mit-license.snip b/modules/nvim/snips/mit-license.snip
similarity index 100%
rename from vim/.config/nvim/snips/mit-license.snip
rename to modules/nvim/snips/mit-license.snip
diff --git a/vim/.config/nvim/spell/en.utf-8.add b/modules/nvim/spell/en.utf-8.add
similarity index 100%
rename from vim/.config/nvim/spell/en.utf-8.add
rename to modules/nvim/spell/en.utf-8.add
diff --git a/vim/.config/nvim/spell/en.utf-8.sug b/modules/nvim/spell/en.utf-8.sug
similarity index 100%
rename from vim/.config/nvim/spell/en.utf-8.sug
rename to modules/nvim/spell/en.utf-8.sug
diff --git a/vim/.config/nvim/spell/pl.utf-8.add b/modules/nvim/spell/pl.utf-8.add
similarity index 100%
rename from vim/.config/nvim/spell/pl.utf-8.add
rename to modules/nvim/spell/pl.utf-8.add
diff --git a/vim/.config/nvim/syntax/dhall.vim b/modules/nvim/syntax/dhall.vim
similarity index 100%
rename from vim/.config/nvim/syntax/dhall.vim
rename to modules/nvim/syntax/dhall.vim
diff --git a/vim/.config/nvim/syntax/haproxy.vim b/modules/nvim/syntax/haproxy.vim
similarity index 100%
rename from vim/.config/nvim/syntax/haproxy.vim
rename to modules/nvim/syntax/haproxy.vim
diff --git a/vim/.config/nvim/syntax/plan.vim b/modules/nvim/syntax/plan.vim
similarity index 100%
rename from vim/.config/nvim/syntax/plan.vim
rename to modules/nvim/syntax/plan.vim
diff --git a/vim/.config/nvim/syntax/prr.vim b/modules/nvim/syntax/prr.vim
similarity index 100%
rename from vim/.config/nvim/syntax/prr.vim
rename to modules/nvim/syntax/prr.vim
diff --git a/vim/.config/nvim/syntax/sql.vim b/modules/nvim/syntax/sql.vim
similarity index 100%
rename from vim/.config/nvim/syntax/sql.vim
rename to modules/nvim/syntax/sql.vim
diff --git a/vim/.config/nvim/templates/ex_unit.tpl b/modules/nvim/templates/ex_unit.tpl
similarity index 100%
rename from vim/.config/nvim/templates/ex_unit.tpl
rename to modules/nvim/templates/ex_unit.tpl