diff --git a/lua/plugins.lua b/lua/plugins.lua index 8357e6f..d3de1a5 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -140,7 +140,8 @@ return require("packer").startup( "hrsh7th/cmp-path", "hrsh7th/cmp-nvim-lua", "hrsh7th/cmp-emoji", - "David-Kunz/cmp-npm" + "David-Kunz/cmp-npm", + "hrsh7th/cmp-nvim-lsp-signature-help" } } use { diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 86a7a1f..b39a2c6 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -115,7 +115,8 @@ options = { -- {name = "buffer"}, {name = "emoji"}, {name = "copilot", group_index = 2}, - {name = "npm", keyword_length = 4} + {name = "npm", keyword_length = 4}, + {name = "nvim_lsp_signature_help"} } } diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua index 83f5c55..771fc1a 100644 --- a/lua/plugins/dap.lua +++ b/lua/plugins/dap.lua @@ -1,5 +1,11 @@ -- dapui -require("dapui").setup() +require("dapui").setup( + { + controls = { + enabled = false + } + } +) local dap, dapui = require("dap"), require("dapui") dap.listeners.after.event_initialized["dapui_config"] = function() dapui.open() diff --git a/lua/plugins/formatter.lua b/lua/plugins/formatter.lua index 73c3f0c..0a118c4 100644 --- a/lua/plugins/formatter.lua +++ b/lua/plugins/formatter.lua @@ -54,6 +54,15 @@ require("formatter").setup( stdin = false } end + }, + cs = { + function() + return { + exe = "dotnet", + args = {"csharpier", "--write-stdout"}, + stdin = true + } + end } } } @@ -63,17 +72,17 @@ vim.api.nvim_exec( [[ augroup FormatAutogroup autocmd! - autocmd BufWritePost *.h,*.cpp,*.rs,*.lua,*.tsx,*.ts,*.js,*.jsx,*.json FormatWrite + autocmd BufWritePost *.h,*.cpp,*.rs,*.lua,*.tsx,*.ts,*.js,*.jsx,*.json,*.cs FormatWrite augroup END ]], true ) -local formatGrp = vim.api.nvim_create_augroup("Format", {clear = true}) -vim.api.nvim_create_autocmd( - "BufWritePre", - { - pattern = "*.cs", - command = "lua vim.lsp.buf.format { async = false }", - group = formatGrp - } -) +-- local formatGrp = vim.api.nvim_create_augroup("Format", {clear = true}) +-- vim.api.nvim_create_autocmd( +-- "BufWritePre", +-- { +-- pattern = "*.cs", +-- command = "lua vim.lsp.buf.format { async = false }", +-- group = formatGrp +-- } +-- ) diff --git a/lua/plugins/heirline.lua b/lua/plugins/heirline.lua index 8235307..af5e136 100644 --- a/lua/plugins/heirline.lua +++ b/lua/plugins/heirline.lua @@ -707,6 +707,7 @@ local TabPages = { local TabLine = {TabLineOffset, BufferLine, TabPages} require "heirline".setup(StatusLines, WinBars, TabLine) +vim.o.showtabline = 2 vim.cmd([[au FileType * if index(['wipe', 'delete', 'unload'], &bufhidden) >= 0 | set nobuflisted | endif]]) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 88e9eff..1df4247 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -4,6 +4,8 @@ vim.fn.sign_define("DiagnosticSignError", {text = " ", texthl = "DiagnosticSi vim.fn.sign_define("DiagnosticSignWarn", {text = " ", texthl = "DiagnosticSignWarn"}) vim.fn.sign_define("DiagnosticSignInfo", {text = " ", texthl = "DiagnosticSignInfo"}) vim.fn.sign_define("DiagnosticSignHint", {text = "", texthl = "DiagnosticSignHint"}) +vim.fn.sign_define("DapBreakpoint", {text = " ", texthl = "DiagnosticSignError"}) +vim.fn.sign_define("DapStopped", {text = " ", texthl = "DiagnosticSignInfo"}) --- Completion Icons require("lspkind").init({})