diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/core/init.lua | 31 | ||||
| -rw-r--r-- | lua/plugins/lsp/efm-config.lua | 46 |
2 files changed, 30 insertions, 47 deletions
diff --git a/lua/core/init.lua b/lua/core/init.lua index 16dfab5..94c079c 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -1,6 +1,12 @@ ----------------------------------------------------------- -- General ----------------------------------------------------------- +-- Force undercurl support +-- https://vimdoc.sourceforge.net/htmldoc/term.html#t_Cs +-- https://vimdoc.sourceforge.net/htmldoc/term.html#t_Ce +vim.cmd([[let &t_Cs = "\e[4:3m"]]) +vim.cmd([[let &t_Ce = "\e[4:0m"]]) + vim.opt.mouse = "a" -- Enable mouse support vim.opt.clipboard = "unnamedplus" -- Copy/paste to system clipboard vim.opt.termguicolors = true -- Enable 24-bit RGB colors @@ -16,15 +22,12 @@ vim.opt.colorcolumn = "80" vim.opt.cursorline = true vim.opt.foldlevelstart = 99 vim.opt.showtabline = 1 -vim.opt.laststatus = 3 -- Single status line across all buffers +vim.opt.laststatus = 1 vim.opt.undofile = true vim.opt.list = true -- Show some invisible characters like tabs vim.opt.undodir = vim.fn.stdpath("data") .. "/undo" vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" --- TODO make it pretty with the highlights ---vim.opt.winbar = '%!luaeval("_winbar()")' -- The winbar text, I don't know if it is possible to embed it directly here :( ---vim.opt.winbar = "%=%m %t%=" ----------------------------------------------------------- -- Tabs, indent ----------------------------------------------------------- @@ -43,24 +46,4 @@ vim.api.nvim_set_keymap("t", "kj", "<Esc>", {}) -- Use kj to exit terminal mode vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", { noremap = true }) -- Use Esc to exit terminal mode -vim.api.nvim_set_keymap("i", "<C-t>", "<Esc>:tabnew<CR>", {}) -- New tab -vim.api.nvim_set_keymap("n", "<C-t>", ":tabnew<CR>", {}) -- New tab - --- No arrow keys for movement ---nnoremap <up> <nop> ---nnoremap <down> <nop> ---inoremap <up> <nop> ---inoremap <down> <nop> ---inoremap <left> <nop> ---inoremap <right> <nop> - ---Left and right to switch buffers ---nnoremap <left> :bp<CR> ---nnoremap <right> :bn<CR> - ---_winbar = function() -- My custom winbar text ---local filename = vim.fn.expand('%') ---return string.gsub(filename, 'term://.*:', '') ---end - require("core.disable_builtin") diff --git a/lua/plugins/lsp/efm-config.lua b/lua/plugins/lsp/efm-config.lua index a6d8e40..bf3c330 100644 --- a/lua/plugins/lsp/efm-config.lua +++ b/lua/plugins/lsp/efm-config.lua @@ -1,26 +1,26 @@ return { - { - "creativenull/efmls-configs-nvim", - dependencies = { "neovim/nvim-lspconfig" }, - }, + -- { + -- "creativenull/efmls-configs-nvim", + -- dependencies = { "neovim/nvim-lspconfig" }, + -- }, - { - "neovim/nvim-lspconfig", - opts = function(_, opts) - if type(opts) == "table" then - opts.servers = opts.servers or {} - opts.servers.efm = - vim.tbl_deep_extend("error", opts.servers.efm or {}, { - settings = { - version = 2, - rootMarkers = { ".git/" }, - }, - init_options = { - documentFormatting = true, - documentRangeFormatting = true, - }, - }) - end - end, - }, + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + if type(opts) == "table" then + opts.servers = opts.servers or {} + -- opts.servers.efm = + -- vim.tbl_deep_extend("error", opts.servers.efm or {}, { + -- settings = { + -- version = 2, + -- rootMarkers = { ".git/" }, + -- }, + -- init_options = { + -- documentFormatting = true, + -- documentRangeFormatting = true, + -- }, + -- }) + end + end, + }, } |