diff --git a/git/gitconfig b/git/gitconfig new file mode 100644 index 0000000..c580dd2 --- /dev/null +++ b/git/gitconfig @@ -0,0 +1,44 @@ +# This is Git's per-user configuration file. +[user] +# Please adapt and uncomment the following lines: +name = Jared Mackey + +[alias] + workprofile = !git config user.email \"jrmadm@divvypay.com\" && git config user.signingkey CCF3E715CED89BFA + homeprofile = !git config user.email \"jared@mackey.tech\" && git config user.signingkey 0C5ED94391419E3E + cleanup = !"git fetch -p && for branch in $(git branch -vv | grep ': gone]' | awk '{print $1}'); do git branch -D $branch; done" + up = pull + undo = reset HEAD~1 --mixed + ignore = update-index --assume-unchanged + unignore = update-index --no-assume-unchanged + ignored = !git ls-files -v | grep "^[[:lower:]]" + yeet = push --force-with-lease + anew = push -u origin HEAD + +[commit] + gpgsign = true +[gpg] + program = gpg2 +[rerere] + enabled = true + autoupdate = true +[fetch] + prune = true +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[pull] + rebase = true + autostash = true +[rebase] + autostash = true +[core] + excludesfile = /home/jared/.config/git/gitignore + editor = nvim +[push] + pushOption = merge_request.label=impact::low + pushOption = merge_request.create +[init] + defaultBranch = main diff --git a/git/gitignore b/git/gitignore new file mode 100644 index 0000000..ad54804 --- /dev/null +++ b/git/gitignore @@ -0,0 +1,3 @@ +.envrc +.elixir_ls +packer_compiled.vim diff --git a/git/init.sls b/git/init.sls new file mode 100644 index 0000000..380d92a --- /dev/null +++ b/git/init.sls @@ -0,0 +1,11 @@ +gitconfig: + file.managed: + - name: /home/jared/.config/git/config + - source: salt://git/gitconfig + - user: jared + - makedirs: true + +gitignore: + file.managed: + - name: /home/jared/.config/git/gitignore + - source: salt://git/gitignore diff --git a/top.sls b/top.sls index 2d60674..72346d2 100644 --- a/top.sls +++ b/top.sls @@ -1,5 +1,6 @@ base: "*": + - git - kitty - nvim