diff options
| -rw-r--r-- | .bash/aliases.bash | 3 | ||||
| -rw-r--r-- | .bash/prompt.bash | 8 | ||||
| -rw-r--r-- | .gitconfig | 34 | ||||
| -rw-r--r-- | .gnupg/gpg-agent.conf | 10 | ||||
| -rw-r--r-- | .vimrc | 6 | ||||
| -rwxr-xr-x | bin/git-update-all | 17 | ||||
| m--------- | tmux-gpakosz | 0 |
7 files changed, 55 insertions, 23 deletions
diff --git a/.bash/aliases.bash b/.bash/aliases.bash index dff312a..dd36794 100644 --- a/.bash/aliases.bash +++ b/.bash/aliases.bash @@ -227,6 +227,9 @@ for cmmd in batcat bat; do break fi done +if command -v 'thefuck' > /dev/null; then + alias wtf='thefuck $(fc -nl -1)' +fi # Flake8. Nice linter, but... # They kneeled to USER STUPIDITY when it comes to configuration. Wut? # https://flake8.pycqa.org/en/latest/release-notes/4.0.0.html#backwards-incompatible-changes diff --git a/.bash/prompt.bash b/.bash/prompt.bash index 58ecd11..9adc360 100644 --- a/.bash/prompt.bash +++ b/.bash/prompt.bash @@ -33,7 +33,7 @@ case "$MYUID" in fi ;; arch) FGC2="fgcolor 24";FGC3="fgcolor 240";; - redhat) FGC1="fgcolor 23";FGC2="fgcolor 88";FGC3="fgcolor 203";; + redhat|rhel) FGC1="fgcolor 23";FGC2="fgcolor 88";FGC3="fgcolor 203";; fedora) FGC1="fgcolor 160";FGC2="fgcolor 88";FGC3="fgcolor 203";; # with the advent of Rocky, we'll match the time to SUSE's blue and the hostname to # the colour of Geeko: @@ -66,7 +66,7 @@ case "$MYUID" in fi ;; rasp*) FGC2="fgcolor 253";FGC3="fgcolor 126";; - rocky) FGC2="fgcolor 22";FGC3="fgcolor 41";; + rocky) FGC2="fgcolor 240";FGC3="fgcolor 41";; alma*) FGC1="fgcolor 28";FGC2="fgcolor 88";FGC3="fgcolor 39";; sunos) FGC2="fgcolor 75";FGC3="fgcolor 130";; *) FGC2="fgcolor 240";FGC3="fgcolor 244";; @@ -88,7 +88,7 @@ case "$MYUID" in fi ;; arch) FGC1="fgcolor 24";FGC3="fgcolor 239";; - redhat) FGC1="fgcolor 23";FGC3="fgcolor 88";; + redhat|rhel) FGC1="fgcolor 23";FGC3="fgcolor 88";; fedora) FGC1="fgcolor 88";FGC3="fgcolor 203";; #*suse|aix) FGC1="fgcolor 22";FGC3="fgcolor 41";; *sles*) FGC1="fgcolor 22";FGC3="fgcolor 83";; @@ -119,7 +119,7 @@ case "$MYUID" in fi ;; rasp*) FGC1="fgcolor 53";FGC3="fgcolor 126";; - rocky) FGC1="fgcolor 22";FGC3="fgcolor 41";; + rocky) FGC1="fgcolor 240";FGC3="fgcolor 41";; alma*) FGC1="fgcolor 124";FGC2="fgcolor 229";FGC3="fgcolor 39";; sunos) FGC1="fgcolor 75";FGC3="fgcolor 130";; *) FGC1="fgcolor 240";FGC3="fgcolor 244";; @@ -1,3 +1,4 @@ +# vim:syntax=gitconfig:ts=4 [color] diff = auto status = auto @@ -65,39 +66,44 @@ rhh = reset --hard HEAD sl = shortlog -s sls = "!git shortlog -s | cut -f1 | spark" - gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -" + gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -" cps = cherry-pick -S force = push --force-with-lease pf = push --force-with-lease [push] - default = simple + default = simple [pretty] - ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers) + ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers) [core] - editor = vim - fileMode = true - hooksPath = ~/git-hooks + editor = vim + fileMode = true + hooksPath = ~/git-hooks + abbrev = 4 [merge] - tool = vimdiff + tool = vimdiff [mergetool] - keepBackup = false + keepBackup = false [gui] - fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 - fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 + fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 + fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 [commit] - gpgsign = false + gpgsign = false +[tag] + gpgsign = false #[gpg] # program = /usr/bin/gpg2 [http] #proxy = http://10.0.0.1:3128/ [pull] - rebase = false + rebase = false [pack] windowMemory = 1024m [credential] - helper = !type pass-git-helper > /dev/null && pass-git-helper $@ - useHttpPath = true + helper = !type pass-git-helper > /dev/null && pass-git-helper $@ + useHttpPath = true [init] # we don't adhere to extremists trying to alter language, this was a bad idea pre-1990 and it still is. # this term was not meant racially or sexually abusive, so the convention remains. defaultBranch = master +[safe] + directory = /opt/puppetlabs/pdk/share/cache/pdk-templates.git diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 1758bd0..2327757 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -1,10 +1,16 @@ ignore-cache-for-signing #pinentry-program /usr/bin/pinentry-gtk-2 pinentry-program /usr/bin/pinentry-curses +pinentry-timeout 15 allow-loopback-pinentry allow-preset-passphrase disable-scdaemon -#max-cache-ttl 900 -#default-cache-ttl 900 enable-ssh-support extra-socket /run/user/21337/gnupg/S.gpg-agent-extra +# programs like gnome-keyring would define their own values like +# pin timeout. That's going hydra/snowflake - disallow: +no-allow-external-cache +# invalidate after n seconds, reaccessing resets timer +default-cache-ttl 10 +# invalidate after n seconds even if timer has been reset in the meantime +max-cache-ttl 60 @@ -5,10 +5,10 @@ set showmode set showmatch set hlsearch set undolevels=64 -" who came up with the 'brilliant' idea that make mouse input relevant for vim +" who came up with the 'brilliant' idea that makes mouse input relevant for vim " inside a terminal AS DEFAULT? -set mouse= -set ttymouse= +set mouse="" +set ttymouse="" set shiftwidth=0 set tabstop=4 set ignorecase diff --git a/bin/git-update-all b/bin/git-update-all new file mode 100755 index 0000000..d3f6033 --- /dev/null +++ b/bin/git-update-all @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +GITBIN='/usr/bin/git' + +# 1. Pull the current branch and also tags, and prune references vanished from remote +"$GITBIN" pull -tpf || exit 110 +# 2. Pull all branches existing locally +mybr="$("$GITBIN" branch --show-current)" +while read -r branch +do + ( + printf '\033[1m\033[3mSwitching to %b.\033[0m\n' "$branch" + "$GITBIN" switch "$branch" &&\ + "$GITBIN" pull &&\ + "$GITBIN" switch "$mybr" + ) +done < <("$GITBIN" branch --list|awk '{print $NF}'|grep -vP "^${mybr}\$") diff --git a/tmux-gpakosz b/tmux-gpakosz -Subproject 9cf49731cd785b76cf792046feed0e827545791 +Subproject e25f45ed3df5a83339fcfd99d256b0d1958d646 |