diff --git a/dot_config/git/config b/dot_config/git/config index 8be12e8..e4aaccb 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -18,7 +18,7 @@ autostash = false [core] - pager = delta + pager = less [delta] side-by-side = true diff --git a/dot_config/nvim/lua/configs/lsp.lua b/dot_config/nvim/lua/configs/lsp.lua index ae1555d..7157471 100644 --- a/dot_config/nvim/lua/configs/lsp.lua +++ b/dot_config/nvim/lua/configs/lsp.lua @@ -36,7 +36,17 @@ function M.setup() -- Use a loop to conveniently both setup defined servers -- and map buffer local keybindings when the language server attaches - local servers = { 'phpactor', 'gopls', 'clangd', 'zls', 'hls', 'tsserver', 'sumneko_lua', 'perlls' } + local servers = { + 'phpactor', + 'gopls', + 'clangd', + 'zls', + 'hls', + 'tsserver', + 'sumneko_lua', + 'perlls', + 'rust_analyzer', + } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { on_attach = M.on_attach, @@ -53,8 +63,8 @@ function M.setup() return u.search_ancestors(startpath, function(path) return not string.find(path, '/vendor/') and ( u.path.exists(u.path.join(path, 'composer.json')) - or u.path.exists(u.path.join(path, '.git')) - ) + or u.path.exists(u.path.join(path, '.git')) + ) end) end }