6 files changed, 63 insertions, 25 deletions
diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua
new file mode 100644
index 0000000..9e7a131
--- /dev/null
+++ b/lua/user/autocommands.lua
@@ -0,0 +1,34 @@
+-- autocmd! remove all autocommands, if entered under a group it will clear that group
+vim.cmd [[
+  augroup _general_settings
+    autocmd!
+    autocmd FileType qf,help,man,lspinfo nnoremap <silent> <buffer> q :close<CR> 
+    autocmd TextYankPost * silent!lua require('vim.highlight').on_yank({higroup = 'Search', timeout = 200}) 
+    autocmd BufWinEnter * :set formatoptions-=cro
+    autocmd FileType qf set nobuflisted
+  augroup end
+
+  augroup _git
+    autocmd!
+    autocmd FileType gitcommit setlocal wrap
+    autocmd FileType gitcommit setlocal spell
+  augroup end
+
+  augroup _markdown
+    autocmd!
+    autocmd FileType markdown setlocal wrap
+    autocmd FileType markdown setlocal spell
+  augroup end
+
+  augroup _auto_resize
+    autocmd!
+    autocmd VimResized * tabdo wincmd = 
+  augroup end
+
+  augroup _alpha
+    autocmd!
+    autocmd User AlphaReady set showtabline=0 | autocmd BufUnload <buffer> set showtabline=2
+  augroup end
+
+]]
+
diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua
index 0ba1fc7..b16499a 100644
--- a/lua/user/cmp.lua
+++ b/lua/user/cmp.lua
@@ -121,8 +121,10 @@ cmp.setup {
     behavior = cmp.ConfirmBehavior.Replace,
     select = false,
   },
-  documentation = {
-    border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
+  window = {
+    documentation = {
+      border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
+    },
   },
   experimental = {
     ghost_text = false,
diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings/jsonls.lua
index be362c9..f4e4abb 100644
--- a/lua/user/lsp/settings/jsonls.lua
+++ b/lua/user/lsp/settings/jsonls.lua
@@ -181,3 +181,15 @@ local opts = {
 }
 
 return opts
+
+local function extend(tab1, tab2)
+  if tab2 == nil then
+    return tab2
+  end
+  for _, value in ipairs(tab2) do
+    table.insert(tab1, value)
+  end
+  return tab1
+end
+
+local extended_schemas = extend(schemas, default_schemas)
diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua
index c64c5e1..e23b560 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/nvim-tree.lua
@@ -42,7 +42,6 @@ nvim_tree.setup {
     "dashboard",
     "alpha",
   },
-  auto_close = true,
   open_on_tab = false,
   hijack_cursor = false,
   update_cwd = true,
@@ -94,13 +93,17 @@ nvim_tree.setup {
     number = false,
     relativenumber = false,
   },
-<<<<<<< HEAD
   trash = {
     cmd = "trash",
     require_confirm = true,
   },
-=======
->>>>>>> vgg
+  actions = {
+    open_file = {
+      quit_on_open = false,
+      window_picker = {
+        enable = false,
+      },
+    },
   quit_on_open = 0,
   git_hl = 1,
   disable_window_picker = 0,
diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua
index db78f70..f709099 100644
--- a/lua/user/treesitter.lua
+++ b/lua/user/treesitter.lua
@@ -1,21 +1,8 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 local configs = require("nvim-treesitter.configs")
 configs.setup {
-  ensure_installed = "maintained",
-  sync_install = false, 
+  ensure_installed = "all", -- "all" (parsers with maintainers), or a list of languages
+  sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
   ignore_install = { "" }, -- List of parsers to ignore installing
   autopairs = {
     enable = true,
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 0056e5a..35da924 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -144,7 +144,7 @@ local mappings = {
     i = { "<cmd>LspInfo<cr>", "Info" },
     I = { "<cmd>LspInstallInfo<cr>", "Installer Info" },
     j = {
-      "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>",
+      "<cmd>lua vim.diagnostic.goto_next()<CR>",
       "Next Diagnostic",
     },
     k = {
@@ -152,7 +152,7 @@ local mappings = {
       "Prev Diagnostic",
     },
     l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
-    q = { "<cmd>lua vim.lsp.diagnostic.set_loclist()<cr>", "Quickfix" },
+    q = { "<cmd>lua vim.diagnostic.setloclist()<cr>", "Quickfix" },
     r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
     s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
     S = {
@@ -184,6 +184,8 @@ local mappings = {
   },
 }
 
+which_key.setup(setup)
+which_key.register(mappings, opts)
 local vopts = {
   mode = "v", -- VISUAL mode
   prefix = "<leader>",
@@ -196,6 +198,4 @@ local vmappings = {
   ["/"] = { "<ESC><CMD>lua require(\"Comment.api\").toggle_linewise_op(vim.fn.visualmode())<CR>", "Comment" },
 }
 
-which_key.setup(setup)
-which_key.register(mappings, opts)
 which_key.register(vmappings, vopts)