diff --git a/gitconfig b/gitconfig index 5b552ab..e6e2302 100644 --- a/gitconfig +++ b/gitconfig @@ -40,7 +40,4 @@ [include] path = ~/.config/git/local -[commit] - gpgsign = true - # vim: ft=gitconfig diff --git a/nvim/after/ftplugin/r.lua b/nvim/after/ftplugin/r.lua new file mode 100644 index 0000000..de73191 --- /dev/null +++ b/nvim/after/ftplugin/r.lua @@ -0,0 +1 @@ +vim.bo.shiftwidth=2 diff --git a/nvim/lua/plugins/language_support.lua b/nvim/lua/plugins/language_support.lua index 2f0c747..c577c33 100644 --- a/nvim/lua/plugins/language_support.lua +++ b/nvim/lua/plugins/language_support.lua @@ -57,8 +57,8 @@ vim.api.nvim_create_autocmd('LspAttach', { local bufnr = args.buf local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', '', vim.diagnostic.goto_prev, bufopts) - vim.keymap.set('n', '', vim.diagnostic.goto_next, bufopts) + vim.keymap.set('n', '', function() vim.diagnostic.jump({count=-1, float=true}) end, bufopts) + vim.keymap.set('n', '', function() vim.diagnostic.jump({count=1, float=true}) end, bufopts) vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, bufopts) vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) @@ -76,3 +76,4 @@ vim.api.nvim_create_autocmd('LspAttach', { -- Enable LSP engines -- vim.lsp.enable('clangd') vim.lsp.enable('gdscript') +vim.lsp.enable('r_language_server') diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 03ef825..c4e20ca 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -11,7 +11,6 @@ vim.opt.fileformat = 'unix' -- Explicitly s vim.opt.fillchars = 'fold: ' -- Sets the character that fills in a fold line (removes the dots) vim.opt.foldcolumn = '0' -- Disables the foldcolumn vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- Uses Treesitter to determine where code folding should occur -vim.opt.foldlevel = 10 -- Sets the initial level at which folds will be closed vim.opt.foldlevelstart = 4 -- Sets the initial fold level vim.opt.foldmethod = 'expr' -- Attempt to use the syntax of a file to set folds. vim.opt.foldnestmax = 4 -- Maximum level of fold nesting