From fb31b7b917a8e8c7b9f666e0fd6dc315fac5964a Mon Sep 17 00:00:00 2001 From: Jacob Bohanon Date: Tue, 8 Nov 2022 13:10:59 -0500 Subject: [PATCH] mbp changes --- .gitconfig | 2 ++ nvim/init.vim | 10 +++++++++- zsh/.zshrc | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 0e5dca2..4996e90 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,3 +7,5 @@ sort = version:refname [init] defaultBranch = master +[pull] + rebase = false diff --git a/nvim/init.vim b/nvim/init.vim index 76a8421..e4e5dd3 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -120,6 +120,7 @@ tnoremap nnoremap ee :NvimTreeFindFileToggle nnoremap h lua require("harpoon.mark").add_file() nnoremap / :Commentary +vnoremap / :Commentary vnoremap J :m '>+1gv=gv vnoremap K :m '<-2gv=gv @@ -205,6 +206,14 @@ require('lspconfig')['gopls'].setup{ on_attach = on_attach, capabilities = capabilities, } +require('lspconfig')['pyright'].setup{ + on_attach = on_attach, + capabilities = capabilities, +} +require('lspconfig')['tsserver'].setup{ + on_attach = on_attach, + capabilities = capabilities, +} EOF lua <