Merge branch 'master' of github.com:rajvatsal/kickstart.nvim
This commit is contained in:
		
						commit
						a989f23fb7
					
				
							
								
								
									
										4
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										4
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -83,7 +83,7 @@ require('lazy').setup({
 | 
				
			||||||
    'neovim/nvim-lspconfig',
 | 
					    'neovim/nvim-lspconfig',
 | 
				
			||||||
    dependencies = {
 | 
					    dependencies = {
 | 
				
			||||||
      -- Automatically install LSPs to stdpath for neovim
 | 
					      -- Automatically install LSPs to stdpath for neovim
 | 
				
			||||||
      'williamboman/mason.nvim',
 | 
					      { 'williamboman/mason.nvim', config = true },
 | 
				
			||||||
      'williamboman/mason-lspconfig.nvim',
 | 
					      'williamboman/mason-lspconfig.nvim',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Useful status updates for LSP
 | 
					      -- Useful status updates for LSP
 | 
				
			||||||
| 
						 | 
					@ -631,7 +631,7 @@ cmp.setup {
 | 
				
			||||||
  mapping = cmp.mapping.preset.insert {
 | 
					  mapping = cmp.mapping.preset.insert {
 | 
				
			||||||
    ['<C-n>'] = cmp.mapping.select_next_item(),
 | 
					    ['<C-n>'] = cmp.mapping.select_next_item(),
 | 
				
			||||||
    ['<C-p>'] = cmp.mapping.select_prev_item(),
 | 
					    ['<C-p>'] = cmp.mapping.select_prev_item(),
 | 
				
			||||||
    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
 | 
					    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
 | 
				
			||||||
    ['<C-f>'] = cmp.mapping.scroll_docs(4),
 | 
					    ['<C-f>'] = cmp.mapping.scroll_docs(4),
 | 
				
			||||||
    ['<C-Space>'] = cmp.mapping.complete {},
 | 
					    ['<C-Space>'] = cmp.mapping.complete {},
 | 
				
			||||||
    ['<CR>'] = cmp.mapping.confirm {
 | 
					    ['<CR>'] = cmp.mapping.confirm {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue