From 5595a291ef077faf379fe2830c7b14a075309b4e Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Fri, 13 May 2022 20:16:50 +0300 Subject: [PATCH 01/10] use lspconfig for setup lsps --- neovim/.config/nvim/lua/user/lsp.lua | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/neovim/.config/nvim/lua/user/lsp.lua b/neovim/.config/nvim/lua/user/lsp.lua index 73aed51..92341da 100644 --- a/neovim/.config/nvim/lua/user/lsp.lua +++ b/neovim/.config/nvim/lua/user/lsp.lua @@ -1,10 +1,29 @@ local lsp_installer = require("nvim-lsp-installer") +local lspconfig = require("lspconfig") local null_ls = require("null-ls") local util = require("lspconfig").util local formatting = null_ls.builtins.formatting local diagnostics = null_ls.builtins.diagnostics +lsp_installer.setup({ + ensure_installed = { + "bashls", + "cssmodules_ls", + "dockerls", + "tailwindcss", + "tsserver", + "vimls", + "cssls", + "html", + "jsonls", + "prismals", + "sumneko_lua", + "svelte", + }, + automatic_installation = true, +}) + null_ls.setup({ sources = { formatting.prettierd, @@ -57,7 +76,9 @@ local on_attach = function(client, bufnr) }, bufnr) end -lsp_installer.on_server_ready(function(server) +local servers = lsp_installer.get_installed_servers() + +for _, server in ipairs(servers) do local opts = { capabilities = capabilities, on_attach = on_attach, @@ -114,8 +135,8 @@ lsp_installer.on_server_ready(function(server) opts.root_dir = util.root_pattern(".eslintrc", ".eslintrc.json") end - server:setup(opts) -end) + lspconfig[server.name].setup(opts) +end vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { update_in_insert = false, From f2c58a411e5d4819453e1018d70c932df8d71884 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Fri, 13 May 2022 20:18:14 +0300 Subject: [PATCH 02/10] remove nvim-sidebar --- neovim/.config/nvim/init.lua | 4 ---- neovim/.config/nvim/lua/user/sidebar.lua | 5 ----- 2 files changed, 9 deletions(-) delete mode 100644 neovim/.config/nvim/lua/user/sidebar.lua diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua index 7ba9f65..c82699d 100644 --- a/neovim/.config/nvim/init.lua +++ b/neovim/.config/nvim/init.lua @@ -47,9 +47,6 @@ require("packer").startup(function(use) -- File tree use({ "kyazdani42/nvim-tree.lua" }) - -- Sidebar - use({ "sidebar-nvim/sidebar.nvim" }) - -- Treesitter for better syntax highlighting use({ "nvim-treesitter/nvim-treesitter", @@ -192,7 +189,6 @@ require("user.theme") require("nvim-autopairs").setup({}) require("user.file-tree") -require("user.sidebar") require("user.treesitter") require("user.telescope") require("user.gitsigns") diff --git a/neovim/.config/nvim/lua/user/sidebar.lua b/neovim/.config/nvim/lua/user/sidebar.lua deleted file mode 100644 index b532f43..0000000 --- a/neovim/.config/nvim/lua/user/sidebar.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("sidebar-nvim").setup({ - open = false, - side = "right", - sections = { "datetime", "git", "diagnostics", "todos", "containers", "symbols" }, -}) From 0bc66616ca14c636a5d9edef314a966f51d464c6 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Fri, 13 May 2022 20:20:06 +0300 Subject: [PATCH 03/10] remove nvim-scrollview --- neovim/.config/nvim/init.lua | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua index c82699d..96f5504 100644 --- a/neovim/.config/nvim/init.lua +++ b/neovim/.config/nvim/init.lua @@ -160,17 +160,6 @@ require("packer").startup(function(use) end, }) - use({ - "dstein64/nvim-scrollview", - config = function() - require("scrollview").setup({ - excluded_filetypes = { "NvimTree" }, - current_only = true, - winblend = 50, - }) - end, - }) - if PACKER_BOOTSTRAP then require("packer").sync() end From 50e09bcfa596eee9cb764bd9489badb002da7ac5 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Fri, 13 May 2022 20:23:09 +0300 Subject: [PATCH 04/10] remove sidebar mapping --- neovim/.config/nvim/lua/user/remaps.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neovim/.config/nvim/lua/user/remaps.lua b/neovim/.config/nvim/lua/user/remaps.lua index a75b386..3ec41ed 100644 --- a/neovim/.config/nvim/lua/user/remaps.lua +++ b/neovim/.config/nvim/lua/user/remaps.lua @@ -56,11 +56,6 @@ vim.keymap.set("n", "", function() require("nvim-tree").toggle(true, false) end) --- Sidebar -vim.keymap.set("n", "s", function() - require("sidebar-nvim").toggle() -end) - -- Telescope vim.keymap.set("n", "f", function() ts.find_files({ hidden = true }) From 0ec4c0318b5876f796262e733901687a3a58ebaf Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Fri, 13 May 2022 20:30:13 +0300 Subject: [PATCH 05/10] change root_dir for tailwindcss lsp --- neovim/.config/nvim/lua/user/lsp.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neovim/.config/nvim/lua/user/lsp.lua b/neovim/.config/nvim/lua/user/lsp.lua index 92341da..0d290d8 100644 --- a/neovim/.config/nvim/lua/user/lsp.lua +++ b/neovim/.config/nvim/lua/user/lsp.lua @@ -84,6 +84,10 @@ for _, server in ipairs(servers) do on_attach = on_attach, } + if server.name == "tailwindcss" then + opts.root_dir = util.root_pattern("tailwind.config.js", "tailwind.config.cjs", "tailwind.config.mjs") + end + if server.name == "sumneko_lua" then local luadev = require("lua-dev").setup({ lspconfig = { From 52a66688c04676d79ed7b77e663067a8ef8e5da0 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Sat, 14 May 2022 16:29:55 +0300 Subject: [PATCH 06/10] add emmet_ls and eslint --- neovim/.config/nvim/lua/user/lsp.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neovim/.config/nvim/lua/user/lsp.lua b/neovim/.config/nvim/lua/user/lsp.lua index 0d290d8..dc685b1 100644 --- a/neovim/.config/nvim/lua/user/lsp.lua +++ b/neovim/.config/nvim/lua/user/lsp.lua @@ -20,6 +20,8 @@ lsp_installer.setup({ "prismals", "sumneko_lua", "svelte", + "emmet_ls", + "eslint", }, automatic_installation = true, }) @@ -84,6 +86,10 @@ for _, server in ipairs(servers) do on_attach = on_attach, } + if server.name == "emmet_ls" then + opts.filetypes = { "html", "css", "scss", "javascripreact", "typescriptreact" } + end + if server.name == "tailwindcss" then opts.root_dir = util.root_pattern("tailwind.config.js", "tailwind.config.cjs", "tailwind.config.mjs") end From 34047383e44965b0c0d5fa95eb71a2fb5f529364 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Sat, 14 May 2022 16:30:04 +0300 Subject: [PATCH 07/10] add location to lualine --- neovim/.config/nvim/lua/user/lualine.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/neovim/.config/nvim/lua/user/lualine.lua b/neovim/.config/nvim/lua/user/lualine.lua index 2228804..a99add7 100644 --- a/neovim/.config/nvim/lua/user/lualine.lua +++ b/neovim/.config/nvim/lua/user/lualine.lua @@ -62,6 +62,17 @@ local npm = { end, } +local location = { + function() + local line = vim.fn.line(".") + local total_lines = vim.api.nvim_buf_line_count(0) + + local percent = math.floor(line / total_lines * 100) + + return line .. "/" .. total_lines .. " (" .. percent .. "%%)" + end, +} + local tabs = { "tabs", mode = 1, @@ -89,7 +100,7 @@ lualine.setup({ lualine_a = { mode }, lualine_b = { branch }, lualine_c = { diagnostics }, - lualine_x = { npm, tabstop, fileformat }, + lualine_x = { npm, location, tabstop, fileformat }, lualine_y = { filename }, lualine_z = {}, }, From 06af100144657ef14184077e037e76c50455a4ad Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Tue, 17 May 2022 22:15:12 +0300 Subject: [PATCH 08/10] update completion for git seems that it's not working but fuck it --- neovim/.config/nvim/lua/user/comp.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neovim/.config/nvim/lua/user/comp.lua b/neovim/.config/nvim/lua/user/comp.lua index 9876266..63d4ea7 100644 --- a/neovim/.config/nvim/lua/user/comp.lua +++ b/neovim/.config/nvim/lua/user/comp.lua @@ -1,6 +1,8 @@ local cmp = require("cmp") local ls = require("luasnip") +require("cmp_git").setup() + local kind_icons = { Text = "", Method = "", @@ -128,7 +130,7 @@ cmp.setup.cmdline(":", { cmp.setup.filetype("gitcommit", { sources = cmp.config.sources({ - { name = "cmp_git" }, + { name = "git" }, }, { { name = "buffer" }, }), From 30d64d123b8e10a9b96901c3e41b140dceed2872 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Tue, 17 May 2022 22:18:17 +0300 Subject: [PATCH 09/10] format --- neovim/.config/nvim/lua/user/file-tree.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/neovim/.config/nvim/lua/user/file-tree.lua b/neovim/.config/nvim/lua/user/file-tree.lua index 787352f..3bc6177 100644 --- a/neovim/.config/nvim/lua/user/file-tree.lua +++ b/neovim/.config/nvim/lua/user/file-tree.lua @@ -26,27 +26,29 @@ local function git_stage(node) local relative_path = string.gsub(node.absolute_path, cwd .. "/", "") Job - :new({ - command = "git", - args = { "add", relative_path }, - }) - :start() + :new({ + command = "git", + args = { "add", relative_path }, + }) + :start() require("nvim-tree.actions.reloaders").reload_explorer() end + local function git_reset(node) local cwd = vim.loop.cwd() local relative_path = string.gsub(node.absolute_path, cwd .. "/", "") Job - :new({ - command = "git", - args = { "reset", relative_path }, - }) - :start() + :new({ + command = "git", + args = { "reset", relative_path }, + }) + :start() require("nvim-tree.actions.reloaders").reload_explorer() end + -- TODO: add here keymap for git diff window require("nvim-tree").setup({ From 736d93883bd56c0eab2d224ca05b756210316521 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Tue, 17 May 2022 22:18:28 +0300 Subject: [PATCH 10/10] set reload_on_bufenter option --- neovim/.config/nvim/lua/user/file-tree.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/neovim/.config/nvim/lua/user/file-tree.lua b/neovim/.config/nvim/lua/user/file-tree.lua index 3bc6177..89c5442 100644 --- a/neovim/.config/nvim/lua/user/file-tree.lua +++ b/neovim/.config/nvim/lua/user/file-tree.lua @@ -59,6 +59,7 @@ require("nvim-tree").setup({ open_on_tab = false, update_cwd = true, auto_reload_on_write = true, + reload_on_bufenter = true, update_focused_file = { enable = true, },