From 75ae3702b141c02915d19dc62595e710771924b0 Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Tue, 31 Jan 2023 21:31:35 +0100
Subject: [PATCH] lsp improvements

---
 nvim.lua/.config/nvim/init.lua          |  2 --
 nvim.lua/.config/nvim/lua/lsp_setup.lua | 16 ++++++++++------
 nvim.lua/.config/nvim/lua/plugins.lua   |  6 ------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/nvim.lua/.config/nvim/init.lua b/nvim.lua/.config/nvim/init.lua
index 8bfe098..ba81b01 100644
--- a/nvim.lua/.config/nvim/init.lua
+++ b/nvim.lua/.config/nvim/init.lua
@@ -15,11 +15,9 @@ set langmap=ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNO
 
 " Incrementally show effects of :s, :smagic, :snomagic
 set icm=split
-"set signcolumn=yes
 
 set number
 
-
 set nobackup nowritebackup
 set noswapfile
 
diff --git a/nvim.lua/.config/nvim/lua/lsp_setup.lua b/nvim.lua/.config/nvim/lua/lsp_setup.lua
index d865299..9ecece0 100644
--- a/nvim.lua/.config/nvim/lua/lsp_setup.lua
+++ b/nvim.lua/.config/nvim/lua/lsp_setup.lua
@@ -48,12 +48,16 @@ local lsp_flags = {
 vim.cmd([[set signcolumn=yes]])
 
 -- Setting up servers per language
--- Nix
-nvim_lsp['nil_ls'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-    capabilities = capabilities,
-}
+-- Default nvim-lsp setup: nil, clangd
+local servers = { 'nil_ls', 'clangd' }
+
+for _, serv in ipairs(servers) do
+    nvim_lsp[serv].setup{
+        on_attach = on_attach,
+        flags = lsp_flags,
+        capabilities = capabilities,
+    }
+end
 
 -- Rust: using rust tools package
 local rt = require("rust-tools")
diff --git a/nvim.lua/.config/nvim/lua/plugins.lua b/nvim.lua/.config/nvim/lua/plugins.lua
index 4c2d80a..7742dbe 100644
--- a/nvim.lua/.config/nvim/lua/plugins.lua
+++ b/nvim.lua/.config/nvim/lua/plugins.lua
@@ -80,7 +80,6 @@ return require('packer').startup(function(use)
     use 'tpope/vim-fugitive'
     use {
         'lewis6991/gitsigns.nvim',
-        tag = 'release',
         config = function()
             require('gitsigns').setup()
         end,
@@ -115,11 +114,6 @@ return require('packer').startup(function(use)
     -- neovim VSCode edition
     use {
         'neovim/nvim-lspconfig',
-        ft = {
-            'rust',
-            'nix',
-            -- 'python',
-        },
         after = { 'nvim-cmp' },
         requires = { 'simrat39/rust-tools.nvim' },
         config = function()