Merge pull request #310 from mech-a/master
This commit is contained in:
		
						commit
						4d7e4b8a1d
					
				
							
								
								
									
										24
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										24
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -84,7 +84,7 @@ require('lazy').setup({
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Useful status updates for LSP
 | 
					      -- Useful status updates for LSP
 | 
				
			||||||
      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
 | 
					      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
 | 
				
			||||||
      { 'j-hui/fidget.nvim',       opts = {} },
 | 
					      { 'j-hui/fidget.nvim', opts = {} },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Additional lua configuration, makes nvim stuff amazing!
 | 
					      -- Additional lua configuration, makes nvim stuff amazing!
 | 
				
			||||||
      'folke/neodev.nvim',
 | 
					      'folke/neodev.nvim',
 | 
				
			||||||
| 
						 | 
					@ -94,11 +94,11 @@ require('lazy').setup({
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    -- Autocompletion
 | 
					    -- Autocompletion
 | 
				
			||||||
    'hrsh7th/nvim-cmp',
 | 
					    'hrsh7th/nvim-cmp',
 | 
				
			||||||
    dependencies = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip',"rafamadriz/friendly-snippets", },
 | 
					    dependencies = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip', 'rafamadriz/friendly-snippets' },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Useful plugin to show you pending keybinds.
 | 
					  -- Useful plugin to show you pending keybinds.
 | 
				
			||||||
  { 'folke/which-key.nvim',          opts = {} },
 | 
					  { 'folke/which-key.nvim', opts = {} },
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    -- Adds git releated signs to the gutter, as well as utilities for managing changes
 | 
					    -- Adds git releated signs to the gutter, as well as utilities for managing changes
 | 
				
			||||||
    'lewis6991/gitsigns.nvim',
 | 
					    'lewis6991/gitsigns.nvim',
 | 
				
			||||||
| 
						 | 
					@ -115,7 +115,7 @@ require('lazy').setup({
 | 
				
			||||||
        vim.keymap.set('n', '[c', require('gitsigns').prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' })
 | 
					        vim.keymap.set('n', '[c', require('gitsigns').prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' })
 | 
				
			||||||
        vim.keymap.set('n', ']c', require('gitsigns').next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' })
 | 
					        vim.keymap.set('n', ']c', require('gitsigns').next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' })
 | 
				
			||||||
        vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
 | 
					        vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
 | 
				
			||||||
      end
 | 
					      end,
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -154,10 +154,10 @@ require('lazy').setup({
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- "gc" to comment visual regions/lines
 | 
					  -- "gc" to comment visual regions/lines
 | 
				
			||||||
  { 'numToStr/Comment.nvim',         opts = {} },
 | 
					  { 'numToStr/Comment.nvim', opts = {} },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Fuzzy Finder (files, lsp, etc)
 | 
					  -- Fuzzy Finder (files, lsp, etc)
 | 
				
			||||||
  { 'nvim-telescope/telescope.nvim', branch  = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } },
 | 
					  { 'nvim-telescope/telescope.nvim', branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Fuzzy Finder Algorithm which requires local dependencies to be built.
 | 
					  -- Fuzzy Finder Algorithm which requires local dependencies to be built.
 | 
				
			||||||
  -- Only load if `make` is available. Make sure you have the system
 | 
					  -- Only load if `make` is available. Make sure you have the system
 | 
				
			||||||
| 
						 | 
					@ -178,7 +178,7 @@ require('lazy').setup({
 | 
				
			||||||
    dependencies = {
 | 
					    dependencies = {
 | 
				
			||||||
      'nvim-treesitter/nvim-treesitter-textobjects',
 | 
					      'nvim-treesitter/nvim-treesitter-textobjects',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    build = ":TSUpdate",
 | 
					    build = ':TSUpdate',
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
 | 
					  -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
 | 
				
			||||||
| 
						 | 
					@ -361,10 +361,10 @@ require('nvim-treesitter.configs').setup {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Diagnostic keymaps
 | 
					-- Diagnostic keymaps
 | 
				
			||||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
 | 
					vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
 | 
				
			||||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
 | 
					vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
 | 
				
			||||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
 | 
					vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
 | 
				
			||||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
 | 
					vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- LSP settings.
 | 
					-- LSP settings.
 | 
				
			||||||
--  This function gets run when an LSP connects to a particular buffer.
 | 
					--  This function gets run when an LSP connects to a particular buffer.
 | 
				
			||||||
| 
						 | 
					@ -458,7 +458,7 @@ mason_lspconfig.setup_handlers {
 | 
				
			||||||
-- nvim-cmp setup
 | 
					-- nvim-cmp setup
 | 
				
			||||||
local cmp = require 'cmp'
 | 
					local cmp = require 'cmp'
 | 
				
			||||||
local luasnip = require 'luasnip'
 | 
					local luasnip = require 'luasnip'
 | 
				
			||||||
require("luasnip.loaders.from_vscode").lazy_load()
 | 
					require('luasnip.loaders.from_vscode').lazy_load()
 | 
				
			||||||
luasnip.config.setup {}
 | 
					luasnip.config.setup {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cmp.setup {
 | 
					cmp.setup {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue