diff --git a/.bashrc b/.bashrc index 68bbd70..379bb0f 100644 --- a/.bashrc +++ b/.bashrc @@ -76,12 +76,20 @@ export HSA_OVERRIDE_GFX_VERSION=10.3.0 # RX 6650 XT # Just export JUST_UNSTABLE=1 +################################## +## Git ## +################################## +case "$HOSTNAME" in + Snoweuph-Kinoite)key=A494330694B208EF;; + fedorabook-pro)key=CFB8E8CF1F0BA9FA2A1840CA0021ADF278B2F49B;; +esac +alias git="git -c user.signingKey='$key'" + ################################## ## Aliases ## ################################## - -alias nvim-conf="nvim ~/.config/nvim" -alias bash-conf="nvim #/.bashrc" +alias edit-conf-nvim="nvim ~/.config/nvim" +alias edit-conf-bash="nvim ~/.bashrc" alias todo="nvim ~/Documents/Notes/Todo.md" alias nano="nvim" diff --git a/.config/.gitignore b/.config/.gitignore index 022238e..6d90508 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -12,3 +12,6 @@ # neovim !/nvim/ + +# git +!/git/ diff --git a/.gitconfig b/.gitconfig index 5874531..337b5ce 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,28 +1,32 @@ [user] name = Snoweuph email = snow+git@euph.email - signingKey = A494330694B208EF -[user] - name = Snoweuph - email = snow+git-fedorabook@euph.email - signingKey = CFB8E8CF1F0BA9FA2A1840CA0021ADF278B2F49B [commit] gpgSign = true + [push] autosetupremote = true + [help] autoCorrect = prompt + [core] editor = nvim pager = /usr/share/git-core/contrib/diff-highlight | less commentChar = ";" + [diff] colorMoved = default + [fetch] prune = true prunetags = true + [alias] adog = log --all --decorate --oneline --graph - fl = push --force-with-lease + fl = push --force-with-lease + prune-branches = "!git fetch -p && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs -r git branch -d" + show-last-commit = diff HEAD^ + [interactive] diffFilter = /usr/share/git-core/contrib/diff-highlight