remove neotree from filetree since it's included now
This commit is contained in:
		
							parent
							
								
									f61c78a48f
								
							
						
					
					
						commit
						41b2a96064
					
				
							
								
								
									
										18
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										18
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -714,11 +714,11 @@ require('lazy').setup({
 | 
				
			||||||
              },
 | 
					              },
 | 
				
			||||||
              -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
 | 
					              -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
 | 
				
			||||||
              diagnostics = { disable = { 'missing-fields' } },
 | 
					              diagnostics = { disable = { 'missing-fields' } },
 | 
				
			||||||
                globals = { 'vim' },
 | 
					              globals = { 'vim' },
 | 
				
			||||||
              },
 | 
					 | 
				
			||||||
              hint = { enable = true },
 | 
					 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
 | 
					            hint = { enable = true },
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        ols = {},
 | 
					        ols = {},
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -741,6 +741,10 @@ require('lazy').setup({
 | 
				
			||||||
      require('mason-lspconfig').setup {
 | 
					      require('mason-lspconfig').setup {
 | 
				
			||||||
        handlers = {
 | 
					        handlers = {
 | 
				
			||||||
          function(server_name)
 | 
					          function(server_name)
 | 
				
			||||||
 | 
					            -- temporary solution based on https://github.com/neovim/nvim-lspconfig/pull/3232#issuecomment-2331025714 until things work correctly
 | 
				
			||||||
 | 
					            if server_name == 'tsserver' then
 | 
				
			||||||
 | 
					              server_name = 'ts_ls'
 | 
				
			||||||
 | 
					            end
 | 
				
			||||||
            local server = servers[server_name] or {}
 | 
					            local server = servers[server_name] or {}
 | 
				
			||||||
            -- This handles overriding only values explicitly passed
 | 
					            -- This handles overriding only values explicitly passed
 | 
				
			||||||
            -- by the server configuration above. Useful when disabling
 | 
					            -- by the server configuration above. Useful when disabling
 | 
				
			||||||
| 
						 | 
					@ -822,10 +826,10 @@ require('lazy').setup({
 | 
				
			||||||
          --    See the README about individual language/framework/plugin snippets:
 | 
					          --    See the README about individual language/framework/plugin snippets:
 | 
				
			||||||
          --    https://github.com/rafamadriz/friendly-snippets
 | 
					          --    https://github.com/rafamadriz/friendly-snippets
 | 
				
			||||||
          {
 | 
					          {
 | 
				
			||||||
             'rafamadriz/friendly-snippets',
 | 
					            'rafamadriz/friendly-snippets',
 | 
				
			||||||
             config = function()
 | 
					            config = function()
 | 
				
			||||||
               require('luasnip.loaders.from_vscode').lazy_load()
 | 
					              require('luasnip.loaders.from_vscode').lazy_load()
 | 
				
			||||||
             end,
 | 
					            end,
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,15 +0,0 @@
 | 
				
			||||||
-- Unless you are still migrating, remove the deprecated commands from v1.x
 | 
					 | 
				
			||||||
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
return {
 | 
					 | 
				
			||||||
  "nvim-neo-tree/neo-tree.nvim",
 | 
					 | 
				
			||||||
  version = "*",
 | 
					 | 
				
			||||||
  dependencies = {
 | 
					 | 
				
			||||||
    "nvim-lua/plenary.nvim",
 | 
					 | 
				
			||||||
    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
 | 
					 | 
				
			||||||
    "MunifTanjim/nui.nvim",
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
  config = function()
 | 
					 | 
				
			||||||
    require('neo-tree').setup {}
 | 
					 | 
				
			||||||
  end,
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
		Loading…
	
		Reference in New Issue