Merge branch 'master' into master
This commit is contained in:
		
						commit
						0a07b7827a
					
				
							
								
								
									
										39
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										39
									
								
								init.lua
								
								
								
								
							| 
						 | 
				
			
			@ -130,7 +130,10 @@ vim.api.nvim_create_autocmd('TextYankPost', {
 | 
			
		|||
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 | 
			
		||||
if not vim.loop.fs_stat(lazypath) then
 | 
			
		||||
  local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
 | 
			
		||||
  vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
 | 
			
		||||
  local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
 | 
			
		||||
  if vim.v.shell_error ~= 0 then
 | 
			
		||||
    error('Error cloning lazy.nvim:\n' .. out)
 | 
			
		||||
  end
 | 
			
		||||
end ---@diagnostic disable-next-line: undefined-field
 | 
			
		||||
vim.opt.rtp:prepend(lazypath)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -229,19 +232,15 @@ require('lazy').setup({
 | 
			
		|||
      require('which-key').setup()
 | 
			
		||||
 | 
			
		||||
      -- Document existing key chains
 | 
			
		||||
      require('which-key').register {
 | 
			
		||||
        ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
 | 
			
		||||
        ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
 | 
			
		||||
        ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
 | 
			
		||||
        ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
 | 
			
		||||
        ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
 | 
			
		||||
        ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
 | 
			
		||||
        ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
 | 
			
		||||
      require('which-key').add {
 | 
			
		||||
        { '<leader>c', group = '[C]ode' },
 | 
			
		||||
        { '<leader>d', group = '[D]ocument' },
 | 
			
		||||
        { '<leader>r', group = '[R]ename' },
 | 
			
		||||
        { '<leader>s', group = '[S]earch' },
 | 
			
		||||
        { '<leader>w', group = '[W]orkspace' },
 | 
			
		||||
        { '<leader>t', group = '[T]oggle' },
 | 
			
		||||
        { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
 | 
			
		||||
      }
 | 
			
		||||
      -- visual mode
 | 
			
		||||
      require('which-key').register({
 | 
			
		||||
        ['<leader>h'] = { 'Git [H]unk' },
 | 
			
		||||
      }, { mode = 'v' })
 | 
			
		||||
    end,
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -792,19 +791,7 @@ require('lazy').setup({
 | 
			
		|||
    'nvim-treesitter/nvim-treesitter',
 | 
			
		||||
    build = ':TSUpdate',
 | 
			
		||||
    opts = {
 | 
			
		||||
      ensure_installed = {
 | 
			
		||||
        'bash',
 | 
			
		||||
        'c',
 | 
			
		||||
        'diff',
 | 
			
		||||
        'html',
 | 
			
		||||
        'lua',
 | 
			
		||||
        'luadoc',
 | 
			
		||||
        'markdown',
 | 
			
		||||
        'vim',
 | 
			
		||||
        'vimdoc',
 | 
			
		||||
        'ron',
 | 
			
		||||
        'rust',
 | 
			
		||||
      },
 | 
			
		||||
      ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
 | 
			
		||||
      -- Autoinstall languages that are not installed
 | 
			
		||||
      auto_install = true,
 | 
			
		||||
      highlight = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue