Updated nvim config

1 files changed, 300 insertions, 36 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 5f0fb3d..a017a27 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,53 +1,245 @@
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
 require "paq" {
-	"savq/paq-nvim", -- Let Paq manage itself
-	"savq/melange-nvim",
-	"neovim/nvim-lspconfig",
-	{ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' },
+	{ "savq/paq-nvim" },
+	{ "savq/melange-nvim" },
+	{ 'nvim-treesitter/nvim-treesitter',  build = ':TSUpdate' },
+	{ 'williamboman/mason.nvim' },
+	{ 'williamboman/mason-lspconfig.nvim' },
+	{ 'neovim/nvim-lspconfig' },
+	{ 'p00f/clangd_extensions.nvim' },
+	{ 'folke/lazydev.nvim' },
+	{ 'mrcjkb/rustaceanvim' },
+	{ 'hrsh7th/nvim-cmp' },
+	{ 'hrsh7th/cmp-nvim-lsp' },
+	{ "stevearc/conform.nvim" },
+	{ "j-hui/fidget.nvim" },
 }:sync()
 
 vim.opt.number = true
 vim.opt.relativenumber = true
 vim.opt.title = true
 vim.opt.termguicolors = true
-vim.opt.signcolumn = 'yes'
+
+vim.opt.shortmess:append("sI")
+
+vim.opt.splitright = true
+vim.opt.splitbelow = true
 
 vim.g.netrw_keepdir = 0
 vim.g.netrw_banner = 0
 
-vim.opt.clipboard=unnamedplus
+vim.g.loaded_node_provider = 0
+vim.g.loaded_perl_provider = 0
+vim.g.loaded_python_provider = 0
+
+vim.opt.list = true
+vim.opt.mouse = 'a'
+
+vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.opt.foldmethod = "expr"
+vim.opt.foldcolumn = "auto"
+
+vim.opt.cursorline = true
+vim.opt.laststatus = 2
+vim.opt.statusline = "%!v:lua.Line.status()"
+vim.opt.tabline = "%!v:lua.Line.tab()"
+vim.opt.signcolumn = 'yes'
+vim.opt.statuscolumn = "%!v:lua.Line.column()"
+vim.opt.showtabline = 2
+
+-- Bug in Wayland + netrw
+-- vim.opt.clipboard = 'unnamedplus'
 
 vim.cmd.colorscheme 'melange'
 vim.opt.colorcolumn = '+1'
-vim.opt.foldlevel = 2
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-vim.opt.foldenable = false
 
-vim.opt.omnifunc = "syntaxcomplete#Complete"
-vim.opt.completeopt = {'menu', 'noinsert'}
+vim.opt.hlsearch = true
+vim.keymap.set('n', '<Esc>', vim.cmd.nohlsearch)
+
+vim.keymap.set('n', '<S-Right>', vim.cmd.bnext)
+vim.keymap.set('n', '<S-Left>', vim.cmd.bprev)
+
+local function get_formated_bufname(buffer)
+	buffer = buffer or 0
+
+	local name = vim.api.nvim_buf_get_name(buffer)
+	local buftype = vim.bo[buffer].buftype
+	if buftype == "terminal" then
+		name = vim.b[buffer].term_title
+	else
+		if #name == 0 then
+			name = '[No Name] (' .. (buftype or vim.bo[buffer].filetype) .. ')'
+		end
+		local modified = vim.bo[buffer].modified and '[+]' or ""
+		local readonly = vim.bo[buffer].readonly and '[RO]' or ""
+		name = name .. modified .. readonly
+	end
+
+	return name
+end
+
+Line = {
+	status = function()
+		local buffer = vim.api.nvim_win_get_buf(vim.g.statusline_winid)
+		local buftype = vim.bo[buffer].buftype
+		print(buftype)
+		if buftype == "terminal" then
+			return table.concat({ vim.b[buffer].term_title, vim.api.nvim_buf_get_name(buffer) }, '%=')
+		end
+		local a = ""
+		if vim.opt.ruler:get() then
+			a = "%8l:%c%V %8p%%"
+		end
+
+		local clients = {}
+		for _, client in ipairs(vim.lsp.get_clients()) do
+			if client.attached_buffers[buffer] then
+				table.insert(clients, client.name)
+			end
+		end
+
+		return table.concat({
+			vim.api.nvim_get_mode().mode:upper(),
+			get_formated_bufname(buffer),
+			"%=",
+			vim.bo.filetype,
+			"(" .. table.concat(clients, ", ") .. ")",
+			vim.bo.spelllang,
+			vim.bo.fileencoding,
+			vim.bo.fileformat,
+			a
+		}, " ")
+	end,
+
+	tab = function()
+		local tabs = vim.api.nvim_list_tabpages()
+		local format = vim.tbl_map(function(tab)
+			local str = ""
+			if tab == vim.api.nvim_get_current_tabpage() then
+				str = '%#TabLineSel#'
+			else
+				str = '%#TabLine#'
+			end
+			local buffer = vim.api.nvim_win_get_buf(vim.api.nvim_tabpage_get_win(tab))
+			return
+			    table.concat {
+				    str,
+				    "%", tab, 'T',
+				    get_formated_bufname(buffer),
+				    " %", tab, 'XX'
+			    }
+		end, tabs)
+		local tabline = table.concat(format, " ")
+
+		return tabline .. '%#TabLineFill#%T'
+	end,
+
+	column = function()
+		local col = {}
+		if vim.opt.foldenable:get() then
+			local foldchar = " "
+			local hl = vim.fn.line(".") == vim.v.lnum and "CursorLineFold#" or "FoldColumn#"
+			if vim.v.virtnum == 0 and vim.fn.foldlevel(vim.v.lnum)
+			    and vim.fn.foldlevel(vim.v.lnum) > vim.fn.foldlevel(vim.v.lnum - 1) then
+				foldchar = vim.fn.foldclosed(vim.v.lnum) == -1 and "⌵" or "›"
+			end
+
+			foldchar = "%#" .. hl .. foldchar .. "%*"
+			table.insert(col, foldchar)
+		end
+
+		if vim.opt.number:get() or vim.opt.relativenumber:get() then
+			local linenr = " "
+			if vim.v.virtnum == 0 then
+				if vim.opt.number:get() and not vim.opt.relativenumber:get() then
+					linenr = vim.v.lnum
+				elseif not vim.opt.number:get() and vim.opt.relativenumber:get() then
+					linenr = vim.v.relnum
+				else
+					linenr = vim.v.relnum ~= 0 and vim.v.relnum or vim.v.lnum
+				end
+			end
+			linenr = "%=" .. linenr
+			table.insert(col, linenr)
+		end
+
+		table.insert(col, "%s")
+		return table.concat(col, "")
+	end
+}
 
-require'nvim-treesitter.configs'.setup {
+require 'nvim-treesitter.configs'.setup {
 	highlight = {
 		enable = true,
 	},
 	indent = { enable = true },
 	auto_install = true,
-	ensure_installed = { "vimdoc", "lua" }
 }
 
-require'lspconfig'.clangd.setup{}
-require'lspconfig'.tsserver.setup{}
-require'lspconfig'.eslint.setup{}
-require'lspconfig'.html.setup{}
-require'lspconfig'.cssls.setup{}
-require'lspconfig'.jsonls.setup{}
-require'lspconfig'.pyright.setup{}
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
+
+require("conform").setup {
+	formatters_by_ft = {
+		python = { "isort", "black" },
+	},
+}
+vim.opt.formatexpr = "v:lua.require'conform'.formatexpr()"
+vim.keymap.set('n', '<leader>f', function()
+	require('conform').format { async = true, lsp_format = "fallback", }
+end)
+vim.api.nvim_create_user_command("Format", function(args)
+	local range = nil
+	if args.count ~= -1 then
+		local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
+		range = {
+			start = { args.line1, 0 },
+			["end"] = { args.line2, end_line:len() },
+		}
+	end
+	require("conform").format({ async = true, lsp_format = "fallback", range = range })
+end, { range = true })
+
+vim.api.nvim_create_user_command("Scratch", function(args)
+	local buf = vim.api.nvim_create_buf(true, true)
+	print(vim.inspect(args))
+	if #args.fargs then
+		vim.api.nvim_buf_set_name(buf, args.fargs[1])
+	end
+end, { nargs = '?', bar = true })
+
+vim.keymap.set('n', '<leader>b', function()
+	local bufs = vim.tbl_filter(
+		function(buffer)
+			return vim.bo[buffer].buflisted
+		end,
+		vim.api.nvim_list_bufs()
+	)
+	vim.ui.select(bufs, {
+		prompt = 'Buffer: ',
+		format_item = get_formated_bufname
+	}, function(result)
+		if result then
+			vim.api.nvim_set_current_buf(result)
+		end
+	end)
+end)
 
-vim.keymap.set('i', '<C-Space>', '<C-x><C-o>')
-vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
-vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+vim.keymap.set('n', '<leader>t', function()
+	local tabs = vim.api.nvim_list_tabpages()
+	vim.ui.select(tabs, {
+		prompt = 'Tab: ',
+		format_item = function(tab)
+			local buffer = vim.api.nvim_win_get_buf(vim.api.nvim_tabpage_get_win(tab))
+			return get_formated_bufname(buffer)
+		end
+	}, function(result)
+		if result then
+			vim.api.nvim_set_current_tabpage(result)
+		end
+	end)
+end)
 
 vim.api.nvim_create_autocmd('LspAttach', {
 	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
@@ -55,20 +247,92 @@ vim.api.nvim_create_autocmd('LspAttach', {
 		local opts = { buffer = ev.buf }
 		vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
 		vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
-		vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
 		vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
 		vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-		vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
-		vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
-		vim.keymap.set('n', '<space>wl', function()
-			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+		vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+		vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+		vim.keymap.set('n', '<leader>wl', function()
+			local dir = vim.lsp.buf.list_workspace_folders()
+			vim.ui.select(dir, {
+				prompt = 'Workspace Dir: ',
+			}, function(result)
+				if result then
+					vim.api.nvim_set_current_dir(result)
+				end
+			end)
 		end, opts)
-		vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
-		vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+		vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+		vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
 		vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
 		vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-		vim.keymap.set('n', '<space>f', function()
-			vim.lsp.buf.format { async = true }
-		end, opts)
+
+		vim.lsp.inlay_hint.enable()
 	end,
 })
+
+local capabilities = vim.tbl_deep_extend(
+	"force",
+	{},
+	vim.lsp.protocol.make_client_capabilities(),
+	require('cmp_nvim_lsp').default_capabilities()
+)
+
+require('mason').setup {}
+require('mason-lspconfig').setup {
+	ensure_installed = { 'lua_ls' },
+	handlers = {
+		function(server_name)
+			require("lspconfig")[server_name].setup {
+				capabilities = capabilities
+			}
+		end,
+		lua_ls = function()
+			require("lspconfig").lua_ls.setup {
+				settings = {
+					Lua = {
+						completion = {
+							callSnippet = 'Replace',
+						},
+						diagnostics = { disable = { 'missing-fields' } },
+					},
+				}
+			}
+		end,
+		rust_analyzer = function() end,
+		clangd = function()
+			require("lspconfig").clangd.setup {
+				capabilities = capabilities,
+				on_attach = function()
+					require("clangd_extensions.inlay_hints").setup_autocmd()
+					require("clangd_extensions.inlay_hints").set_inlay_hints()
+				end
+			}
+		end
+	}
+}
+
+local cmp = require('cmp')
+local cmp_select = { behavior = cmp.SelectBehavior.Select }
+
+cmp.setup({
+	snippet = {
+		expand = function(args)
+			vim.snippet.expand(args.body)
+		end,
+	},
+	mapping = cmp.mapping.preset.insert({
+		['<Up>'] = cmp.mapping.select_prev_item(cmp_select),
+		['<Down>'] = cmp.mapping.select_next_item(cmp_select),
+	}),
+	sources = cmp.config.sources({
+		{
+			name = 'lazydev',
+			group_index = 0,
+		},
+		{ name = 'nvim_lsp' },
+	}, {
+		{ name = 'buffer' },
+	})
+})
+
+require("fidget").setup {}