diff --git a/nvim/.config/nvim/after/plugin/colours.lua b/nvim/.config/nvim/after/plugin/colours.lua
new file mode 100644
index 00000000..07538d87
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/colours.lua
@@ -0,0 +1,3 @@
+require("colorbuddy").colorscheme("gruvbuddy")
+
+require'colorizer'.setup()
diff --git a/nvim/.config/nvim/after/plugin/completion.lua b/nvim/.config/nvim/after/plugin/completion.lua
new file mode 100644
index 00000000..537169cf
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/completion.lua
@@ -0,0 +1,50 @@
+local cmp = require "cmp"
+
+cmp.setup {
+  snippet = {
+    expand = function(args)
+      require('luasnip').lsp_expand(args.body)
+    end
+  },
+
+  mapping = {
+    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+    ["<C-e>"] = cmp.mapping.close(),
+    ["<c-y>"] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Insert,
+      select = true,
+    },
+  },
+
+  sources = {
+    { name = "buffer", priority = 2, keyword_length = 5, max_item_count = 5 },
+    { name = "calc" },
+    { name = "path" },
+    { name = "spell" },
+    { name = "treesitter" },
+
+    -- Neovim
+    { name = "nvim_lsp", priority = 10 },
+    { name = "nvim_lua" },
+
+    -- Plugins
+    { name = "luasnip" },
+    { name = "cmp_tabnine" },
+  },
+
+  formatting = {
+    format = require("lspkind").cmp_format({with_text = true, menu = ({
+      buffer = "[buf]",
+      cmp_tabnine = "[tn]",
+      luasnip = "[snip]",
+      nvim_lsp = "[lsp]",
+      nvim_lua = "[lua]",
+      path = "[path]",
+    })}),
+  },
+
+  experimental = {
+    ghost_text = true
+  },
+}
diff --git a/nvim/.config/nvim/after/plugin/floaterm.lua b/nvim/.config/nvim/after/plugin/floaterm.lua
new file mode 100644
index 00000000..a4acdf95
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/floaterm.lua
@@ -0,0 +1,8 @@
+local map = vim.api.nvim_set_keymap
+
+local options = { noremap = true }
+
+map('n', '<leader>ld', '<cmd>FloatermNew --autoclose=2 --height=0.9 --width=0.9 lazydocker<cr>', options)
+map('n', '<leader>lg', '<cmd>FloatermNew --autoclose=2 --height=0.9 --width=0.9 lazygit<cr>', options)
+map('n', '<leader>nn', '<cmd>FloatermNew --autoclose=2 --height=0.5 --width=0.5 nnn -Hde<cr>', options)
+map('n', '<leader>tt', '<cmd>FloatermNew --autoclose=2 --height=0.9 --width=0.9 zsh<cr>', options)
diff --git a/nvim/.config/nvim/after/plugin/gitsigns.lua b/nvim/.config/nvim/after/plugin/gitsigns.lua
new file mode 100644
index 00000000..faa948b6
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/gitsigns.lua
@@ -0,0 +1,23 @@
+require "colorbuddy"
+
+local c = require("colorbuddy.color").colors
+local Group = require("colorbuddy.group").Group
+
+Group.new("GitSignsAdd", c.green)
+Group.new("GitSignsChange", c.yellow)
+Group.new("GitSignsDelete", c.red)
+
+require 'gitsigns'.setup {
+  linehl = false,
+  numhl = true,
+
+  signs = {
+    add = { hl = "GitSignsAdd", text = "│", numhl = "GitSignsAddNr" },
+    change = { hl = "GitSignsChange", text = "│", numhl = "GitSignsChangeNr" },
+    delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr" },
+    topdelete = { hl = "GitSignsDelete", text = "‾", numhl = "GitSignsDeleteNr" },
+    changedelete = { hl = "GitSignsDelete", text = "~", numhl = "GitSignsChangeNr" },
+  },
+
+  word_diff = false,
+}
diff --git a/nvim/.config/nvim/after/plugin/indent-blankline.lua b/nvim/.config/nvim/after/plugin/indent-blankline.lua
new file mode 100644
index 00000000..010c56af
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/indent-blankline.lua
@@ -0,0 +1,13 @@
+vim.opt.list = true
+vim.opt.listchars = {
+  eol = "↴",
+}
+
+vim.cmd [[highlight IndentBlanklineIndent1 guifg=#555555 gui=nocombine]]
+
+require "indent_blankline".setup {
+  char_highlight_list = {
+    "IndentBlanklineIndent1",
+  },
+  show_end_of_line = true,
+}
diff --git a/nvim/.config/nvim/after/plugin/lspconfig.lua b/nvim/.config/nvim/after/plugin/lspconfig.lua
new file mode 100644
index 00000000..f5882699
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/lspconfig.lua
@@ -0,0 +1,53 @@
+--local has_lsp, lspconfig = pcall(require, "lspconfig")
+
+local function config(_config)
+  return vim.tbl_deep_extend("force", {
+      capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+  }, _config or {})
+end
+
+require'lspconfig'.ansiblels.setup(config())
+
+require'lspconfig'.bashls.setup(config())
+
+require'lspconfig'.cssls.setup(config())
+
+require'lspconfig'.html.setup(config())
+
+require'lspconfig'.intelephense.setup(config({
+  filetypes = { "php", "test", "theme" }
+}))
+
+require'lspconfig'.tsserver.setup(config())
+
+require'lspconfig'.vuels.setup(config())
+
+require'lspconfig'.yamlls.setup(config())
+
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
+  vim.lsp.diagnostic.on_publish_diagnostics, {
+    underline = true,
+    virtual_text = true,
+    signs = true,
+    update_in_insert = true,
+  }
+)
+
+local map = vim.api.nvim_set_keymap
+
+local options = {
+  noremap = true,
+  silent = true,
+}
+
+map('n', '<leader>vb', ':lua require"telescope.builtin".buffers()<CR>', options)
+map('n', '<leader>vca', ':lua vim.lsp.buf.code_action()<CR>', options)
+map('n', '<leader>vd', ':lua vim.lsp.buf.definition()<CR>', options)
+map('n', '<leader>vh', ':lua vim.lsp.buf.hover()<CR>', options)
+map('n', '<leader>vi', ':lua vim.lsp.buf.implementation()<CR>', options)
+map('n', '<leader>vn', ':lua vim.lsp.diagnostic.goto_next()<CR>', options)
+map('n', '<leader>vrn', ':lua vim.lsp.buf.rename()<CR>', options)
+map('n', '<leader>vrr', ':lua vim.lsp.buf.references()<CR>', options)
+map('n', '<leader>vs', ':lua require"telescope.builtin".live_grep()<CR>', options)
+map('n', '<leader>vsd', ':lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics()<CR>', options)
+map('n', '<leader>vsh', ':lua vim.lsp.buf.signature_help()<CR>', options)
diff --git a/nvim/.config/nvim/after/plugin/seiya.lua b/nvim/.config/nvim/after/plugin/seiya.lua
new file mode 100644
index 00000000..7e61d0f4
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/seiya.lua
@@ -0,0 +1,3 @@
+vim.g.seiya_auto_enable = 1
+
+vim.g.seiya_target_groups = { 'guibg' }
diff --git a/nvim/.config/nvim/after/plugin/telescope.lua b/nvim/.config/nvim/after/plugin/telescope.lua
new file mode 100644
index 00000000..ccbb77a1
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/telescope.lua
@@ -0,0 +1,18 @@
+local map = vim.api.nvim_set_keymap
+
+local options = {
+  noremap = true,
+  silent = true,
+}
+
+-- Builtin
+map('n', '<leader>fb', '<CMD>lua require("telescope.builtin").buffers()<CR>', options)
+map('n', '<leader>fc', '<CMD>lua require("telescope.builtin").lsp_code_actions()<CR>', options)
+map('n', '<leader>fd', '<CMD>lua require("telescope.builtin").lsp_workspace_diagnostics()<CR>', options)
+map('n', '<leader>fe', '<CMD>lua require("telescope.builtin").file_browser{ cwd = vim.fn.expand("%:p:h") }<CR>', options)
+map('n', '<leader>ff', '<CMD>lua require("telescope.builtin").find_files{ hidden = true }<CR>', options)
+map('n', '<leader>fg', '<CMD>lua require("telescope.builtin").git_files{}<CR>', options)
+map('n', '<leader>fh', '<CMD>lua require("telescope.builtin").help_tags()<CR>', options)
+map('n', '<leader>fl', '<CMD>lua require("telescope.builtin").live_grep()<CR>', options)
+map('n', '<leader>fr', '<CMD>lua require("telescope.builtin").registers()<CR>', options)
+map('n', '<leader>fr', '<CMD>lua require("telescope.builtin").registers()<CR>', options)
diff --git a/nvim/.config/nvim/after/plugin/treesitter.lua b/nvim/.config/nvim/after/plugin/treesitter.lua
new file mode 100644
index 00000000..a905e486
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/treesitter.lua
@@ -0,0 +1,9 @@
+require "nvim-treesitter.configs".setup {
+  context_commenting = {
+    enable = true
+  },
+  ensure_installed = "maintained",
+  highlight = {
+    enable = true,
+  }
+}
diff --git a/nvim/.config/nvim/after/plugin/vim-test.lua b/nvim/.config/nvim/after/plugin/vim-test.lua
new file mode 100644
index 00000000..366d9506
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/vim-test.lua
@@ -0,0 +1,13 @@
+local map = vim.api.nvim_set_keymap
+
+local options = {
+  silent = true
+}
+
+map('n', 't<C-f>', ':TestFile<CR>', options)
+map('n', 't<C-g>', ':TestVisit<CR>', options)
+map('n', 't<C-l>', ':TestLast<CR>', options)
+map('n', 't<C-n>', ':TestNearest<CR>', options)
+map('n', 't<C-s>', ':TestSuite<CR>', options)
+
+vim.g['test#strategy'] = "neovim"
diff --git a/nvim/.config/nvim/lua/opdavies/packer.lua b/nvim/.config/nvim/lua/opdavies/packer.lua
index 1537d5b1..bb930096 100644
--- a/nvim/.config/nvim/lua/opdavies/packer.lua
+++ b/nvim/.config/nvim/lua/opdavies/packer.lua
@@ -8,43 +8,18 @@ local function packer_startup()
     use 'christoomey/vim-tmux-navigator'
     use 'editorconfig/editorconfig-vim'
     use 'icatalina/vim-case-change'
-    use {
-      'lewis6991/gitsigns.nvim',
-      config = function()
-        require 'opdavies.plugins.gitsigns'.init()
-      end
-    }
-    use {
-      'lukas-reineke/indent-blankline.nvim',
-      config = function()
-        require 'opdavies.plugins.indent-blankline'.init()
-      end
-    }
+    use 'lewis6991/gitsigns.nvim'
+    use 'lukas-reineke/indent-blankline.nvim'
     use 'machakann/vim-highlightedyank'
-    use {
-      'miyakogi/seiya.vim',
-      config = function()
-        require 'opdavies.plugins.seiya'.init()
-      end
-    }
+    use 'miyakogi/seiya.vim'
     use 'norcalli/nvim-colorizer.lua'
     use 'nvim-lua/plenary.nvim'
     use 'nvim-lua/popup.nvim'
     use 'preservim/nerdcommenter'
     use 'sheerun/vim-polyglot'
     use 'tpope/vim-surround'
-    use {
-      'vim-test/vim-test',
-      config = function ()
-        require 'opdavies.plugins.vim-test'.init()
-      end
-    }
-    use {
-      'voldikss/vim-floaterm',
-      config = function()
-        require 'opdavies.plugins.floaterm'.init()
-      end
-    }
+    use 'vim-test/vim-test'
+    use 'voldikss/vim-floaterm'
     use { 'mg979/vim-visual-multi', branch = 'master' }
 
     -- Themes
@@ -53,9 +28,6 @@ local function packer_startup()
       requires = {
         'tjdevries/colorbuddy.vim'
       },
-      config = function()
-        require 'opdavies.plugins.colours'.init()
-      end
     }
 
     -- Navigation
@@ -66,9 +38,6 @@ local function packer_startup()
     use {
       'nvim-treesitter/nvim-treesitter',
       run = ':TSUpdate',
-      config = function()
-        require 'opdavies.plugins.treesitter'.init()
-      end
     }
 
     -- Completion
@@ -85,27 +54,14 @@ local function packer_startup()
           'tzachar/cmp-tabnine',
           run = './install.sh'
         }
-      },
-      config = {
-        require 'opdavies.plugins.completion'.init()
       }
     }
 
     -- LSP
-    use {
-      'neovim/nvim-lspconfig',
-      config = function()
-        require 'opdavies.plugins.lspconfig'.init()
-      end
-    }
+    use 'neovim/nvim-lspconfig'
 
     -- Telescope
-    use {
-      'nvim-telescope/telescope.nvim',
-      config = function ()
-        require 'opdavies.plugins.telescope'.init()
-      end
-    }
+    use 'nvim-telescope/telescope.nvim'
     use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
 
     use 'vimwiki/vimwiki'
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/colours.lua b/nvim/.config/nvim/lua/opdavies/plugins/colours.lua
deleted file mode 100644
index 3ec2c3c3..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/colours.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local function init()
-  require("colorbuddy").colorscheme("gruvbuddy")
-
-  require'colorizer'.setup()
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/completion.lua b/nvim/.config/nvim/lua/opdavies/plugins/completion.lua
deleted file mode 100644
index 9b09d9a1..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/completion.lua
+++ /dev/null
@@ -1,56 +0,0 @@
-local cmp = require "cmp"
-
-local function init()
-  cmp.setup {
-    snippet = {
-      expand = function(args)
-        require('luasnip').lsp_expand(args.body)
-      end
-    },
-
-    mapping = {
-      ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-      ["<C-f>"] = cmp.mapping.scroll_docs(4),
-      ["<C-e>"] = cmp.mapping.close(),
-      ["<c-y>"] = cmp.mapping.confirm {
-        behavior = cmp.ConfirmBehavior.Insert,
-        select = true,
-      },
-    },
-
-    sources = {
-      { name = "buffer", priority = 2, keyword_length = 5, max_item_count = 5 },
-      { name = "calc" },
-      { name = "path" },
-      { name = "spell" },
-      { name = "treesitter" },
-
-      -- Neovim
-      { name = "nvim_lsp", priority = 10 },
-      { name = "nvim_lua" },
-
-      -- Plugins
-      { name = "luasnip" },
-      { name = "cmp_tabnine" },
-    },
-
-    formatting = {
-      format = require("lspkind").cmp_format({with_text = true, menu = ({
-        buffer = "[buf]",
-        cmp_tabnine = "[tn]",
-        luasnip = "[snip]",
-        nvim_lsp = "[lsp]",
-        nvim_lua = "[lua]",
-        path = "[path]",
-      })}),
-    },
-
-    experimental = {
-      ghost_text = true
-    },
-  }
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/floaterm.lua b/nvim/.config/nvim/lua/opdavies/plugins/floaterm.lua
deleted file mode 100644
index b6284930..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/floaterm.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local function init()
-  local map = vim.api.nvim_set_keymap
-
-  local options = { noremap = true }
-
-  map('n', '<leader>ld', '<cmd>FloatermNew --autoclose=2 --height=0.9 --width=0.9 lazydocker<cr>', options)
-  map('n', '<leader>lg', '<cmd>FloatermNew --autoclose=2 --height=0.9 --width=0.9 lazygit<cr>', options)
-  map('n', '<leader>nn', '<cmd>FloatermNew --autoclose=2 --height=0.5 --width=0.5 nnn -Hde<cr>', options)
-  map('n', '<leader>tt', '<cmd>FloatermNew --autoclose=2 --height=0.9 --width=0.9 zsh<cr>', options)
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/gitsigns.lua b/nvim/.config/nvim/lua/opdavies/plugins/gitsigns.lua
deleted file mode 100644
index 332208c0..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/gitsigns.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-require "colorbuddy"
-
-local function init()
-  local c = require("colorbuddy.color").colors
-  local Group = require("colorbuddy.group").Group
-
-  Group.new("GitSignsAdd", c.green)
-  Group.new("GitSignsChange", c.yellow)
-  Group.new("GitSignsDelete", c.red)
-
-  require 'gitsigns'.setup {
-    linehl = false,
-    numhl = true,
-
-    signs = {
-      add = { hl = "GitSignsAdd", text = "│", numhl = "GitSignsAddNr" },
-      change = { hl = "GitSignsChange", text = "│", numhl = "GitSignsChangeNr" },
-      delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr" },
-      topdelete = { hl = "GitSignsDelete", text = "‾", numhl = "GitSignsDeleteNr" },
-      changedelete = { hl = "GitSignsDelete", text = "~", numhl = "GitSignsChangeNr" },
-    },
-
-    word_diff = false,
-  }
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/indent-blankline.lua b/nvim/.config/nvim/lua/opdavies/plugins/indent-blankline.lua
deleted file mode 100644
index 8177ffe4..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/indent-blankline.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local function init()
-  vim.opt.list = true
-  vim.opt.listchars = {
-    eol = "↴",
-  }
-
-  vim.cmd [[highlight IndentBlanklineIndent1 guifg=#555555 gui=nocombine]]
-
-  require "indent_blankline".setup {
-    char_highlight_list = {
-      "IndentBlanklineIndent1",
-    },
-    show_end_of_line = true,
-  }
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/lspconfig.lua b/nvim/.config/nvim/lua/opdavies/plugins/lspconfig.lua
deleted file mode 100644
index 3ac0df95..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/lspconfig.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local function lsp_setup()
-  --local has_lsp, lspconfig = pcall(require, "lspconfig")
-
-  local function config(_config)
-    return vim.tbl_deep_extend("force", {
-        capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
-    }, _config or {})
-  end
-
-  require'lspconfig'.ansiblels.setup(config())
-
-  require'lspconfig'.bashls.setup(config())
-
-  require'lspconfig'.cssls.setup(config())
-
-  require'lspconfig'.html.setup(config())
-
-  require'lspconfig'.intelephense.setup(config({
-    filetypes = { "php", "test", "theme" }
-  }))
-
-  require'lspconfig'.tsserver.setup(config())
-
-  require'lspconfig'.vuels.setup(config())
-
-  require'lspconfig'.yamlls.setup(config())
-
-  vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-    vim.lsp.diagnostic.on_publish_diagnostics, {
-      underline = true,
-      virtual_text = true,
-      signs = true,
-      update_in_insert = true,
-    }
-  )
-end
-
-local function key_mappings()
-  local map = vim.api.nvim_set_keymap
-
-  local options = {
-    noremap = true,
-    silent = true,
-  }
-
-  map('n', '<leader>vb', ':lua require"telescope.builtin".buffers()<CR>', options)
-  map('n', '<leader>vca', ':lua vim.lsp.buf.code_action()<CR>', options)
-  map('n', '<leader>vd', ':lua vim.lsp.buf.definition()<CR>', options)
-  map('n', '<leader>vh', ':lua vim.lsp.buf.hover()<CR>', options)
-  map('n', '<leader>vi', ':lua vim.lsp.buf.implementation()<CR>', options)
-  map('n', '<leader>vn', ':lua vim.lsp.diagnostic.goto_next()<CR>', options)
-  map('n', '<leader>vrn', ':lua vim.lsp.buf.rename()<CR>', options)
-  map('n', '<leader>vrr', ':lua vim.lsp.buf.references()<CR>', options)
-  map('n', '<leader>vs', ':lua require"telescope.builtin".live_grep()<CR>', options)
-  map('n', '<leader>vsd', ':lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics()<CR>', options)
-  map('n', '<leader>vsh', ':lua vim.lsp.buf.signature_help()<CR>', options)
-end
-
-local function init()
-  lsp_setup()
-  key_mappings()
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/seiya.lua b/nvim/.config/nvim/lua/opdavies/plugins/seiya.lua
deleted file mode 100644
index 35176465..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/seiya.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local function init()
-  vim.g.seiya_auto_enable = 1
-
-  vim.g.seiya_target_groups = { 'guibg' }
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/telescope.lua b/nvim/.config/nvim/lua/opdavies/plugins/telescope.lua
deleted file mode 100644
index 297b0efa..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/telescope.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local function init()
-  local map = vim.api.nvim_set_keymap
-
-  local options = {
-    noremap = true,
-    silent = true,
-  }
-
-  -- Builtin
-  map('n', '<leader>fb', '<CMD>lua require("telescope.builtin").buffers()<CR>', options)
-  map('n', '<leader>fc', '<CMD>lua require("telescope.builtin").lsp_code_actions()<CR>', options)
-  map('n', '<leader>fd', '<CMD>lua require("telescope.builtin").lsp_workspace_diagnostics()<CR>', options)
-  map('n', '<leader>fe', '<CMD>lua require("telescope.builtin").file_browser{ cwd = vim.fn.expand("%:p:h") }<CR>', options)
-  map('n', '<leader>ff', '<CMD>lua require("telescope.builtin").find_files{ hidden = true }<CR>', options)
-  map('n', '<leader>fg', '<CMD>lua require("telescope.builtin").git_files{}<CR>', options)
-  map('n', '<leader>fh', '<CMD>lua require("telescope.builtin").help_tags()<CR>', options)
-  map('n', '<leader>fl', '<CMD>lua require("telescope.builtin").live_grep()<CR>', options)
-  map('n', '<leader>fr', '<CMD>lua require("telescope.builtin").registers()<CR>', options)
-  map('n', '<leader>fr', '<CMD>lua require("telescope.builtin").registers()<CR>', options)
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/treesitter.lua b/nvim/.config/nvim/lua/opdavies/plugins/treesitter.lua
deleted file mode 100644
index ee053aa1..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/treesitter.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local function init()
-  require "nvim-treesitter.configs".setup {
-    context_commenting = {
-      enable = true
-    },
-    ensure_installed = "maintained",
-    highlight = {
-      enable = true,
-    }
-  }
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/lua/opdavies/plugins/vim-test.lua b/nvim/.config/nvim/lua/opdavies/plugins/vim-test.lua
deleted file mode 100644
index 82deed10..00000000
--- a/nvim/.config/nvim/lua/opdavies/plugins/vim-test.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local function init()
-  local map = vim.api.nvim_set_keymap
-
-  local options = {
-    silent = true
-  }
-
-  map('n', 't<C-f>', ':TestFile<CR>', options)
-  map('n', 't<C-g>', ':TestVisit<CR>', options)
-  map('n', 't<C-l>', ':TestLast<CR>', options)
-  map('n', 't<C-n>', ':TestNearest<CR>', options)
-  map('n', 't<C-s>', ':TestSuite<CR>', options)
-
-  vim.g['test#strategy'] = "neovim"
-end
-
-return {
-  init = init
-}
diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
index 73f60175..f767d2d5 100644
--- a/nvim/.config/nvim/plugin/packer_compiled.lua
+++ b/nvim/.config/nvim/plugin/packer_compiled.lua
@@ -110,13 +110,11 @@ _G.packer_plugins = {
     url = "https://github.com/editorconfig/editorconfig-vim"
   },
   ["gitsigns.nvim"] = {
-    config = { "\27LJ\2\2F\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\30opdavies.plugins.gitsigns\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
     url = "https://github.com/lewis6991/gitsigns.nvim"
   },
   ["gruvbuddy.nvim"] = {
-    config = { "\27LJ\2\2E\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\29opdavies.plugins.colours\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/gruvbuddy.nvim",
     url = "https://github.com/tjdevries/gruvbuddy.nvim"
@@ -127,7 +125,6 @@ _G.packer_plugins = {
     url = "https://github.com/ThePrimeagen/harpoon"
   },
   ["indent-blankline.nvim"] = {
-    config = { "\27LJ\2\2N\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit&opdavies.plugins.indent-blankline\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
     url = "https://github.com/lukas-reineke/indent-blankline.nvim"
@@ -143,7 +140,6 @@ _G.packer_plugins = {
     url = "https://github.com/preservim/nerdcommenter"
   },
   ["nvim-cmp"] = {
-    config = {},
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
@@ -154,13 +150,11 @@ _G.packer_plugins = {
     url = "https://github.com/norcalli/nvim-colorizer.lua"
   },
   ["nvim-lspconfig"] = {
-    config = { "\27LJ\2\2G\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\31opdavies.plugins.lspconfig\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
     url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-treesitter"] = {
-    config = { "\27LJ\2\2H\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit opdavies.plugins.treesitter\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
     url = "https://github.com/nvim-treesitter/nvim-treesitter"
@@ -191,7 +185,6 @@ _G.packer_plugins = {
     url = "https://github.com/cakebaker/scss-syntax.vim"
   },
   ["seiya.vim"] = {
-    config = { "\27LJ\2\2C\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\27opdavies.plugins.seiya\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/seiya.vim",
     url = "https://github.com/miyakogi/seiya.vim"
@@ -202,7 +195,6 @@ _G.packer_plugins = {
     url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
   },
   ["telescope.nvim"] = {
-    config = { "\27LJ\2\2G\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\31opdavies.plugins.telescope\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
@@ -213,7 +205,6 @@ _G.packer_plugins = {
     url = "https://github.com/icatalina/vim-case-change"
   },
   ["vim-floaterm"] = {
-    config = { "\27LJ\2\2F\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\30opdavies.plugins.floaterm\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/vim-floaterm",
     url = "https://github.com/voldikss/vim-floaterm"
@@ -239,7 +230,6 @@ _G.packer_plugins = {
     url = "https://github.com/tpope/vim-surround"
   },
   ["vim-test"] = {
-    config = { "\27LJ\2\2F\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\30opdavies.plugins.vim-test\frequire\0" },
     loaded = true,
     path = "/home/opdavies/.local/share/nvim/site/pack/packer/start/vim-test",
     url = "https://github.com/vim-test/vim-test"
@@ -262,45 +252,6 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: telescope.nvim
-time([[Config for telescope.nvim]], true)
-try_loadstring("\27LJ\2\2G\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\31opdavies.plugins.telescope\frequire\0", "config", "telescope.nvim")
-time([[Config for telescope.nvim]], false)
--- Config for: vim-floaterm
-time([[Config for vim-floaterm]], true)
-try_loadstring("\27LJ\2\2F\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\30opdavies.plugins.floaterm\frequire\0", "config", "vim-floaterm")
-time([[Config for vim-floaterm]], false)
--- Config for: indent-blankline.nvim
-time([[Config for indent-blankline.nvim]], true)
-try_loadstring("\27LJ\2\2N\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit&opdavies.plugins.indent-blankline\frequire\0", "config", "indent-blankline.nvim")
-time([[Config for indent-blankline.nvim]], false)
--- Config for: nvim-treesitter
-time([[Config for nvim-treesitter]], true)
-try_loadstring("\27LJ\2\2H\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit opdavies.plugins.treesitter\frequire\0", "config", "nvim-treesitter")
-time([[Config for nvim-treesitter]], false)
--- Config for: gruvbuddy.nvim
-time([[Config for gruvbuddy.nvim]], true)
-try_loadstring("\27LJ\2\2E\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\29opdavies.plugins.colours\frequire\0", "config", "gruvbuddy.nvim")
-time([[Config for gruvbuddy.nvim]], false)
--- Config for: nvim-cmp
-time([[Config for nvim-cmp]], true)
-time([[Config for nvim-cmp]], false)
--- Config for: gitsigns.nvim
-time([[Config for gitsigns.nvim]], true)
-try_loadstring("\27LJ\2\2F\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\30opdavies.plugins.gitsigns\frequire\0", "config", "gitsigns.nvim")
-time([[Config for gitsigns.nvim]], false)
--- Config for: seiya.vim
-time([[Config for seiya.vim]], true)
-try_loadstring("\27LJ\2\2C\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\27opdavies.plugins.seiya\frequire\0", "config", "seiya.vim")
-time([[Config for seiya.vim]], false)
--- Config for: vim-test
-time([[Config for vim-test]], true)
-try_loadstring("\27LJ\2\2F\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\30opdavies.plugins.vim-test\frequire\0", "config", "vim-test")
-time([[Config for vim-test]], false)
--- Config for: nvim-lspconfig
-time([[Config for nvim-lspconfig]], true)
-try_loadstring("\27LJ\2\2G\0\0\2\0\3\0\0066\0\0\0'\1\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\tinit\31opdavies.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig")
-time([[Config for nvim-lspconfig]], false)
 if should_profile then save_profiles() end
 
 end)