diff options
Diffstat (limited to 'modules/neovim')
| -rw-r--r-- | modules/neovim/default.nix | 4 | ||||
| -rw-r--r-- | modules/neovim/nvim/after/ftplugin/markdown.lua | 1 | ||||
| -rw-r--r-- | modules/neovim/nvim/lua/config/lsp/init.lua | 16 | ||||
| -rw-r--r-- | modules/neovim/nvim/lua/config/settings.lua | 4 |
4 files changed, 15 insertions, 10 deletions
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 34c6e51..92f4e66 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -61,6 +61,7 @@ in tree-sitter-toml tree-sitter-markdown tree-sitter-markdown-inline + tree-sitter-tablegen ])) { @@ -95,7 +96,8 @@ in vim.cmd[[ colorscheme ${scheme.name} hi PmenuSel guifg=${scheme.base05} guibg=${scheme.base03} - hi StatusLine guibg=fg guifg=bg cterm=reverse gui=bold + " hi StatusLine guibg=fg guifg=bg cterm=reverse gui=bold + hi StatusLine guibg=bg guifg=fg hi FloatBorder guifg=${scheme.base01} hi WinSeparator guifg=${scheme.base01} hi WinBar guifg=${scheme.base03} diff --git a/modules/neovim/nvim/after/ftplugin/markdown.lua b/modules/neovim/nvim/after/ftplugin/markdown.lua index 87efc4b..322e6a2 100644 --- a/modules/neovim/nvim/after/ftplugin/markdown.lua +++ b/modules/neovim/nvim/after/ftplugin/markdown.lua @@ -6,3 +6,4 @@ vim.keymap.set({'n', 'v'}, 'n', 'g<Down>', { buffer = true }) vim.keymap.set({'n', 'v'}, 'e', 'g<Up>', { buffer = true }) vim.opt.statusline="%f" +vim.opt.conceallevel=3 diff --git a/modules/neovim/nvim/lua/config/lsp/init.lua b/modules/neovim/nvim/lua/config/lsp/init.lua index 29d015c..7ba79de 100644 --- a/modules/neovim/nvim/lua/config/lsp/init.lua +++ b/modules/neovim/nvim/lua/config/lsp/init.lua @@ -80,14 +80,14 @@ vim.api.nvim_create_autocmd("LspAttach", { callback = function(args) -- vim.lsp.inlay_hint.enable() -- end - if client:supports_method(methods.textDocument_formatting) then - vim.api.nvim_create_autocmd("BufWritePre", { - buffer = args.buf, - callback = function() - vim.lsp.buf.format({bufnr = args.buf, id = client_id}) - end - }) - end + -- if client:supports_method(methods.textDocument_formatting) then + -- vim.api.nvim_create_autocmd("BufWritePre", { + -- buffer = args.buf, + -- callback = function() + -- vim.lsp.buf.format({bufnr = args.buf, id = client_id}) + -- end + -- }) + -- end end}) -- local lspconfig = require('lspconfig') diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua index c44f0e9..54bedb0 100644 --- a/modules/neovim/nvim/lua/config/settings.lua +++ b/modules/neovim/nvim/lua/config/settings.lua @@ -16,6 +16,7 @@ vim.opt.fillchars = {eob = " "} vim.o.smd = false --vim.opt.laststatus = 3 vim.opt.laststatus=3 +vim.opt.cmdheight=0 --%-0{minwid}.{maxwid}{item -- vim.opt.statusline="%=%f%=%r %p%% « %l, %c %y" vim.opt.statusline="%f%=%p%% « %l, %c " @@ -33,7 +34,7 @@ vim.cmd[[packadd! termdebug]] vim.opt.pumheight = 6 vim.opt.expandtab = true vim.o.mouse="" -vim.o.guicursor="" +-- vim.o.guicursor="" vim.o.swapfile=false vim.opt.foldmethod = "expr" vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()" @@ -41,6 +42,7 @@ vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()" vim.opt.foldlevel = 99 -- vim.cmd[[syntax off]] -- vim.o.winborder = 'rounded' breaks telescope + vim.cmd[[set wildchar=<C-n>]] -- vim.api.nvim_set_hl(0, 'Comment', {}) vim.api.nvim_set_hl(0, 'Constant', {}) |