From 1027d8cb1684c38315969ea7417398bd57948614 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:21:42 -0500 Subject: add bufferline --- lua/user/plugins.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lua/user/plugins.lua') diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 04c0bc9..530d7bf 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -46,8 +46,10 @@ return packer.startup(function(use) use "nvim-lua/plenary.nvim" -- Useful lua functions used ny lots of plugins use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter use "numToStr/Comment.nvim" -- Easily comment stuff - use 'kyazdani42/nvim-web-devicons' - use 'kyazdani42/nvim-tree.lua' + use "kyazdani42/nvim-web-devicons" + use "kyazdani42/nvim-tree.lua" + use "akinsho/bufferline.nvim" + use "moll/vim-bbye" -- Colorschemes -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out @@ -78,7 +80,7 @@ return packer.startup(function(use) "nvim-treesitter/nvim-treesitter", run = ":TSUpdate", } - use 'JoosepAlviste/nvim-ts-context-commentstring' + use "JoosepAlviste/nvim-ts-context-commentstring" -- Git use "lewis6991/gitsigns.nvim" -- cgit v1.2.3 From 6fddfcb743fe2f4980608853ef27fb9b5737a3ee Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:25:42 -0500 Subject: add null-ls fix bufferline f --- lua/user/bufferline.lua | 8 ++++---- lua/user/keymaps.lua | 4 ---- lua/user/lsp/init.lua | 5 +++-- lua/user/lsp/null-ls.lua | 19 +++++++++++++++++++ lua/user/plugins.lua | 1 + 5 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 lua/user/lsp/null-ls.lua (limited to 'lua/user/plugins.lua') diff --git a/lua/user/bufferline.lua b/lua/user/bufferline.lua index 81015c5..7d98cf0 100644 --- a/lua/user/bufferline.lua +++ b/lua/user/bufferline.lua @@ -92,12 +92,12 @@ bufferline.setup { }, close_button = { - guifg = { attribute = "fg", highlight = "TabLineSel" }, - guibg = { attribute = "bg", highlight = "TabLineSel" }, + guifg = { attribute = "fg", highlight = "TabLine" }, + guibg = { attribute = "bg", highlight = "TabLine" }, }, close_button_visible = { - guifg = { attribute = "fg", highlight = "TabLineSel" }, - guibg = { attribute = "bg", highlight = "TabLineSel" }, + guifg = { attribute = "fg", highlight = "TabLine" }, + guibg = { attribute = "bg", highlight = "TabLine" }, }, -- close_button_selected = { -- guifg = {attribute='fg',highlight='TabLineSel'}, diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index b4d2195..638cab5 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -67,9 +67,5 @@ keymap("t", "", "j", term_opts) keymap("t", "", "k", term_opts) keymap("t", "", "l", term_opts) --- Comment -keymap("n", "/", "lua require('Comment').toggle()", opts) -keymap("v", "/", ":lua require(\"Comment.api\").gc(vim.fn.visualmode())", opts) - -- Nvimtree keymap("n", "e", ":NvimTreeToggle", opts) diff --git a/lua/user/lsp/init.lua b/lua/user/lsp/init.lua index a62e7aa..8158cf3 100644 --- a/lua/user/lsp/init.lua +++ b/lua/user/lsp/init.lua @@ -1,7 +1,8 @@ local status_ok, _ = pcall(require, "lspconfig") if not status_ok then - return + return end -require("user.lsp.lsp-installer") +require "user.lsp.lsp-installer" require("user.lsp.handlers").setup() +require "user.lsp.null-ls" diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua new file mode 100644 index 0000000..874e19c --- /dev/null +++ b/lua/user/lsp/null-ls.lua @@ -0,0 +1,19 @@ +local null_ls_status_ok, null_ls = pcall(require, "null-ls") +if not null_ls_status_ok then + return +end + +-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting +local formatting = null_ls.builtins.formatting +-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics +local diagnostics = null_ls.builtins.diagnostics + +null_ls.setup({ + debug = false, + sources = { + formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), + formatting.black.with({ extra_args = { "--fast" } }), + formatting.stylua, + -- diagnostics.flake8 + }, +}) diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 530d7bf..614545c 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -71,6 +71,7 @@ return packer.startup(function(use) use "neovim/nvim-lspconfig" -- enable LSP use "williamboman/nvim-lsp-installer" -- simple to use language server installer use "tamago324/nlsp-settings.nvim" -- language server settings defined in json for + use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters -- Telescope use "nvim-telescope/telescope.nvim" -- cgit v1.2.3 From a9f3e7f837775601941c51abfcde7eb9ca708241 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Sun, 2 Jan 2022 14:28:26 -0500 Subject: remove plugin --- lua/user/plugins.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'lua/user/plugins.lua') diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 614545c..0035ad8 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -70,7 +70,6 @@ return packer.startup(function(use) -- LSP use "neovim/nvim-lspconfig" -- enable LSP use "williamboman/nvim-lsp-installer" -- simple to use language server installer - use "tamago324/nlsp-settings.nvim" -- language server settings defined in json for use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters -- Telescope -- cgit v1.2.3 From d362e34fd1044ae09158eb10243a7ec2cc502a4d Mon Sep 17 00:00:00 2001 From: "Vito G. Graffagnino" Date: Mon, 30 May 2022 22:40:25 +0100 Subject: plugins.lua --- lua/user/plugins.lua | 3 --- 1 file changed, 3 deletions(-) (limited to 'lua/user/plugins.lua') diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 5893e92..56ef86d 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -73,10 +73,7 @@ return packer.startup(function(use) -- LSP use "neovim/nvim-lspconfig" -- enable LSP use "williamboman/nvim-lsp-installer" -- simple to use language server installer -<<<<<<< HEAD use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters -======= ->>>>>>> vgg -- Telescope use "nvim-telescope/telescope.nvim" -- cgit v1.2.3