Merge branch 'master' of git.nussnougate.net:sevi-kun/nvim
This commit is contained in:
		@@ -1,8 +1,8 @@
 | 
				
			|||||||
-- parsing and highlighting
 | 
					-- parsing and highlighting
 | 
				
			||||||
require'nvim-treesitter.configs'.setup {
 | 
					require'nvim-treesitter.configs'.setup {
 | 
				
			||||||
  -- A list of parser names, or "all" (the five listed parsers should always be installed)
 | 
					  -- A list of parser names, or "all" (the five listed parsers should always be installed)
 | 
				
			||||||
  ensure_installed = { "python", "javascript", "typescript", "c", "rust", "bash", "lua", "vim", "vimdoc", "query" },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  ensure_installed = 'all',
 | 
				
			||||||
  -- Install parsers synchronously (only applied to `ensure_installed`)
 | 
					  -- Install parsers synchronously (only applied to `ensure_installed`)
 | 
				
			||||||
  sync_install = false,
 | 
					  sync_install = false,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -12,12 +12,10 @@ require'nvim-treesitter.configs'.setup {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  highlight = {
 | 
					  highlight = {
 | 
				
			||||||
    enable = true,
 | 
					    enable = true,
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  -- Needed because treesitter highlight turns off autoindent for php files
 | 
				
			||||||
    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
 | 
					  indent = {
 | 
				
			||||||
    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
 | 
					      enable = true,
 | 
				
			||||||
    -- Using this option may slow down your editor, and you may see some duplicate highlights.
 | 
					 | 
				
			||||||
    -- Instead of true it can also be a list of languages
 | 
					 | 
				
			||||||
    additional_vim_regex_highlighting = false,
 | 
					 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,6 +3,7 @@ vim.g.mapleader = " "
 | 
				
			|||||||
vim.opt.nu = true
 | 
					vim.opt.nu = true
 | 
				
			||||||
vim.opt.relativenumber = true
 | 
					vim.opt.relativenumber = true
 | 
				
			||||||
vim.opt.ignorecase = true
 | 
					vim.opt.ignorecase = true
 | 
				
			||||||
 | 
					vim.opt.cursorline = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
vim.opt.tabstop =  4
 | 
					vim.opt.tabstop =  4
 | 
				
			||||||
vim.opt.softtabstop = 4
 | 
					vim.opt.softtabstop = 4
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user