Add null ls and more config

5 files changed, 32 insertions, 5 deletions

diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua
index 380b26a..d80178f 100644
--- a/after/plugin/harpoon.lua
+++ b/after/plugin/harpoon.lua
@@ -7,6 +7,9 @@ harpoon.setup {}
 
 vim.keymap.set('n', '<leader>ss', require("harpoon.ui").toggle_quick_menu, {noremap = true, silent = true, expr = false})
 vim.keymap.set('n', '<leader>sa', require("harpoon.mark").add_file, {noremap = true, silent = true, expr = false})
+vim.keymap.set('n', '<leader><leader>1', function () require("harpoon.term").gotoTerminal(1) end, {noremap = true, silent = true, expr = false})
+vim.keymap.set('n', '<leader><leader>2', function () require("harpoon.term").gotoTerminal(2) end, {noremap = true, silent = true, expr = false})
+vim.keymap.set('n', '<leader><leader>3', function () require("harpoon.term").gotoTerminal(3) end, {noremap = true, silent = true, expr = false})
 
 for i = 1, 5 do
     vim.keymap.set(
diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua
new file mode 100644
index 0000000..5ee463c
--- /dev/null
+++ b/after/plugin/null-ls.lua
@@ -0,0 +1,15 @@
+local ok, null_ls = pcall(require, "null-ls")
+
+if not ok then
+    return
+end
+
+null_ls.setup({
+    sources = {
+        null_ls.builtins.formatting.stylua,
+        null_ls.builtins.completion.spell,
+        null_ls.builtins.diagnostics.eslint,
+        null_ls.builtins.diagnostics.phpstan,
+        null_ls.builtins.hover.dictionary,
+    }
+})
diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua
index 1e6e196..66eeb53 100644
--- a/lua/alpha/plugins.lua
+++ b/lua/alpha/plugins.lua
@@ -84,6 +84,8 @@ return require('packer').startup(function(use)
         }
     }
 
+    use "jose-elias-alvarez/null-ls.nvim"
+
     use "windwp/nvim-autopairs"
 
     use "tjdevries/colorbuddy.nvim"
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index aa9e2a0..71d6aed 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -165,6 +165,11 @@ _G.packer_plugins = {
     path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/lualine.nvim",
     url = "https://github.com/nvim-lualine/lualine.nvim"
   },
+  ["null-ls.nvim"] = {
+    loaded = true,
+    path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
+    url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
+  },
   ["nvim-autopairs"] = {
     loaded = true,
     path = "/home/adalessa/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
@@ -433,6 +438,10 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
+-- Config for: git-worktree.nvim
+time([[Config for git-worktree.nvim]], true)
+try_loadstring("\27LJ\2\n>\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\17git-worktree\frequire\0", "config", "git-worktree.nvim")
+time([[Config for git-worktree.nvim]], false)
 -- Config for: nvim-projectconfig
 time([[Config for nvim-projectconfig]], true)
 try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\23nvim-projectconfig\frequire\0", "config", "nvim-projectconfig")
@@ -441,15 +450,11 @@ time([[Config for nvim-projectconfig]], false)
 time([[Config for nvim-colorizer.lua]], true)
 try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua")
 time([[Config for nvim-colorizer.lua]], false)
--- Config for: git-worktree.nvim
-time([[Config for git-worktree.nvim]], true)
-try_loadstring("\27LJ\2\n>\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\17git-worktree\frequire\0", "config", "git-worktree.nvim")
-time([[Config for git-worktree.nvim]], false)
 
 -- Command lazy-loads
 time([[Defining lazy-load commands]], true)
-pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file VimwikiIndex lua require("packer.load")({'vimwiki'}, { cmd = "VimwikiIndex", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Http lua require("packer.load")({'vim-http'}, { cmd = "Http", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
+pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file VimwikiIndex lua require("packer.load")({'vimwiki'}, { cmd = "VimwikiIndex", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 time([[Defining lazy-load commands]], false)
 
 vim.cmd [[augroup packer_load_aucmds]]
diff --git a/plugin/test.vim b/plugin/test.vim
index a21f4cb..ef34268 100644
--- a/plugin/test.vim
+++ b/plugin/test.vim
@@ -5,3 +5,5 @@ nmap <silent> t<C-l> :TestLast<CR>
 nmap <silent> t<C-g> :TestVisit<CR>
 
 let test#php#pest#executable = 'sail test'
+let test#strategy = 'harpoon'
+let g:test#preserve_screen = 1