git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bash/aliases.bash45
-rw-r--r--.bash/exec.bash17
-rw-r--r--.bash/postexec.bash15
-rw-r--r--.bash/prompt.bash56
-rw-r--r--.bash/vars.bash11
-rw-r--r--.config/chromium/NativeMessagingHosts/com.github.browserpass.native.json11
-rw-r--r--.config/chromium/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json10
l---------.config/flake81
-rw-r--r--.gitconfig42
-rw-r--r--.gitignore5
-rw-r--r--.gnupg/gpg-agent.conf8
l---------.librewolf/native-messaging-hosts/com.github.browserpass.native.json1
l---------.librewolf/native-messaging-hosts/org.keepassxc.keepassxc_browser.json1
-rw-r--r--.mozilla/native-messaging-hosts/com.github.browserpass.native.json7
-rw-r--r--.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json9
-rw-r--r--.vimrc6
l---------.waterfox/native-messaging-hosts/com.github.browserpass.native.json1
l---------.waterfox/native-messaging-hosts/org.keepassxc.keepassxc_browser.json1
m---------tmux-gpakosz0
19 files changed, 194 insertions, 53 deletions
diff --git a/.bash/aliases.bash b/.bash/aliases.bash
index bcdfae2..dff312a 100644
--- a/.bash/aliases.bash
+++ b/.bash/aliases.bash
@@ -6,8 +6,25 @@
if [ "$TERM" != "dumb" ];then
eval "$(dircolors -b)"
alias ls="ls --color=auto"
- alias grep="grep --color=auto"
- alias egrep="egrep --color=auto"
+ case "$OSNAME" in
+ 'sunos') ;;
+ *)
+ alias grep="grep --color=auto"
+ alias egrep="egrep --color=auto"
+ ;;
+ esac
+fi
+# shellcheck disable=SC2139
+if [ -n "$EDITOR" ]; then
+ alias editor="$EDITOR"
+elif [ -n "$VISUAL" ]; then
+ alias editor="$VISUAL"
+elif [ -x "/usr/bin/vim" ]; then
+ alias editor="/usr/bin/vim"
+elif [ -x "/usr/bin/vi" ]; then
+ alias editor="/usr/bin/vi"
+else
+ alias editor="/usr/bin/edit"
fi
alias lst="ls -l --time-style=full-iso"
alias cls=' echo -ne "\033c"'
@@ -15,7 +32,7 @@ alias pip-update="sudo pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xa
alias matrix='cmatrix -sbu6 -C cyan'
alias tbc='tbclock -e -H2 -M7 -S3'
command -v colordiff >/dev/null 2>&1&&alias diff="colordiff"
-command -v colormake >/dev/null 2>&1&&alias make="colormake"
+#command -v colormake >/dev/null 2>&1&&alias make="colormake"
alias perllint="perl -Mstrict -Mdiagnostics -cw"
alias scredit='gimp "${SCRSHDIR}/$(ls -rt1 $SCRSHDIR/|tail -n1)"'
alias scrview='pqiv -i "${SCRSHDIR}/$(ls -rt1 $SCRSHDIR/|tail -n1)"'
@@ -93,7 +110,9 @@ xstat() {
done
}
# ----- PACKAGE MANAGERS ----- #
-if [ -x "/usr/bin/pikaur" ];then
+if [ -x "/usr/bin/paru" ];then
+ alias pkgclean="paru --noconfirm -Sc"
+elif [ -x "/usr/bin/pikaur" ];then
alias pkgclean="pikaur --noconfirm -Sc"
elif [ -x "/usr/bin/pacman" ];then
alias pkgclean="/usr/bin/sudo /usr/bin/pacman --noconfirm -Sc"
@@ -162,6 +181,7 @@ alias certshow="certmgr -L -n"
# ----- APPLICATION CONTROL ----- #
alias browser-set='xdg-settings set default-web-browser'
alias browser-get='xdg-settings get default-web-browser'
+alias default-desktop-apps="editor ~/.config/mimeapps.list"
# ----- CONTAINERS ----- #
if command -v podman >/dev/null;then
alias pcl="podman container list"
@@ -187,12 +207,29 @@ if command -v podman >/dev/null;then
alias pnd="podman network disconnect"
alias ppd="podman pod stop"
fi
+# ----- PUPPET + RUBY ----- #
+# ...yeah, I'm mostly doing ruby stuff for Puppet, erm I mean
+# OpenVox (now that Perforce have turned the Puppet world to a burning heap of garbage)
+alias bake="bundle exec rake"
+# ----- OTHER STUFF ----- #
for cmmd in batcat bat; do
if command -v "$cmmd" > /dev/null; then
# shellcheck disable=SC2139
alias cat="${cmmd} --tabs 4 --wrap never --paging never --style 'plain,rule'"
+ # shellcheck disable=SC2139
+ alias less="${cmmd} --tabs 4 --wrap never --paging always --style 'plain,rule'"
+ alias plain-cat='/usr/bin/cat'
+ alias plc='/usr/bin/cat'
+ alias plain-less='/usr/bin/less'
+ alias pll='/usr/bin/less'
export MANPAGER="sh -c 'col -bx | ${cmmd} -l man -p'"
export MANROFFOPT="-c"
break
fi
done
+# 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
+# --> https://github.com/pycqa/flake8/pull/1404
+# Users were confused, so ~/.config/flake8 is not supported anymore. lelkek.
+alias flake8='flake8 --config ${HOME}/.config/flake8'
diff --git a/.bash/exec.bash b/.bash/exec.bash
index a59df2a..aeba7ca 100644
--- a/.bash/exec.bash
+++ b/.bash/exec.bash
@@ -7,7 +7,20 @@ set bell-style visible
# start ssh agent. this script will not try to run a new instance
# (unless we specified -f, which we don't).
-if echo "${SSHAGH[@]}" | grep -F --word-regexp "$(hostname -f)" > /dev/null;then
+SSHRUN=0
+case "$OSNAME" in
+ 'sunos')
+ if echo "${SSHAGH[@]}" | grep -E "^$(cat /etc/nodename)\$" > /dev/null; then
+ SSHRUN=1
+ fi
+ ;;
+ *)
+ if echo "${SSHAGH[@]}" | grep -F --word-regexp "$(hostname -f)" > /dev/null;then
+ SSHRUN=1
+ fi
+ ;;
+esac
+if [ "$SSHRUN" -eq 1 ]; then
# do not launch from SSH session, conflicts with user logging on locally afterwards
if [ -z "$SSH_TTY" ];then
"$HOME/bin/ssh-agent-launcher" -q
@@ -20,4 +33,4 @@ fi
# because on some hosts the login path is fucked, unset in .local
# if it causes irritation:
-cd ~ || cd || exit 151
+cd ~ || cd || return 151
diff --git a/.bash/postexec.bash b/.bash/postexec.bash
index 6137814..8beee31 100644
--- a/.bash/postexec.bash
+++ b/.bash/postexec.bash
@@ -1,9 +1,18 @@
declare -x SSH_AUTH_SOCK SSH_AGENT_PID
if [ -n "$SSHENVFILE" ] && [ -r "$SSHENVFILE" ];then
if source "$SSHENVFILE"; then
- if echo "${SSHAGH[@]}"|tr ' ' '\n'|grep -P "^$(hostname -f)$" > /dev/null;then
- add-sshagent-init
- fi
+ case "$OSNAME" in
+ 'sunos')
+ if echo "${SSHAGH[@]}"|tr ' ' '\n'|grep -E "^$(cat /etc/nodename)\$"; then
+ add-sshagent-init
+ fi
+ ;;
+ *)
+ if echo "${SSHAGH[@]}"|tr ' ' '\n'|grep -P "^$(hostname -f)\$" > /dev/null;then
+ add-sshagent-init
+ fi
+ ;;
+ esac
fi
fi
for gitpsrc in "/usr/share/git/git-prompt.sh" "/usr/local/share/git/git-prompt.sh" \
diff --git a/.bash/prompt.bash b/.bash/prompt.bash
index 8c4dbaa..9adc360 100644
--- a/.bash/prompt.bash
+++ b/.bash/prompt.bash
@@ -4,20 +4,22 @@
# ----- PROMPT COLOURS ----- #
fgcolor () {
#echo "\\[\\033[38;5;"$1"m\\]"
- echo "\033[38;5;${1}m"
+ printf '\033[38;5;%bm' "$1"
}
fgtcolor () {
- echo "\033[38;2;$1;$2;$3m"
+ printf '\033[38;2;%b;%b;%bm' "$1" "$2" "$3"
}
bgcolor () {
#echo "\\[\\033[48;5;"$1"m\\]"
- echo "\033[48;5;${1}m"
+ printf '\033[48;5;%bm' "$1"
}
# This is Solaris bash compatible, so we cannot use + here for "at least once) but instead use the
# stupid old asterisk (*). Well, here hetting "no digits" practically won't hurt.
MYUID="$(id|sed 's/.*uid=\([0-9]*\).*/\1/g')";export MYUID
# ...because "empty" will hit the "any" condition in the end :)
-OSMAJVER="$(grep '^VERSION_ID' /etc/os-release|awk -F= '{print $NF}'|sed 's/"//g'|awk -F\. '{print $1}')"
+if [ -r '/etc/os-release' ]; then
+ OSMAJVER="$(grep '^VERSION_ID' /etc/os-release 2>/dev/null|awk -F= '{print $NF}'|sed 's/"//g'|awk -F\. '{print $1}')"
+fi
case "$MYUID" in
0)
FGC1="fgcolor 88"
@@ -31,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:
@@ -45,20 +47,28 @@ case "$MYUID" in
;;
aix) FGC2="fgcolor 238";FGC3="fgcolor 83";;
*centos*) FGC2="fgcolor 25";FGC3="fgcolor 208";;
- *solaris) FGC2="fgcolor 31";FGC3="fgcolor 124";;
+ *solaris) FGC2="fgcolor 63";FGC3="fgcolor 124";;
ubuntu)
- if [ "$OSMAJVER" -ge 22 ];then
- if printf "%b" "$TERM"|grep -P 'xterm|256' > /dev/null;then
- FGC2="fgcolor 89";FGC3="fgcolor 208"
+ if [ "$OSMAJVER" -ge 24 ];then
+ if printf "%b" "$TERM"|grep -E 'xterm|256' > /dev/null;then
+ FGC2="fgcolor 125";FGC3="fgcolor 202"
else
FGC2="fgcolor 53";FGC3="fgcolor 184"
fi
+ elif [ "$OSMAJVER" -ge 22 ];then
+ if printf "%b" "$TERM"|grep -E 'xterm|256' > /dev/null;then
+ FGC2="fgcolor 208";FGC3="fgcolor 89"
+ else
+ FGC2="fgcolor 184";FGC3="fgcolor 53"
+ fi
else
FGC2="fgcolor 130";FGC3="fgcolor 215"
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";;
esac
if [ -n "$TERMUX_APK_RELEASE" ]; then
@@ -78,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";;
@@ -90,10 +100,16 @@ case "$MYUID" in
;;
aix) FGC1="fgcolor 238";FGC3="fgcolor 83";;
*centos*) FGC1="fgcolor 25";FGC3="fgcolor 208";;
- *solaris) FGC1="fgcolor 31";FGC3="fgcolor 124";;
+ *solaris) FGC1="fgcolor 63";FGC3="fgcolor 124";;
ubuntu)
- if [ "$OSMAJVER" -ge 22 ];then
- if printf "%b" "$TERM"|grep -P 'xterm|256' > /dev/null;then
+ if [ "$OSMAJVER" -ge 24 ];then
+ if printf "%b" "$TERM"|grep -E 'xterm|256' > /dev/null;then
+ FGC1="fgcolor 125";FGC3="fgcolor 202"
+ else
+ FGC1="fgcolor 53";FGC3="fgcolor 184"
+ fi
+ elif [ "$OSMAJVER" -ge 22 ];then
+ if printf "%b" "$TERM"|grep -E 'xterm|256' > /dev/null;then
FGC1="fgcolor 89";FGC3="fgcolor 208"
else
FGC1="fgcolor 53";FGC3="fgcolor 184"
@@ -103,7 +119,9 @@ 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";;
esac
if [ -n "$TERMUX_APK_RELEASE" ]; then
@@ -125,7 +143,7 @@ fi
UHSEP="@"
[ -n "$TMUX_PANE" ]&&UHSEP="[T]"
[ -n "$BYOBU_WINDOW_NAME" ]&&UHSEP="[B]"
-[ "$(hostname -s)" == "monitoring" ]&&PHN="$(hostname -f)"||PHN="$(hostname -s)"
+[ "$OSNAME" != 'sunos' ]&&[ "$(hostname -s)" == "monitoring" ]&&PHN="$(hostname -f)"||PHN="$(hostname -s)"
# ----- ASSEMBLE THE PROMPT COMMAND ADDITION ----- #
__prompt_command() {
@@ -139,10 +157,10 @@ __prompt_command() {
fi
case "$MYUID" in
0)
- PS1="\\# \[$(tput bold)\]\[$($FGC1)\]\\u\[$($FGC2)\]@$PHN \[$($FGC3)\]\\w \[$(tput sgr0)\]\\n"
+ PS1="\[\\033[2m\\033[3m\]\\#\[\\033[0m\] \[$(tput bold)\]\[$($FGC1)\]\\u\[$($FGC2)\]@$PHN \[$($FGC3)\]\\w \[$(tput sgr0)\]\\n"
;;
*)
- PS1="\\# \[$(tput bold)\]\[$($FGC1)\]\t \[$($FGC2)\]\\u$UHSEP\[$($FGC3)\]$PHN \\w \[$(tput sgr0)\]\\n"
+ PS1="\[\\033[2m\\033[3m\]\\#\[\\033[0m\] \[$(tput bold)\]\[$($FGC1)\]\t \[$($FGC2)\]\\u$UHSEP\[$($FGC3)\]$PHN \\w \[$(tput sgr0)\]\\n"
;;
esac
# git-completion. Sources:
@@ -155,7 +173,7 @@ __prompt_command() {
# of it. We don't like monoliths, we like modules; the latter is good practice.
# also, see postexec --> one-time sourcing of git's prompt.sh
if command -v __git_ps1 >/dev/null 2>&1;then
- GIT_PS1_SHOWCOLORHINTS=1
+ GIT_PS1_SHOWCOLORHINTS=1; export GIT_PS1_SHOWCOLORHINTS
PS1+="$(__git_ps1 "%s ")"
fi
if [ "$EXIT" -eq 0 ];then
diff --git a/.bash/vars.bash b/.bash/vars.bash
index a7bdcb5..8b99807 100644
--- a/.bash/vars.bash
+++ b/.bash/vars.bash
@@ -20,18 +20,19 @@ export SSHAGH
# ----- SHELL ----- #
for pa in "/usr/local/bin" "${HOME}/bin" "${HOME}/.local/bin" "${HOME}/go/bin";do
if [ -x "$pa" ]; then
- if ! printf "%b" "$PATH"|grep -P "^${pa}:|:${pa}:" >/dev/null;then
+ if ! printf "%b" "$PATH"|grep -E "^${pa}:|:${pa}:" >/dev/null;then
export PATH="${pa}:${PATH}"
fi
fi
done
# $OSNAME
if [ -r "/etc/os-release" ];then
- OSNAME="$(grep ^ID /etc/os-release|awk -F= '{print $NF}'|head -n1)"
+ OSNAME="$(grep ^ID /etc/os-release|awk -F= '{print $NF}'|head -n1|sed 's/"//g')"
+elif [ "$(uname -s)" == 'SunOS' ]; then OSNAME="sunos"
elif [ -r "/etc/redhat-release" ];then
- grep -P "^Red[\ ]?[Hh]at" /etc/redhat-release >/dev/null 2>&1 && OSNAME="redhat"
- grep -P "^[Ff]edora" /etc/redhat-release >/dev/null 2>&1 && OSNAME="fedora"
- grep -P "^[Cc]ent[Oo][Ss]" /etc/redhat-release >/dev/null 2>&1 && OSNAME="centos"
+ grep -E "^Red[\ ]?[Hh]at" /etc/redhat-release >/dev/null 2>&1 && OSNAME="redhat"
+ grep -E "^[Ff]edora" /etc/redhat-release >/dev/null 2>&1 && OSNAME="fedora"
+ grep -E "^[Cc]ent[Oo][Ss]" /etc/redhat-release >/dev/null 2>&1 && OSNAME="centos"
[ -z "$OSNAME" ]&&OSNAME="obsolete"
elif [ -r "/etc/SuSE-release" ];then
OSNAME="oldsuse"
diff --git a/.config/chromium/NativeMessagingHosts/com.github.browserpass.native.json b/.config/chromium/NativeMessagingHosts/com.github.browserpass.native.json
new file mode 100644
index 0000000..9a89b66
--- /dev/null
+++ b/.config/chromium/NativeMessagingHosts/com.github.browserpass.native.json
@@ -0,0 +1,11 @@
+{
+ "name": "com.github.browserpass.native",
+ "description": "Browserpass native component for the Chromium extension",
+ "path": "/usr/bin/browserpass",
+ "type": "stdio",
+ "allowed_origins": [
+ "chrome-extension://naepdomgkenhinolocfifgehidddafch/",
+ "chrome-extension://pjmbgaakjkbhpopmakjoedenlfdmcdgm/",
+ "chrome-extension://klfoddkbhleoaabpmiigbmpbjfljimgb/"
+ ]
+}
diff --git a/.config/chromium/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json b/.config/chromium/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json
new file mode 100644
index 0000000..4188409
--- /dev/null
+++ b/.config/chromium/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json
@@ -0,0 +1,10 @@
+{
+ "allowed_origins": [
+ "chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/",
+ "chrome-extension://oboonakemofpalcgghocfoadofidjkkk/"
+ ],
+ "description": "KeePassXC integration with native messaging support",
+ "name": "org.keepassxc.keepassxc_browser",
+ "path": "/usr/bin/keepassxc-proxy",
+ "type": "stdio"
+}
diff --git a/.config/flake8 b/.config/flake8
new file mode 120000
index 0000000..cb0568d
--- /dev/null
+++ b/.config/flake8
@@ -0,0 +1 @@
+../.flake8 \ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
index 440b155..9a9bb51 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,4 @@
+# vim:syntax=gitconfig:ts=4
[color]
diff = auto
status = auto
@@ -20,6 +21,7 @@
dc = diff --cached
lol = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit
lola = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit --all
+ logadog = log --all --decorate --oneline --graph
lf = log --graph --decorate --pretty=ln-long
ls = ls-files
compactlog = log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short
@@ -64,34 +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/.gitignore b/.gitignore
index 88859ec..deb4e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,8 @@
#!/git-prompt
!/.githooks
!/.screenrc
+!/.config/flake8
+!/.config/chromium/NativeMessagingHosts/*
+!/.waterfox/native-messaging-hosts/*
+!/.librewolf/native-messaging-hosts/*
+!/.mozilla/native-messaging-hosts/*
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 1758bd0..b5bd82d 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1,10 +1,14 @@
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
+default-cache-ttl 5
+max-cache-ttl 5
diff --git a/.librewolf/native-messaging-hosts/com.github.browserpass.native.json b/.librewolf/native-messaging-hosts/com.github.browserpass.native.json
new file mode 120000
index 0000000..14b9b0d
--- /dev/null
+++ b/.librewolf/native-messaging-hosts/com.github.browserpass.native.json
@@ -0,0 +1 @@
+../../.mozilla/native-messaging-hosts/com.github.browserpass.native.json \ No newline at end of file
diff --git a/.librewolf/native-messaging-hosts/org.keepassxc.keepassxc_browser.json b/.librewolf/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
new file mode 120000
index 0000000..dba24ca
--- /dev/null
+++ b/.librewolf/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
@@ -0,0 +1 @@
+../../.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json \ No newline at end of file
diff --git a/.mozilla/native-messaging-hosts/com.github.browserpass.native.json b/.mozilla/native-messaging-hosts/com.github.browserpass.native.json
new file mode 100644
index 0000000..b2f26ba
--- /dev/null
+++ b/.mozilla/native-messaging-hosts/com.github.browserpass.native.json
@@ -0,0 +1,7 @@
+{
+ "name": "com.github.browserpass.native",
+ "description": "Browserpass native component for the Firefox extension",
+ "path": "/usr/bin/browserpass",
+ "type": "stdio",
+ "allowed_extensions": ["browserpass@maximbaz.com"]
+}
diff --git a/.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json b/.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
new file mode 100644
index 0000000..9ba102f
--- /dev/null
+++ b/.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
@@ -0,0 +1,9 @@
+{
+ "allowed_extensions": [
+ "keepassxc-browser@keepassxc.org"
+ ],
+ "description": "KeePassXC integration with native messaging support",
+ "name": "org.keepassxc.keepassxc_browser",
+ "path": "/usr/bin/keepassxc-proxy",
+ "type": "stdio"
+}
diff --git a/.vimrc b/.vimrc
index 1bef541..984e974 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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/.waterfox/native-messaging-hosts/com.github.browserpass.native.json b/.waterfox/native-messaging-hosts/com.github.browserpass.native.json
new file mode 120000
index 0000000..14b9b0d
--- /dev/null
+++ b/.waterfox/native-messaging-hosts/com.github.browserpass.native.json
@@ -0,0 +1 @@
+../../.mozilla/native-messaging-hosts/com.github.browserpass.native.json \ No newline at end of file
diff --git a/.waterfox/native-messaging-hosts/org.keepassxc.keepassxc_browser.json b/.waterfox/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
new file mode 120000
index 0000000..dba24ca
--- /dev/null
+++ b/.waterfox/native-messaging-hosts/org.keepassxc.keepassxc_browser.json
@@ -0,0 +1 @@
+../../.mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json \ No newline at end of file
diff --git a/tmux-gpakosz b/tmux-gpakosz
-Subproject 9cf49731cd785b76cf792046feed0e827545791
+Subproject e25f45ed3df5a83339fcfd99d256b0d1958d646