From 490f50695bd7cf928222aa1356412e64f8a93a3b Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Tue, 20 Feb 2024 19:56:45 +0100 Subject: [PATCH] config: tool config updates --- .config/Stretchly/config.json | 8 ++++++-- .config/git/config | 7 ++++--- .config/jrnl/jrnl.yaml##template | 3 +-- .config/shell/functions | 11 +++++++---- .config/shell/graphical | 2 +- .config/topgrade.d/topgrade.toml | 2 +- .config/way-displays/cfg.yaml##default | 2 +- .config/zsh/.zshrc | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.config/Stretchly/config.json b/.config/Stretchly/config.json index 2e3c04d..9a6cb2d 100644 --- a/.config/Stretchly/config.json +++ b/.config/Stretchly/config.json @@ -471,11 +471,15 @@ "timeToBreakInTray": false, "currentTimeInBreaks": false, "showTrayIcon": true, + "skipToNextScheduledBreakShortcut": "", + "skipToNextMiniBreakShortcut": "", + "skipToNextLongBreakShortcut": "", + "resetBreaksShortcut": "", "pauseBreaksShortcut": "", "resumeBreaksShortcut": "", "__internal__": { "migrations": { - "version": "1.14.1" + "version": "1.15.1" } } -} +} \ No newline at end of file diff --git a/.config/git/config b/.config/git/config index f77dcd6..42cba88 100644 --- a/.config/git/config +++ b/.config/git/config @@ -32,10 +32,11 @@ tool = nvim submodule = log context = 2 - renames = copy + renames = true colorMoved = dimmed-zebra colorMovedWS = allow-indentation-change [merge] + renames = copy tool = nvim [mergetool "nvim"] cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\" @@ -85,7 +86,7 @@ # status s = !git stl && git stb st = stb . - stb = status --short --branch --find-renames=.2 + stb = status --short --branch --find-renames sv = --paginate status -v svv = --paginate status -vv @@ -117,7 +118,7 @@ co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++' when = !git for-each-ref --sort=committerdate --format='%(refname:short) * %(authorname) * %(committerdate:relative)' refs/remotes/ # List all branches with their last updates - tags = !sh -c "git for-each-ref --color=always --format='%(color:yellow)%(tag)%(color:default)%09 %(subject) %(color:green)(%(taggerdate:format:%Y-%m-%d))' refs/tags | sort -V | column -s $'\t' -t" + tags = !git for-each-ref --color=always --format='%(color:yellow)%(tag)%(color:default)%09 %(subject) %(color:green)(%(taggerdate:format:%Y-%m-%d))' refs/tags | sort -V | column -s $'\t' -t find = log --patch --all --full-history # Find a filename in all git knows ref = reflog show --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' refg = log --reflog --graph --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' diff --git a/.config/jrnl/jrnl.yaml##template b/.config/jrnl/jrnl.yaml##template index 303fb2a..1b9f722 100644 --- a/.config/jrnl/jrnl.yaml##template +++ b/.config/jrnl/jrnl.yaml##template @@ -12,10 +12,9 @@ indent_character: '|' journals: default: ~/data/2-box/journal/jrnl.txt tug: ~/data/2-box/journal/tug.txt - nug: ~/data/2-box/journal/nuggets.txt intentions: ~/data/2-box/journal/intentions.txt linewrap: 99 tagsymbols: '@' template: false timeformat: '%Y-%m-%d %a %H:%M' -version: v2.8.4 +version: v4.1 diff --git a/.config/shell/functions b/.config/shell/functions index efa5241..127aa83 100644 --- a/.config/shell/functions +++ b/.config/shell/functions @@ -249,12 +249,14 @@ alias dt='python -c "import time;print(time.asctime(time.localtime()))"' # Process alias println='printf "\n"' -alias myip="curl ifconfig.me && println && curl icanhazip.com" alias dedup-lines='awk '"'"'!a[$0]++'"'" alias lar='last | tac' alias lst='( last; last -f /var/log/wtmp.1 ) | grep -v "pts/" | tac | less +G' alias hedgedoc="tmux kill-session -t hedgedoc; builtin cd '$d4/dev/_forks/hedgedoc' && tmux new-session -s hedgedoc -d 'yarn run dev' \; split-window -h 'nodemon --watch app.js --watch lib --watch locales --watch config.json app.js' \; ls" +alias myip='curl ifconfig.me && println && curl icanhazip.com' +alias ips='ip -br address && ip route' + alias rm='rm -I' del() { # TODO use current partition and clean on reboot via cron @@ -336,9 +338,10 @@ sshl() { ! [[ "$1" =~ "tmtgw" ]] && ! [[ "$1" =~ "delta*" ]] && ! [[ "$1" =~ "nc-*" ]] && + ! [[ "$1" =~ "ddns*" ]] && local pass=pass test "$all" && - find $XDG_CONFIG_HOME/bash/ \( -name aliases.bash -o -name "${1%[0-9a-z]}*.bash" \) -exec cat {} + | $pass ssh "$1" 'cat > .bash_aliases && grep -q .bash_aliases .bashrc || echo "source ~/.bash_aliases" | tee -a .bashrc' && + find $XDG_CONFIG_HOME/bash/ \( -name aliases.bash -o -name "${1%[0-9a-z]}*.bash" \) -exec cat {} + | $pass ssh "$@" 'cat > .bash_aliases && grep -q .bash_aliases .bashrc || echo "source ~/.bash_aliases" | tee -a .bashrc' && echo 'Updated .bash_aliases!' #$pass ssh "$1" 'grep -q ".bash_aliases" .bashrc || echo "source ~/.bash_aliases" >>.bashrc' if test -n "$pass" @@ -348,7 +351,7 @@ sshl() { ssh-copy-id -i "$(ssh -G "$1" | grep --max-count 1 "^identityfile " | cut -d " " -f2- | - sed "s|^~|$HOME|")" "$1" && + sed "s|^~|$HOME|")" "$@" && touch "$file" #TERM=xterm-256color sshk -R 2489:127.0.0.1:2489 "$@" @@ -408,7 +411,7 @@ grsh() { # Recover stray swap files from neovim vrec() { - find "$XDG_DATA_HOME/nvim/swap" -name "*$1*" | + find "$XDG_STATE_HOME/nvim/swap" -name "*$1*" -printf '%f%n' | sed 's/\%/\//g' | sed 's|\(.*\)\..*|\1|' | xargs --no-run-if-empty nvim } diff --git a/.config/shell/graphical b/.config/shell/graphical index 0d5a658..38a84d0 100644 --- a/.config/shell/graphical +++ b/.config/shell/graphical @@ -3,7 +3,7 @@ command -v notify-send >/dev/null && alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(echo "$history[$HISTCMD]" | sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' if which jrnl >/dev/null; then - alias j='jrnl' + j(){ jrnl "$@" && jrnl-tag; } jn() { jrnl -to today "$@" | less --exit-follow-on-close +F; } alias jnc='jn -contains' alias jne='jrnl --edit' diff --git a/.config/topgrade.d/topgrade.toml b/.config/topgrade.d/topgrade.toml index be746b0..d3a2e7f 100644 --- a/.config/topgrade.d/topgrade.toml +++ b/.config/topgrade.d/topgrade.toml @@ -58,7 +58,7 @@ pull_arguments = "--rebase --autostash --recurse-submodules" [linux] # Arguments to pass yay when updating packages -yay_arguments = "--diffmenu=false --overwrite '/usr/lib/node_modules/node-gyp/**' --overwrite '/usr/lib/node_modules/npm/**' --overwrite '/usr/lib/**' --ignore android-studio --ignore clion --ignore intellij-idea-ultimate-edition --ignore intellij-idea-ultimate-edition-jre --ignore webstorm --ignore linux --ignore stretchly-xeruf-git" +yay_arguments = "--diffmenu=false --overwrite /usr/lib/node_modules/node-gyp/**,/usr/lib/node_modules/npm/**,/usr/lib/** --ignore linux,zoom,qt*,zulip*,webcord*,brave*,*openjfx,android-studio*,clion*,intellij-idea-*,webstorm*,stretchly-xeruf-git" #trizen_arguments = "--devel" #enable_tlmgr = true #emerge_sync_flags = "-q" diff --git a/.config/way-displays/cfg.yaml##default b/.config/way-displays/cfg.yaml##default index 5c114b9..87f365f 100644 --- a/.config/way-displays/cfg.yaml##default +++ b/.config/way-displays/cfg.yaml##default @@ -15,6 +15,7 @@ ALIGN: MIDDLE # The default ORDER is simply the order in which the displays are discovered. # Define your own. ORDER: + - 'C24F390' - 'LOEWE' - 'DP-4' - 'VFV' @@ -26,7 +27,6 @@ ORDER: # This may be disabled and scale 1 will be used, unless a SCALE has been specified. AUTO_SCALE: FALSE - # Auto scale may be overridden for each display. SCALE: - NAME_DESC: 'U28E570' diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 8cd1d42..abf4a83 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -171,7 +171,7 @@ setopt pipefail # Empower zmv (see ZSHCONTRIB(1)) alias szmv='sudo zsh -c autoload zmv && zmv' autoload zmv -alias zmv='noglob zmv' +alias zmv='noglob zmv -v' alias zmw='noglob zmv -W' alias zcp='noglob zmv -C' alias zln='noglob zmv -L'