diff --git a/home/vim/after/plugin/mappings/commentary.vim b/home/vim/after/plugin/mappings/commentary.lua
similarity index 94%
rename from home/vim/after/plugin/mappings/commentary.vim
rename to home/vim/after/plugin/mappings/commentary.lua
index 219d661..6ed3b89 100644
--- a/home/vim/after/plugin/mappings/commentary.vim
+++ b/home/vim/after/plugin/mappings/commentary.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local wk = require("which-key")
 
 local keys = {
@@ -9,4 +8,3 @@ local keys = {
 }
 
 wk.register(keys, { prefix = "gc" })
-EOF
diff --git a/home/vim/after/plugin/mappings/misc.vim b/home/vim/after/plugin/mappings/misc.lua
similarity index 91%
rename from home/vim/after/plugin/mappings/misc.vim
rename to home/vim/after/plugin/mappings/misc.lua
index c7fcc8a..6aa25a2 100644
--- a/home/vim/after/plugin/mappings/misc.vim
+++ b/home/vim/after/plugin/mappings/misc.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local wk = require("which-key")
 
 local keys = {
@@ -6,4 +5,3 @@ local keys = {
 }
 
 wk.register(keys, { prefix = "<leader>" })
-EOF
diff --git a/home/vim/after/plugin/mappings/telescope.vim b/home/vim/after/plugin/mappings/telescope.lua
similarity index 96%
rename from home/vim/after/plugin/mappings/telescope.vim
rename to home/vim/after/plugin/mappings/telescope.lua
index eb6363d..0867b36 100644
--- a/home/vim/after/plugin/mappings/telescope.vim
+++ b/home/vim/after/plugin/mappings/telescope.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local wk = require("which-key")
 local telescope_builtin = require("telescope.builtin")
 
@@ -14,5 +13,3 @@ local keys = {
 }
 
 wk.register(keys, { prefix = "<leader>" })
-EOF
-
diff --git a/home/vim/after/plugin/mappings/tree-sitter-textobjects.vim b/home/vim/after/plugin/mappings/tree-sitter-textobjects.lua
similarity index 98%
rename from home/vim/after/plugin/mappings/tree-sitter-textobjects.vim
rename to home/vim/after/plugin/mappings/tree-sitter-textobjects.lua
index 9cabd91..631731c 100644
--- a/home/vim/after/plugin/mappings/tree-sitter-textobjects.vim
+++ b/home/vim/after/plugin/mappings/tree-sitter-textobjects.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local wk = require("which-key")
 
 local motions = {
@@ -29,4 +28,3 @@ local objects = {
 
 wk.register(motions, { mode = "n" })
 wk.register(objects, { mode = "o" })
-EOF
diff --git a/home/vim/after/plugin/mappings/unimpaired.vim b/home/vim/after/plugin/mappings/unimpaired.lua
similarity index 99%
rename from home/vim/after/plugin/mappings/unimpaired.vim
rename to home/vim/after/plugin/mappings/unimpaired.lua
index 12029cc..c1b1d15 100644
--- a/home/vim/after/plugin/mappings/unimpaired.vim
+++ b/home/vim/after/plugin/mappings/unimpaired.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local wk = require("which-key")
 
 local keys = {
@@ -125,4 +124,3 @@ local keys = {
 }
 
 wk.register(keys)
-EOF
diff --git a/home/vim/plugin/abbreviations.vim b/home/vim/plugin/abbreviations.lua
similarity index 93%
rename from home/vim/plugin/abbreviations.vim
rename to home/vim/plugin/abbreviations.lua
index 4dd3633..f6d6ac3 100644
--- a/home/vim/plugin/abbreviations.vim
+++ b/home/vim/plugin/abbreviations.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local abbreviations = {
     -- A few things that are hard to write in ASCII
     ["(R)"] = "©",
@@ -8,4 +7,3 @@ local abbreviations = {
 for text, result in pairs(abbreviations) do
     vim.cmd.abbreviate(text, result)
 end
-EOF
diff --git a/home/vim/plugin/numbertoggle.vim b/home/vim/plugin/numbertoggle.lua
similarity index 98%
rename from home/vim/plugin/numbertoggle.vim
rename to home/vim/plugin/numbertoggle.lua
index 1b6a585..1f97fc8 100644
--- a/home/vim/plugin/numbertoggle.vim
+++ b/home/vim/plugin/numbertoggle.lua
@@ -1,4 +1,3 @@
-lua << EOF
 -- Show lines numbers
 vim.opt.number = true
 
@@ -22,4 +21,3 @@ vim.api.nvim_create_autocmd({ "TermOpen" }, {
     group = numbertoggle,
     command = "setlocal nonu nornu",
 })
-EOF
diff --git a/home/vim/plugin/settings/completion.vim b/home/vim/plugin/settings/completion.lua
similarity index 99%
rename from home/vim/plugin/settings/completion.vim
rename to home/vim/plugin/settings/completion.lua
index 68a5512..b5c80d3 100644
--- a/home/vim/plugin/settings/completion.vim
+++ b/home/vim/plugin/settings/completion.lua
@@ -1,4 +1,3 @@
-lua << EOF
 -- Show completion menu in all cases, and don't select anything
 vim.opt.completeopt = { "menu", "menuone", "noselect" }
 
@@ -61,4 +60,3 @@ cmp.setup({
         ghost_text = true,
     },
 })
-EOF
diff --git a/home/vim/plugin/settings/dressing.vim b/home/vim/plugin/settings/dressing.lua
similarity index 88%
rename from home/vim/plugin/settings/dressing.vim
rename to home/vim/plugin/settings/dressing.lua
index 9508126..3928a59 100644
--- a/home/vim/plugin/settings/dressing.vim
+++ b/home/vim/plugin/settings/dressing.lua
@@ -1,8 +1,6 @@
-lua << EOF
 local dressing = require("dressing")
 
 dressing.setup({
     -- Use a relative prompt size
     prefer_width = 0.4,
 })
-EOF
diff --git a/home/vim/plugin/settings/fastfold.vim b/home/vim/plugin/settings/fastfold.lua
similarity index 91%
rename from home/vim/plugin/settings/fastfold.vim
rename to home/vim/plugin/settings/fastfold.lua
index 3643e18..ac08519 100644
--- a/home/vim/plugin/settings/fastfold.vim
+++ b/home/vim/plugin/settings/fastfold.lua
@@ -1,6 +1,4 @@
-lua << EOF
 -- Intercept all fold commands
 vim.g.fastfold_fold_command_suffixes = {
     "x", "X", "a", "A", "o", "O", "c", "C", "r", "R", "m", "M", "i", "n", "N",
 }
-EOF
diff --git a/home/vim/plugin/settings/git.vim b/home/vim/plugin/settings/git.lua
similarity index 99%
rename from home/vim/plugin/settings/git.vim
rename to home/vim/plugin/settings/git.lua
index e67197f..bb9b516 100644
--- a/home/vim/plugin/settings/git.vim
+++ b/home/vim/plugin/settings/git.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local gitsigns = require('gitsigns')
 local wk = require("which-key")
 
@@ -57,4 +56,3 @@ local visual = {
 wk.register(keys, { buffer = bufnr })
 wk.register(objects, { buffer = bufnr, mode = "o" })
 wk.register(visual, { buffer = bufnr, mode = "x" })
-EOF
diff --git a/home/vim/plugin/settings/lspconfig.vim b/home/vim/plugin/settings/lspconfig.lua
similarity index 98%
rename from home/vim/plugin/settings/lspconfig.vim
rename to home/vim/plugin/settings/lspconfig.lua
index 04afafa..45be269 100644
--- a/home/vim/plugin/settings/lspconfig.vim
+++ b/home/vim/plugin/settings/lspconfig.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local lspconfig = require("lspconfig")
 local lsp = require("ambroisie.lsp")
 local utils = require("ambroisie.utils")
@@ -44,4 +43,3 @@ if utils.is_executable("rust-analyzer") then
         on_attach = lsp.on_attach,
     })
 end
-EOF
diff --git a/home/vim/plugin/settings/lualine.vim b/home/vim/plugin/settings/lualine.lua
similarity index 98%
rename from home/vim/plugin/settings/lualine.vim
rename to home/vim/plugin/settings/lualine.lua
index 93c38bb..fdaccda 100644
--- a/home/vim/plugin/settings/lualine.vim
+++ b/home/vim/plugin/settings/lualine.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local lualine = require("lualine")
 local utils = require("ambroisie.utils")
 
@@ -60,4 +59,3 @@ lualine.setup({
         "quickfix",
     },
 })
-EOF
diff --git a/home/vim/plugin/settings/luasnip.vim b/home/vim/plugin/settings/luasnip.lua
similarity index 77%
rename from home/vim/plugin/settings/luasnip.vim
rename to home/vim/plugin/settings/luasnip.lua
index 7d81a11..80309d7 100644
--- a/home/vim/plugin/settings/luasnip.vim
+++ b/home/vim/plugin/settings/luasnip.lua
@@ -1,3 +1 @@
-lua << EOF
 require("luasnip.loaders.from_vscode").lazy_load()
-EOF
diff --git a/home/vim/plugin/settings/null-ls.vim b/home/vim/plugin/settings/null-ls.lua
similarity index 99%
rename from home/vim/plugin/settings/null-ls.vim
rename to home/vim/plugin/settings/null-ls.lua
index b2102bd..16e52ff 100644
--- a/home/vim/plugin/settings/null-ls.vim
+++ b/home/vim/plugin/settings/null-ls.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local null_ls = require("null-ls")
 local lsp = require("ambroisie.lsp")
 local utils = require("ambroisie.utils")
@@ -122,4 +121,3 @@ null_ls.register({
         condition = utils.is_executable_condition("shfmt"),
     }),
 })
-EOF
diff --git a/home/vim/plugin/settings/surround.vim b/home/vim/plugin/settings/surround.lua
similarity index 83%
rename from home/vim/plugin/settings/surround.vim
rename to home/vim/plugin/settings/surround.lua
index e5eb81b..3585a12 100644
--- a/home/vim/plugin/settings/surround.vim
+++ b/home/vim/plugin/settings/surround.lua
@@ -1,5 +1,3 @@
-lua << EOF
 require("nvim-surround").setup({
     -- No configuration at the moment
 })
-EOF
diff --git a/home/vim/plugin/settings/telescope.vim b/home/vim/plugin/settings/telescope.lua
similarity index 97%
rename from home/vim/plugin/settings/telescope.vim
rename to home/vim/plugin/settings/telescope.lua
index fc2c5fb..c87907e 100644
--- a/home/vim/plugin/settings/telescope.vim
+++ b/home/vim/plugin/settings/telescope.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local telescope = require("telescope")
 
 telescope.setup({
@@ -23,4 +22,3 @@ telescope.setup({
 
 telescope.load_extension("fzf")
 telescope.load_extension("lsp_handlers")
-EOF
diff --git a/home/vim/plugin/settings/tree-sitter.vim b/home/vim/plugin/settings/tree-sitter.lua
similarity index 99%
rename from home/vim/plugin/settings/tree-sitter.vim
rename to home/vim/plugin/settings/tree-sitter.lua
index 1204185..0d84abd 100644
--- a/home/vim/plugin/settings/tree-sitter.vim
+++ b/home/vim/plugin/settings/tree-sitter.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local ts_config = require("nvim-treesitter.configs")
 ts_config.setup({
     highlight = {
@@ -55,4 +54,3 @@ ts_config.setup({
         },
     },
 })
-EOF
diff --git a/home/vim/plugin/settings/which-key.vim b/home/vim/plugin/settings/which-key.lua
similarity index 74%
rename from home/vim/plugin/settings/which-key.vim
rename to home/vim/plugin/settings/which-key.lua
index 505bdc4..2edfd70 100644
--- a/home/vim/plugin/settings/which-key.vim
+++ b/home/vim/plugin/settings/which-key.lua
@@ -1,4 +1,2 @@
-lua << EOF
 local wk = require("which-key")
 wk.setup()
-EOF
diff --git a/home/vim/plugin/signtoggle.vim b/home/vim/plugin/signtoggle.lua
similarity index 97%
rename from home/vim/plugin/signtoggle.vim
rename to home/vim/plugin/signtoggle.lua
index 5cc2e8e..d6a26e2 100644
--- a/home/vim/plugin/signtoggle.vim
+++ b/home/vim/plugin/signtoggle.lua
@@ -1,4 +1,3 @@
-lua << EOF
 local signtoggle = vim.api.nvim_create_augroup("signtoggle", { clear = true })
 
 -- Only show sign column for the currently focused buffer
@@ -19,4 +18,3 @@ vim.api.nvim_create_autocmd({ "TermOpen" }, {
     group = signtoggle,
     command = "setlocal signcolumn=no",
 })
-EOF