beep boop

4 files changed, 16 insertions, 18 deletions

diff --git a/.config/nvim/lua/fzf.lua b/.config/nvim/lua/fzf.lua
index 8e12047..30ad864 100644
--- a/.config/nvim/lua/fzf.lua
+++ b/.config/nvim/lua/fzf.lua
@@ -1,10 +1,11 @@
 local fzf = require('fzf-lua')
 vim.keymap.set('n', '<c-b>', fzf.buffers, {})
-vim.keymap.set('n', '<c-m>', fzf.marks, {})
+vim.keymap.set('n', '<c-t>', fzf.marks, {})
 vim.keymap.set('n', '<leader>fb', fzf.lines, {})
 vim.keymap.set('n', '<leader>ff', fzf.files, {})
 vim.keymap.set('n', '<leader>fg', fzf.live_grep, {})
 vim.keymap.set('n', '<leader>fw', fzf.grep_cword, {})
+vim.keymap.set('n', 'fw', fzf.grep_cword, {})
 vim.keymap.set('n', '<leader>fW', fzf.grep_cWORD, {})
 vim.keymap.set('v', '<leader>ff', fzf.grep_visual, {})
 vim.keymap.set('v', '<c-f>', fzf.grep_visual, {})
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 6db6bff..467214a 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -4,7 +4,7 @@ vim.keymap.set('n', '<c-[>', vim.diagnostic.goto_prev, opts)
 vim.keymap.set('n', '<c-]>', vim.diagnostic.goto_next, opts)
 -- vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
-vim.lsp.set_log_level("info")
+-- vim.lsp.set_log_level("debug")
 
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
@@ -188,22 +188,6 @@ if not configs.jails then
 end
 lspconfig.jails.setup({})
 vim.filetype.add({ extension = { jai = "jai", } })
--- local lsp = require 'lspconfig'
--- local configs = require 'lspconfig.configs'
-
--- if not configs.jai_lsp then
--- configs.jai_lsp = {
--- default_config = {
--- cmd = { 'jails' },
--- filetypes = { 'jai' },
--- }
--- }
--- end
-
--- lspconfig.jai_lsp.setup({
--- on_attach = on_attach,
--- capabilities = capabilities,
--- })
 
 lspconfig.ols.setup({
   on_attach = on_attach,
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index f1ce125..88dcfcb 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -182,4 +182,15 @@ return require('lazy').setup({
     opts = {
     },
   },
+
+  {
+    "VonHeikemen/lsp-zero.nvim",
+    branch = "v2.x",
+    config = false,
+    init = function()
+      -- Disable automatic setup, we are doing it manually
+      vim.g.lsp_zero_extend_cmp = 0
+      vim.g.lsp_zero_extend_lspconfig = 0
+    end,
+  },
 })
diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua
index ce17c70..6ad066d 100644
--- a/.config/nvim/lua/treesitter.lua
+++ b/.config/nvim/lua/treesitter.lua
@@ -23,6 +23,8 @@ require 'nvim-treesitter.configs'.setup {
     -- [options]
   },
 }
+
+
 local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
 parser_config.jai = {
   install_info = {