Compare commits
3 Commits
9bcf6c91da
...
3817c2ab7d
Author | SHA1 | Date |
---|---|---|
xeruf | 3817c2ab7d | |
xeruf | 268f533e9a | |
xeruf | 2e26d955ad |
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
"microbreakDuration": 20000,
|
"microbreakDuration": 30000,
|
||||||
"microbreakInterval": 1200000,
|
"microbreakInterval": 1200000,
|
||||||
"breakDuration": 180000,
|
"breakDuration": 180000,
|
||||||
"breakInterval": 3,
|
"breakInterval": 2,
|
||||||
"breakNotification": true,
|
"breakNotification": true,
|
||||||
"microbreakNotification": true,
|
"microbreakNotification": true,
|
||||||
"breakNotificationInterval": 30000,
|
"breakNotificationInterval": 30000,
|
||||||
|
|
|
@ -144,7 +144,8 @@ Version 2019-11-04 2021-02-16"
|
||||||
:desc "Markdown to Zulip" "mam" "4dip
|
:desc "Markdown to Zulip" "mam" "4dip
|
||||||
:%s/<\\/?span ?[^ >]*>//g
|
:%s/<\\/?span ?[^ >]*>//g
|
||||||
:%s/\\n\\n<a id=.*<\\/a>\\n\\n//g
|
:%s/\\n\\n<a id=.*<\\/a>\\n\\n//g
|
||||||
:%s/<\\(http[^ \\n]+\\)>/\\1/g
"
|
:%s/<\\(http[^ \\n]+\\)>/\\1/g
|
||||||
|
:%s/\\\\<\\(.*\\)\\\\>/<\\1>/g
"
|
||||||
;:%s/\\n *\\n /\\n /
|
;:%s/\\n *\\n /\\n /
|
||||||
;:%s/ / /g
"
|
;:%s/ / /g
"
|
||||||
)
|
)
|
||||||
|
@ -469,7 +470,7 @@ Version 2019-11-04 2021-02-16"
|
||||||
org-journal-created-property-timestamp-format time-stamp-format
|
org-journal-created-property-timestamp-format time-stamp-format
|
||||||
org-journal-carryover-delete-empty-journal 'always
|
org-journal-carryover-delete-empty-journal 'always
|
||||||
org-journal-date-format (concat "[" time-stamp-bare " %3a]")
|
org-journal-date-format (concat "[" time-stamp-bare " %3a]")
|
||||||
;org-journal-time-format "%02H "
|
org-journal-time-format "%02H "
|
||||||
)
|
)
|
||||||
:config
|
:config
|
||||||
; TODO map njj to open-or-create-entry
|
; TODO map njj to open-or-create-entry
|
||||||
|
|
|
@ -44,7 +44,7 @@ yas() {
|
||||||
)
|
)
|
||||||
if test -n "$pkg"
|
if test -n "$pkg"
|
||||||
then echo "Installing $pkg..."
|
then echo "Installing $pkg..."
|
||||||
cmd="yay -Sy --rebuild $pkg"
|
cmd="yay -Sy --batchinstall --rebuild $pkg"
|
||||||
print -s "$cmd"
|
print -s "$cmd"
|
||||||
eval "$cmd"
|
eval "$cmd"
|
||||||
rehash
|
rehash
|
||||||
|
|
|
@ -36,7 +36,7 @@ cl() {
|
||||||
cd() {
|
cd() {
|
||||||
if test -d "$DATA" && test "${1:--}" != "-" -a ! -d "$1" -a $# -eq 1
|
if test -d "$DATA" && test "${1:--}" != "-" -a ! -d "$1" -a $# -eq 1
|
||||||
then
|
then
|
||||||
dir=$(fd --no-ignore --glob "$1*" "$DATA" --maxdepth 2 --type d --max-results 1 2>/dev/null)
|
dir=$(fd --no-ignore --glob "$1*" "$DATA" $MNT --maxdepth 2 --type d --max-results 1 2>/dev/null)
|
||||||
test -n "$dir" && cd "$dir"
|
test -n "$dir" && cd "$dir"
|
||||||
else
|
else
|
||||||
builtin cd "$@" &&
|
builtin cd "$@" &&
|
||||||
|
|
|
@ -243,6 +243,10 @@ del() {
|
||||||
m "$@" $trash
|
m "$@" $trash
|
||||||
}
|
}
|
||||||
|
|
||||||
|
curlh() {
|
||||||
|
curl -v --location "$@" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
u() {
|
u() {
|
||||||
# Line below handy for users of netkeeper
|
# Line below handy for users of netkeeper
|
||||||
sudo nft list ruleset | grep -q outall && echo "Suspending netkeeper" >&2 | echo sysupgrade | netkeeper 30 2>/dev/null
|
sudo nft list ruleset | grep -q outall && echo "Suspending netkeeper" >&2 | echo sysupgrade | netkeeper 30 2>/dev/null
|
||||||
|
|
|
@ -78,6 +78,8 @@ stack() {
|
||||||
(*) echo "Unknown Subcommand";;
|
(*) echo "Unknown Subcommand";;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
(maria) app=$1
|
||||||
|
"$0" exec $app-mariadb -it -- env "MYSQL_PWD=$(kubectl get secret -n flux-system stackspin-$app-variables --template '{{.data.mariadb_password}}' | base64 -d)" mysql -u $app "$@";;
|
||||||
# high-level
|
# high-level
|
||||||
(shell)
|
(shell)
|
||||||
container=$1
|
container=$1
|
||||||
|
@ -96,7 +98,9 @@ stack() {
|
||||||
kubectl cp "$2" -n $("$0" pod "$1$pod_suffix"):$2 "${@:3}"
|
kubectl cp "$2" -n $("$0" pod "$1$pod_suffix"):$2 "${@:3}"
|
||||||
"$0" ls "$1" "${@:3}";;
|
"$0" ls "$1" "${@:3}";;
|
||||||
(exec) "$0" kube exec "$@";;
|
(exec) "$0" kube exec "$@";;
|
||||||
(logs) "$0" kube logs "$@" | $(command which lnav || { which bat >/dev/null && echo "bat --number -l toml" } || echo 'less -RF');;
|
(logs) podname=$1
|
||||||
|
shift
|
||||||
|
"$0" kube logs "$podname" | $(command which lnav || { which bat >/dev/null && echo "bat --number -l toml" } || echo 'less -RF') "$@";;
|
||||||
# low-level
|
# low-level
|
||||||
(kube)
|
(kube)
|
||||||
test $# -gt 1 || { echo "Please provide a command and pod name" >&2 && return 1; }
|
test $# -gt 1 || { echo "Please provide a command and pod name" >&2 && return 1; }
|
||||||
|
|
|
@ -18,6 +18,7 @@ case $1 in
|
||||||
(socha) user=software-challenge; host=git@github.com;;
|
(socha) user=software-challenge; host=git@github.com;;
|
||||||
(hub) host=git@github.com;;
|
(hub) host=git@github.com;;
|
||||||
(lab) host=git@gitlab.com;;
|
(lab) host=git@gitlab.com;;
|
||||||
|
(ftt) host=git@code.ftt.gmbh; user=janek;;
|
||||||
(*) host=${1:-gitea@git.jfischer.org};;
|
(*) host=${1:-gitea@git.jfischer.org};;
|
||||||
esac
|
esac
|
||||||
user=${3:-${user:-$(git config user.name)}}
|
user=${3:-${user:-$(git config user.name)}}
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# Transforms org to markdown using a simplified regex
|
||||||
|
sed ':o; s/_\(\w[^_]*\w\)_/\/\1\//g;
|
||||||
|
/^#\+ /{
|
||||||
|
s/^#/*/; To;
|
||||||
|
:b; s/^\(\**\)#/\1*/g; tb;
|
||||||
|
n; s/^$//; To; D
|
||||||
|
}' "$@"
|
||||||
|
# echo "# one\n\n# two\n## under #two\n_hello under_two_\nnumber #1" | mdoh
|
|
@ -22,7 +22,7 @@ esac
|
||||||
# FSTAB: BY LABEL
|
# FSTAB: BY LABEL
|
||||||
if grep --word-regexp "LABEL=$arg" /etc/fstab
|
if grep --word-regexp "LABEL=$arg" /etc/fstab
|
||||||
then # have to mount twice as the first one might be creating the directory
|
then # have to mount twice as the first one might be creating the directory
|
||||||
mount -L "$arg" "$@" 2>/dev/null || mount -L "$arg" "$@"
|
mount -L "$@" 2>/dev/null || mount -L "$@"
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
# FSTAB: BY MOUNTPOINT/NAME
|
# FSTAB: BY MOUNTPOINT/NAME
|
||||||
|
|
3
.zshenv
3
.zshenv
|
@ -4,7 +4,6 @@ export_existing() {
|
||||||
do test -d "$2" && export $var="$2" && break
|
do test -d "$2" && export $var="$2" && break
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
echo
|
|
||||||
}
|
}
|
||||||
export_existing DATA $HOME/daten $HOME/data
|
export_existing DATA $HOME/daten $HOME/data
|
||||||
export MUSIC="$DATA/4-media/music"
|
export MUSIC="$DATA/4-media/music"
|
||||||
|
@ -137,7 +136,7 @@ alt-shift-down:preview-down,alt-shift-up:preview-up,esc:close")
|
||||||
#alt-r:preview(bat {}),
|
#alt-r:preview(bat {}),
|
||||||
export FZF_HISTDIR="$XDG_STATE_HOME/fzf"
|
export FZF_HISTDIR="$XDG_STATE_HOME/fzf"
|
||||||
mkdir -p "$XDG_STATE_HOME/fzf"
|
mkdir -p "$XDG_STATE_HOME/fzf"
|
||||||
export FZF_DEFAULT_OPTS="--select-1 --exit-0 --ansi
|
export FZF_DEFAULT_OPTS="--exit-0 --ansi
|
||||||
--tiebreak=$($_fzf_latest && echo "chunk,")end,length --history=$FZF_HISTDIR/history --bind='$FZF_BINDINGS'
|
--tiebreak=$($_fzf_latest && echo "chunk,")end,length --history=$FZF_HISTDIR/history --bind='$FZF_BINDINGS'
|
||||||
$($_fzf_latest && echo '--preview-window=60%,border-left --marker=o')"
|
$($_fzf_latest && echo '--preview-window=60%,border-left --marker=o')"
|
||||||
FD_BASE="fd --hidden --color=always --no-ignore-vcs"
|
FD_BASE="fd --hidden --color=always --no-ignore-vcs"
|
||||||
|
|
Loading…
Reference in New Issue