diff options
Diffstat (limited to 'lua/user')
| -rw-r--r-- | lua/user/bufferline.lua | 8 | ||||
| -rw-r--r-- | lua/user/keymaps.lua | 4 | ||||
| -rw-r--r-- | lua/user/lsp/init.lua | 5 | ||||
| -rw-r--r-- | lua/user/lsp/null-ls.lua | 19 | ||||
| -rw-r--r-- | lua/user/plugins.lua | 1 |
5 files changed, 27 insertions, 10 deletions
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", "<C-j>", "<C-\\><C-N><C-w>j", term_opts) keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", term_opts) keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", term_opts) --- Comment -keymap("n", "<leader>/", "<cmd>lua require('Comment').toggle()<CR>", opts) -keymap("v", "<leader>/", ":lua require(\"Comment.api\").gc(vim.fn.visualmode())<cr>", opts) - -- Nvimtree keymap("n", "<leader>e", ":NvimTreeToggle<cr>", 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" |