script: default to rebase

deploy.sh

@@ -5,6 +5,7 @@ git config --global user.name "trianta"
 git config --global user.email "gregcraw2001@gmail.com"
 git config --global gpg.format ssh
 git config --global user.signingkey ~/.ssh/id_ed25519.pub
+git config --global pull.rebase true
 
 
 echo "Getting tools for environment..."

nvim/after/plugin/settings.lua

@@ -38,7 +38,7 @@ cmp.setup({
 -- Treesitter
 vim.opt.runtimepath:append("~/.local/share/nvim/parsers")
 
-require('nvim-treesitter.configs').setup {
+require('nvim-treesitter').setup {
     ensure_installed = {
         "c", "lua", "vim", "c_sharp", "cpp", "python", "json", "json5",
         "bibtex", "query" },