minor updates

.config/nvim/lua/config/autocmd.lua

@@ -1,5 +1,14 @@
 -- Set proper tabstop for go
 vim.api.nvim_create_autocmd('FileType', {
     pattern = "go",
-    command = "setlocal tabstop=4",
+    command = "setlocal tabstop=4 noexpandtab",
+})
+
+-- Remove trailing whitespaces on save
+vim.api.nvim_create_autocmd('BufWritePre', {
+    callback = function ()
+        local view = vim.fn.winsaveview()
+        vim.cmd('%s/\\s\\+$//e')
+        vim.fn.winrestview(view)
+    end
 })

.config/nvim/lua/config/mappings.lua

@@ -1,5 +1,10 @@
 local map = vim.keymap.set
 
+-- Remap leader to <Space>
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+map({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
+
 -- Unbind keys
 map('n', '<C-q>', '<NOP>')
 map({ 'n', 'v' }, 'H', '<NOP>')
@@ -28,6 +33,10 @@ map({ 'n', 'v' }, '<leader>m', '<C-w>10>')
 map({ 'n', 'v' }, '<leader>N', '<C-w>6-')
 map({ 'n', 'v' }, '<leader>M', '<C-w>6+')
 
+-- quickfix buffer
+map('n', '<M-n>', ':cn<CR>', { silent = true })
+map('n', '<M-p>', ':cp<CR>', { silent = true })
+
 -- Remap <M-BS> to remove last word
 map('i', '<M-BS>', '<C-w>')
 

.config/nvim/lua/config/options.lua

@@ -16,7 +16,7 @@ vim.o.autoindent = true
 vim.o.smartindent = true
 vim.o.smarttab = true
 vim.o.breakindent = true
-vim.o.softtabstop = -1
+vim.o.softtabstop = 4
 
 -- Save undo history
 vim.o.undofile = true

.config/nvim/lua/lsp/init.lua

@@ -6,6 +6,8 @@ local servers = {
     rust_analyzer = {},
     bashls = {},
     hls = {},
+    eslint = {},
+    ts_ls = {},
 }
 
 vim.lsp.set_log_level("debug")
@@ -43,7 +45,15 @@ for server_name, config in pairs(servers) do
     lspconfig[server_name].setup({
         capabilities = capabilities,
         on_attach = on_attach,
-        settings = { [server_name] = config },
+        settings = {
+            [server_name] = config ~= {} and {
+                settings = {
+                    [server_name] = {
+                        config
+                    }
+                }
+            } or {}
+        },
     })
 end
 

.config/nvim/lua/lsp/lua_ls.lua

@@ -1,10 +1,11 @@
 return {
-    settings = {
-        ['lua_ls'] = {
-            Lua = {
-                workspace = { checkThirdParty = false },
-                telemetry = { enable = false },
-            },
-        }
-    }
+    Lua = {
+        workspace = {
+            checkThirdParty = true,
+            library = {
+                vim.env.VIMRUNTIME
+            }
+        },
+        telemetry = { enable = false },
+    },
 }

.config/nvim/lua/plugins/init.lua

@@ -1,11 +1,13 @@
 return {
     'rcarriga/nvim-notify',
+    'psliwka/vim-smoothie',
     'stefandtw/quickfix-reflector.vim',
+    'tpope/vim-sleuth',
     { 'akinsho/bufferline.nvim', opts = {}, dependencies = { 'navarasu/onedark.nvim' } },
     { 'ethanholz/nvim-lastplace', opts = {} },
     { 'kylechui/nvim-surround', version = '*', event = 'VeryLazy', opts = {} },
     { 'lukas-reineke/indent-blankline.nvim', main = 'ibl', opts = {} },
-    { 'norcalli/nvim-colorizer.lua', opts={'*'}, dependencies = { 'navarasu/onedark.nvim' } },
+    { 'norcalli/nvim-colorizer.lua', opts={ '*' }, dependencies = { 'navarasu/onedark.nvim' } },
     { 'wakatime/vim-wakatime', event = 'VeryLazy' },
     { 'williamboman/mason.nvim', opts = {} },
 }

.config/nvim/lua/plugins/telescope.lua

@@ -36,6 +36,6 @@ return {
         vim.keymap.set('n', '<leader>of', require('telescope.builtin').oldfiles)
         vim.keymap.set('n', '<leader>af', require('telescope.builtin').git_files)
         vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files)
-        vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string)
+        vim.keymap.set('n', '<leader>fw', require('telescope.builtin').grep_string)
     end
 }

.config/nvim/lua/plugins/trouble.lua

@@ -3,11 +3,9 @@ return {
     opts = {},
     cmd = "Trouble",
     keys = {
-        { "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>" }, -- ??
-        { "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>" }, -- useless?
-        { "<leader>cs", "<cmd>Trouble symbols toggle focus=false<cr>" }, -- nice as well
-        { "<leader>cl", "<cmd>Trouble lsp toggle focus=false win.position=right<cr>" }, -- nicee
-        { "<leader>xL", "<cmd>Trouble loclist toggle<cr>" }, -- ??
-        { "<leader>xQ", "<cmd>Trouble qflist toggle<cr>" }, -- ??
+        { "<leader>ew", "<cmd>Trouble diagnostics toggle<cr>" },
+        { "<leader>ef", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>" },
+        { "<leader>cs", "<cmd>Trouble symbols toggle focus=false<cr>" },
+        { "<leader>cl", "<cmd>Trouble lsp toggle focus=false win.position=right<cr>" },
     },
 }

.config/nvim/lua/utils/close_buffer.lua

@@ -1,15 +0,0 @@
-local M = { }
-
-function M.close_buffer(force)
-    if #vim.fn.filter(vim.fn.range(1, vim.fn.bufnr '$'), 'buflisted(v:val)') <= 1 then
-        vim.api.nvim_command("qa" .. (force and "!" or ""))
-    else
-        local tree = require("nvim-tree.api").tree
-
-        tree.toggle({ focus = false })
-        vim.api.nvim_command("bd" .. (force and "!" or ""))
-        tree.toggle({ focus = false })
-    end
-end
-
-return M

.config/nvim/lua/utils/lazy.lua

@@ -1,18 +0,0 @@
-local M = { }
-
-function M.lazy_init()
-    local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-    if not vim.loop.fs_stat(lazypath) then
-        vim.fn.system {
-            'git',
-            'clone',
-            '--filter=blob:none',
-            'https://github.com/folke/lazy.nvim.git',
-            '--branch=stable',
-            lazypath,
-        }
-    end
-    vim.opt.rtp:prepend(lazypath)
-end
-
-return M