diff --git a/deploy.sh b/deploy.sh index 18995cf..a3bb989 100755 --- a/deploy.sh +++ b/deploy.sh @@ -17,6 +17,7 @@ declare -A configs=( ["nvim/snippets"]="$HOME/.config/nvim/" ["tmux.conf"]="$HOME/.tmux.conf" ["wezterm/wezterm.lua"]="$HOME/.config/wezterm/wezterm.lua" + ["gitconfig"]="$HOME/.gitconfig" ) declare -a config_directories=( diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..7847182 --- /dev/null +++ b/gitconfig @@ -0,0 +1,41 @@ +[push] + default = simple + +[core] + autocrlf = input + +[filter "lfs"] + clean = git-lfs clean -- %f + process = git-lfs filter-process + required = true + smudge = git-lfs smudge -- %f + +[pull] + rebase = false + +[init] + defaultBranch = main + +[alias] + c = commit + d = diff + dl = diff HEAD^ HEAD + ds = diff --staged + l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit + s = status + branches = branch -avv + staash = stash --all + supdate = submodule update --remote + srupdate = submodule update --recursive + +[merge] + tool = nvimdiff + +[core] + editor = nvim + +[rerere] + enabled = true + +[include] + path = ~/.config/git/local diff --git a/nvim/lua/plugins/language_support.lua b/nvim/lua/plugins/language_support.lua index 63c5c33..2f0c747 100644 --- a/nvim/lua/plugins/language_support.lua +++ b/nvim/lua/plugins/language_support.lua @@ -1,7 +1,7 @@ -- Treesitter local rocks_path = os.getenv('HOME') .. "/.luarocks/lib/luarocks/rocks-5.1" --- Pick up the installed +-- Pick up the installed parsers in the install dir for _, parser_dir in ipairs(vim.fn.glob(rocks_path .. '/tree-sitter-*/*/', true, true)) do vim.opt.runtimepath:prepend(parser_dir) end