diff --git a/gitconfig b/gitconfig index 4298882..edc134c 100644 --- a/gitconfig +++ b/gitconfig @@ -31,6 +31,7 @@ fixom = !sh -c 'git fetch && git rebase -i --autosquash origin/master' fixup = rebase -i --autosquash l = log + l1 = log --oneline ll = log --oneline -n 5 lp = log -p lm = logme @@ -52,6 +53,7 @@ rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u} rc = rebase --continue re = rebase + rels = !git rebase $(git branch | fzf) rh = reset --hard rom = !sh -c 'git fetch && git rebase origin/master' rr = !sh -c 'git fetch && git reset --hard $(git rb)' diff --git a/nvimrc b/nvimrc index fabcfb5..39cf3a4 100644 --- a/nvimrc +++ b/nvimrc @@ -510,7 +510,7 @@ require 'nvim-treesitter.configs'.setup { enable = true, }, indent = { - enable = true, + enable = false, }, textobjects = { select = { @@ -552,7 +552,7 @@ require 'nvim-treesitter.configs'.setup { }, refactor = { highlight_definitions = { enable = true }, - highlight_current_scope = { enable = true }, + highlight_current_scope = { enable = false }, smart_rename = { enable = true, keymaps = {