Merge branch 'master' of https://git.freiewildbahn.de/oli/nvim

lua/setup/my_command_center.lua

@@ -6,8 +6,8 @@ local silent_noremap = { noremap = true, silent = true }
 
 project_files = function()
   local opts = {} -- define here if you want to define something
-  local ok = pcall(require"telescope.builtin".git_files, opts)
+  local ok = pcall(require "telescope.builtin".git_files, opts)
-  if not ok then require"telescope.builtin".find_files(opts) end
+  if not ok then require "telescope.builtin".find_files(opts) end
 end
 
 command_center.add({
@@ -230,8 +230,8 @@ command_center.add({
     description = 'Symbols outline',
     cmd = '<CMD>AerialToggle<CR>',
     keybindings = {
-        { 'n', '<leader>s', silent_noremap },
+      { 'n', '<leader>s', silent_noremap },
-        { 'n', '<Space>s', silent_noremap },
+      { 'n', '<Space>s', silent_noremap },
     },
   },
   {
@@ -243,7 +243,3 @@ command_center.add({
     cmd = '<CMD>set guifont=JetBrainsMonoNL\\ NF:h9<CR>',
   },
 })
-
-
-
-

lua/setup/my_lspconfig.lua

@@ -20,7 +20,7 @@ capabilities.textDocument.completion.completionItem.resolveSupport = {
     'additionalTextEdits',
   },
 }
-capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
 OpenDiagFloat = function()
   for _, winid in pairs(vim.api.nvim_tabpage_list_wins(0)) do

lua/setup/neo-tree.lua

@@ -18,6 +18,7 @@ require('neo-tree').setup({
       -- you can also specify border here, if you want a different setting from
       -- the global popup_border_style.
     },
+    enable_git_status = false,
     -- Mappings for tree window. See `:h nep-tree-mappings` for a list of built-in commands.
     -- You can also create your own commands by providing a function instead of a string.
     mappings = {

lua/setup/nvim-tree.lua

@@ -1,27 +1,7 @@
-require('nvim-tree').setup({
+-- disable netrw at the very start of your init.lua (strongly advised)
-  auto_close = true,
+vim.g.loaded = 1
-  update_cwd = true,
+vim.g.loaded_netrwPlugin = 1
-  update_to_buf_dir = {
+
-    -- enable the feature
+-- empty setup using defaults
-    enable = true,
+require('nvim-tree').setup()
-    -- allow to open the tree if it was previously closed
+vim.keymap.set('n', '\\', '<cmd>NvimTreeToggle<CR>')
-    auto_open = false,
-  },
-  update_focused_file = {
-    enable = true,
-    update_cwd = false,
-    ignore_list = {},
-  },
-  diagnostics = {
-    enable = true,
-    icons = {
-      hint = '',
-      info = '',
-      warning = '',
-      error = '',
-    },
-  },
-})
-vim.keymap.set('n', '<leader>tt', '<cmd>NvimTreeToggle<CR>')
-vim.g.nvim_tree_highlight_opened_files = 1
-vim.g.nvim_tree_respect_buf_cwd = 1