diff --git a/nvim/nvim/config/new/init.lua b/nvim/nvim/config/new/init.lua index 167279d..dd9d4d2 100644 --- a/nvim/nvim/config/new/init.lua +++ b/nvim/nvim/config/new/init.lua @@ -3,4 +3,5 @@ require "plugins" require "colorscheme" require "windows" require "lsp" +require "treesitter" diff --git a/nvim/nvim/config/new/lua/lsp/cmp.lua b/nvim/nvim/config/new/lua/lsp/cmp.lua index 44c0b5f..a5a3eaa 100644 --- a/nvim/nvim/config/new/lua/lsp/cmp.lua +++ b/nvim/nvim/config/new/lua/lsp/cmp.lua @@ -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, }, diff --git a/nvim/nvim/config/new/lua/plugins.lua b/nvim/nvim/config/new/lua/plugins.lua index fc72efd..342ee81 100644 --- a/nvim/nvim/config/new/lua/plugins.lua +++ b/nvim/nvim/config/new/lua/plugins.lua @@ -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 diff --git a/nvim/nvim/config/new/lua/settings.lua b/nvim/nvim/config/new/lua/settings.lua index 69c0859..9b6ce78 100644 --- a/nvim/nvim/config/new/lua/settings.lua +++ b/nvim/nvim/config/new/lua/settings.lua @@ -34,7 +34,8 @@ local options = { }, fillchars = { diff = "╱", - } + }, + colorcolumn = "80,120", } for k, v in pairs(options) do @@ -56,3 +57,6 @@ keymap("i", "", "", opts) keymap("i", "", "", opts) keymap("i", "", "", opts) keymap("i", "", "", opts) + +keymap("i", "", "", opts) + diff --git a/nvim/nvim/config/new/lua/treesitter/init.lua b/nvim/nvim/config/new/lua/treesitter/init.lua new file mode 100644 index 0000000..85deef1 --- /dev/null +++ b/nvim/nvim/config/new/lua/treesitter/init.lua @@ -0,0 +1,2 @@ +require "treesitter.treesitter" + diff --git a/nvim/nvim/config/new/lua/treesitter/treesitter.lua b/nvim/nvim/config/new/lua/treesitter/treesitter.lua new file mode 100644 index 0000000..0f4213e --- /dev/null +++ b/nvim/nvim/config/new/lua/treesitter/treesitter.lua @@ -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, + }, +})