mirror of
https://github.com/zoriya/dotfiles.git
synced 2026-06-08 12:42:02 +00:00
Adding treesitter and virtual-colunm
This commit is contained in:
@@ -3,4 +3,5 @@ require "plugins"
|
||||
require "colorscheme"
|
||||
require "windows"
|
||||
require "lsp"
|
||||
require "treesitter"
|
||||
|
||||
|
||||
@@ -85,12 +85,12 @@ cmp.setup({
|
||||
fields = { "abbr", "kind" },
|
||||
format = function(entry, vim_item)
|
||||
vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind)
|
||||
vim_item.menu = ({
|
||||
nvim_lsp = "[LSP]",
|
||||
luasnip = "[Snippet]",
|
||||
buffer = "[Buffer]",
|
||||
path = "[Path]",
|
||||
})[entry.source.name]
|
||||
-- vim_item.menu = ({
|
||||
-- nvim_lsp = "[LSP]",
|
||||
-- luasnip = "[Snippet]",
|
||||
-- buffer = "[Buffer]",
|
||||
-- path = "[Path]",
|
||||
-- })[entry.source.name]
|
||||
return vim_item
|
||||
end,
|
||||
},
|
||||
|
||||
@@ -50,11 +50,9 @@ return packer.startup(function(use)
|
||||
use "folke/tokyonight.nvim"
|
||||
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = { {'nvim-lua/plenary.nvim'} }
|
||||
{ 'nvim-telescope/telescope.nvim', requires = { {'nvim-lua/plenary.nvim'} } },
|
||||
{ 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' },
|
||||
}
|
||||
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
||||
|
||||
use "folke/which-key.nvim"
|
||||
use "akinsho/toggleterm.nvim"
|
||||
|
||||
@@ -62,6 +60,7 @@ return packer.startup(function(use)
|
||||
'neovim/nvim-lspconfig',
|
||||
'williamboman/nvim-lsp-installer',
|
||||
}
|
||||
use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }
|
||||
use {
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-buffer",
|
||||
@@ -71,6 +70,8 @@ return packer.startup(function(use)
|
||||
"L3MON4D3/LuaSnip",
|
||||
}
|
||||
|
||||
use { "lukas-reineke/virt-column.nvim", config = function() require("virt-column").setup() end }
|
||||
|
||||
if PACKER_BOOTSTRAP then
|
||||
require("packer").sync()
|
||||
end
|
||||
|
||||
@@ -34,7 +34,8 @@ local options = {
|
||||
},
|
||||
fillchars = {
|
||||
diff = "╱",
|
||||
}
|
||||
},
|
||||
colorcolumn = "80,120",
|
||||
}
|
||||
|
||||
for k, v in pairs(options) do
|
||||
@@ -56,3 +57,6 @@ keymap("i", "<C-j>", "<Down>", opts)
|
||||
keymap("i", "<C-k>", "<Up>", opts)
|
||||
keymap("i", "<C-h>", "<Left>", opts)
|
||||
keymap("i", "<C-l>", "<Right>", opts)
|
||||
|
||||
keymap("i", "<C-BS>", "<C-w>", opts)
|
||||
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
require "treesitter.treesitter"
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
local status_ok, configs = pcall(require, "nvim-treesitter.configs")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
configs.setup({
|
||||
ensure_installed = "maintained",
|
||||
sync_install = false,
|
||||
indent = {
|
||||
enable = true,
|
||||
disable = { },
|
||||
},
|
||||
context_commentstring = {
|
||||
enable = true,
|
||||
enable_autocmd = false,
|
||||
},
|
||||
})
|
||||
Reference in New Issue
Block a user