Merge branch 'nvim-lua:master' into master
This commit is contained in:
		
						commit
						3fa161d0a5
					
				
							
								
								
									
										48
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										48
									
								
								init.lua
								
								
								
								
							| 
						 | 
				
			
			@ -111,9 +111,12 @@ vim.opt.mouse = 'a'
 | 
			
		|||
vim.opt.showmode = false
 | 
			
		||||
 | 
			
		||||
-- Sync clipboard between OS and Neovim.
 | 
			
		||||
--  Schedule the setting after `UiEnter` because it can increase startup-time.
 | 
			
		||||
--  Remove this option if you want your OS clipboard to remain independent.
 | 
			
		||||
--  See `:help 'clipboard'`
 | 
			
		||||
vim.opt.clipboard = 'unnamedplus'
 | 
			
		||||
vim.schedule(function()
 | 
			
		||||
  vim.opt.clipboard = 'unnamedplus'
 | 
			
		||||
end)
 | 
			
		||||
 | 
			
		||||
-- Enable break indent
 | 
			
		||||
vim.opt.breakindent = true
 | 
			
		||||
| 
						 | 
				
			
			@ -157,8 +160,8 @@ vim.opt.scrolloff = 10
 | 
			
		|||
-- [[ Basic Keymaps ]]
 | 
			
		||||
--  See `:help vim.keymap.set()`
 | 
			
		||||
 | 
			
		||||
-- Set highlight on search, but clear on pressing <Esc> in normal mode
 | 
			
		||||
vim.opt.hlsearch = true
 | 
			
		||||
-- Clear highlights on search when pressing <Esc> in normal mode
 | 
			
		||||
--  See `:help hlsearch`
 | 
			
		||||
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 | 
			
		||||
 | 
			
		||||
-- Diagnostic keymaps
 | 
			
		||||
| 
						 | 
				
			
			@ -399,7 +402,22 @@ require('lazy').setup({
 | 
			
		|||
    end,
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  { -- LSP Configuration & Plugins
 | 
			
		||||
  -- LSP Plugins
 | 
			
		||||
  {
 | 
			
		||||
    -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
 | 
			
		||||
    -- used for completion, annotations and signatures of Neovim apis
 | 
			
		||||
    'folke/lazydev.nvim',
 | 
			
		||||
    ft = 'lua',
 | 
			
		||||
    opts = {
 | 
			
		||||
      library = {
 | 
			
		||||
        -- Load luvit types when the `vim.uv` word is found
 | 
			
		||||
        { path = 'luvit-meta/library', words = { 'vim%.uv' } },
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  { 'Bilal2453/luvit-meta', lazy = true },
 | 
			
		||||
  {
 | 
			
		||||
    -- Main LSP Configuration
 | 
			
		||||
    'neovim/nvim-lspconfig',
 | 
			
		||||
    dependencies = {
 | 
			
		||||
      -- Automatically install LSPs and related tools to stdpath for Neovim
 | 
			
		||||
| 
						 | 
				
			
			@ -411,19 +429,8 @@ require('lazy').setup({
 | 
			
		|||
      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
 | 
			
		||||
      { 'j-hui/fidget.nvim', opts = {} },
 | 
			
		||||
 | 
			
		||||
      -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
 | 
			
		||||
      -- used for completion, annotations and signatures of Neovim apis
 | 
			
		||||
      {
 | 
			
		||||
        'folke/lazydev.nvim',
 | 
			
		||||
        ft = 'lua',
 | 
			
		||||
        opts = {
 | 
			
		||||
          library = {
 | 
			
		||||
            -- Load luvit types when the `vim.uv` word is found
 | 
			
		||||
            { path = 'luvit-meta/library', words = { 'vim%.uv' } },
 | 
			
		||||
          },
 | 
			
		||||
        },
 | 
			
		||||
      },
 | 
			
		||||
      { 'Bilal2453/luvit-meta', lazy = true },
 | 
			
		||||
      -- Allows extra capabilities provided by nvim-cmp
 | 
			
		||||
      'hrsh7th/cmp-nvim-lsp',
 | 
			
		||||
    },
 | 
			
		||||
    config = function()
 | 
			
		||||
      -- Brief aside: **What is LSP?**
 | 
			
		||||
| 
						 | 
				
			
			@ -653,9 +660,8 @@ require('lazy').setup({
 | 
			
		|||
        -- Conform can also run multiple formatters sequentially
 | 
			
		||||
        -- python = { "isort", "black" },
 | 
			
		||||
        --
 | 
			
		||||
        -- You can use a sub-list to tell conform to run *until* a formatter
 | 
			
		||||
        -- is found.
 | 
			
		||||
        -- javascript = { { "prettierd", "prettier" } },
 | 
			
		||||
        -- You can use 'stop_after_first' to run the first available formatter from the list
 | 
			
		||||
        -- javascript = { "prettierd", "prettier", stop_after_first = true },
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
| 
						 | 
				
			
			@ -852,8 +858,6 @@ require('lazy').setup({
 | 
			
		|||
    config = function(_, opts)
 | 
			
		||||
      -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
 | 
			
		||||
 | 
			
		||||
      -- Prefer git instead of curl in order to improve connectivity in some environments
 | 
			
		||||
      require('nvim-treesitter.install').prefer_git = true
 | 
			
		||||
      ---@diagnostic disable-next-line: missing-fields
 | 
			
		||||
      require('nvim-treesitter.configs').setup(opts)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue