diff options
Diffstat (limited to '.config/nvim/lua')
| -rw-r--r-- | .config/nvim/lua/options.lua | 4 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 122 | ||||
| -rw-r--r-- | .config/nvim/lua/setup/lspconfig.lua | 6 |
3 files changed, 65 insertions, 67 deletions
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 860a560..ea4a9f8 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -23,8 +23,8 @@ set.shiftwidth = 4 set.softtabstop = 4 set.autoindent = true set.expandtab = true -set.showmode = false -set.ruler = false +-- set.showmode = false +-- set.ruler = false set.timeout = false set.ttimeoutlen = 200 set.wrap = false diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 8394d37..e534205 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -32,32 +32,32 @@ return require('packer').startup(function(use) use { "kyazdani42/nvim-web-devicons", - after = "onedark.nvim" + -- after = "onedark.nvim" } - use { - "nvim-lualine/lualine.nvim", - after = "nvim-web-devicons", - config = function() - require "setup.lualine" - end, - } + -- use { + -- "nvim-lualine/lualine.nvim", + -- after = "nvim-web-devicons", + -- config = function() + -- require "setup.lualine" + -- end, + -- } - use { - "lukas-reineke/indent-blankline.nvim", - event = { "BufRead", "BufNewFile" }, - config = function() - require "setup.indent-blankline" - end, - } + -- use { + -- "lukas-reineke/indent-blankline.nvim", + -- event = { "BufRead", "BufNewFile" }, + -- config = function() + -- require "setup.indent-blankline" + -- end, + -- } - use { - "kyazdani42/nvim-tree.lua", - cmd = { "NvimTreeToggle", "NvimTreeFindFile" }, - config = function() - require "setup.nvim-tree" - end, - } + -- use { + -- "kyazdani42/nvim-tree.lua", + -- cmd = { "NvimTreeToggle", "NvimTreeFindFile" }, + -- config = function() + -- require "setup.nvim-tree" + -- end, + -- } use { "nvim-treesitter/nvim-treesitter", @@ -85,52 +85,44 @@ return require('packer').startup(function(use) end, } - -- use { - -- "williamboman/nvim-lsp-installer", - -- after = "nvim-lspconfig", - -- config = function() - -- require "setup.lspconfig" - -- end, - -- } - use { "ray-x/lsp_signature.nvim", - after = "nvim-lspconfig", + event = "User lspAttached", config = function() require "setup.lsp_signature" end } use { - "L3MON4D3/LuaSnip", - wants = "friendly-snippets", + "hrsh7th/nvim-cmp", event = "User lspAttached", config = function() - require("luasnip/loaders/from_vscode").lazy_load() + require "setup.nvim-cmp" end, } use { - "rafamadriz/friendly-snippets", - module = "cmp_nvim_lsp", + "hrsh7th/cmp-nvim-lsp", + after = "nvim-cmp", } use { - "hrsh7th/nvim-cmp", - after = "LuaSnip", - config = function() - require "setup.nvim-cmp" - end, + "saadparwaiz1/cmp_luasnip", + after = { "LuaSnip", "nvim-cmp" } } use { - "saadparwaiz1/cmp_luasnip", - after = { "LuaSnip", "nvim-cmp" } + "L3MON4D3/LuaSnip", + after = "nvim-cmp", + wants = "friendly-snippets", + config = function() + require("luasnip/loaders/from_vscode").lazy_load() + end, } use { - "hrsh7th/cmp-nvim-lsp", - after = "cmp_luasnip", + "rafamadriz/friendly-snippets", + module = "cmp_nvim_lsp", } use { @@ -138,13 +130,13 @@ return require('packer').startup(function(use) event = { "BufRead", "BufNewFile" }, } - use { - "tpope/vim-fugitive", - cmd = { 'G', 'Ggrep' }, - config = function() - require "setup.fugitive" - end, - } + -- use { + -- "tpope/vim-fugitive", + -- cmd = { 'G', 'Ggrep' }, + -- config = function() + -- require "setup.fugitive" + -- end, + -- } use { "b3nj5m1n/kommentary", @@ -174,20 +166,20 @@ return require('packer').startup(function(use) end } - use { - "norcalli/nvim-colorizer.lua", - cmd = { "ColorizerToggle" }, - config = function() - require "colorizer".setup() - end, - } + -- use { + -- "norcalli/nvim-colorizer.lua", + -- cmd = { "ColorizerToggle" }, + -- config = function() + -- require "colorizer".setup() + -- end, + -- } - use { "iamcco/markdown-preview.nvim", - ft = "markdown", - run = function() - vim.fn['mkdp#util#install']() - end, - } + -- use { "iamcco/markdown-preview.nvim", + -- ft = "markdown", + -- run = function() + -- vim.fn['mkdp#util#install']() + -- end, + -- } if Packer_bootstrap then require('packer').sync() diff --git a/.config/nvim/lua/setup/lspconfig.lua b/.config/nvim/lua/setup/lspconfig.lua index c76ef2d..d22450e 100644 --- a/.config/nvim/lua/setup/lspconfig.lua +++ b/.config/nvim/lua/setup/lspconfig.lua @@ -14,6 +14,12 @@ lspconfig.lua_ls.setup { } } } +lspconfig.bashls.setup { + on_attach = on_attach, +} +lspconfig.pyright.setup{ + on_attach = on_attach, +} local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " } for type, icon in pairs(signs) do |