From 526346538b7e178bf71c4985af419846318de506 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Fri, 8 Oct 2021 11:05:58 +0000 Subject: [PATCH] config: adjust scripts & configure rustup and cargo --- .config/shell/functions | 26 ++++++++++---------------- .config/shell/graphical | 11 ++++++++++- .local/bin/scripts/cj | 2 +- .zprofile | 5 +++-- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.config/shell/functions b/.config/shell/functions index 1e6142a..33bcc45 100644 --- a/.config/shell/functions +++ b/.config/shell/functions @@ -130,14 +130,20 @@ alias jcj='jcl -o json-pretty -u' # Applications {{{1 -# Remote -alias delta="sc restart openvpn-client@deltaPeak.service" -alias sshl="lemonade server -allow 127.0.0.1 & ssh -R 2489:127.0.0.1:2489" +alias u='topgrade' +alias expr='noglob expr' + +alias lst='( last; last -f /var/log/wtmp.1 ) | grep -v "pts/" | tac | less +G' +alias lar='last | tac' alias calc='rlwrap -a bc -l' alias logoff="loginctl terminate-user $USER" blues() { bluedevil-sendfile $(echo "$@" | xargs -n 1 realpath | xargs -n 1 echo -n " --files") } +# Remote +alias delta="sc restart openvpn-client@deltaPeak.service" +alias sshl="lemonade server -allow 127.0.0.1 & ssh -R 2489:127.0.0.1:2489" + # locate roughly loci() { locate --all --ignore-case --basename --existing "$@" | command grep --extended-regexp --ignore-case --color=always $(echo "$|${@:$#}" | sed 's/ /|/g') | less -F } alias loc='noglob loci' @@ -148,11 +154,6 @@ alias loce='noglob locei' # locate all alias loca='noglob sudo updatedb --prunenames "" /var/lib/mlocate/all.db && loci --database ""' -alias expr='noglob expr' - -alias lst='( last; last -f /var/log/wtmp.1 ) | grep -v "pts/" | tac | less +G' -alias lar='last | tac' - # Listen to loopback of mic alias listen='pactl load-module module-loopback; echo "Press Enter to stop"; read; pactl unload-module module-loopback' @@ -186,16 +187,9 @@ alias dic="cat $XDG_DATA_HOME/dictcc/dict.txt | tail -n +16 | fzf --tiebreak=length --bind='alt-bspace:clear-query'" alias dict="rlwrap rdictcc -d $XDG_DATA_HOME/dictcc" alias dictu="dict -i $XDG_DATA_HOME/dictcc/dict.txt" + alias startMinecraftServer='curl https://ipinfo.io/ip | xclip -sel clip && cd ~/daten/games/sharedgames/minecraft/server && java -jar forge-1.12.2-14.23.5.2768-universal.jar -mx 8G' -alias u='topgrade' - -alias j='jrnl' -jn() { jrnl -to today "$@" | less +G } -compdef jn=jrnl -alias jnc='jn -contains' -alias jne='jrnl --edit' - npm-reinstall() { rm -rf $TMPDIR/react-* rm -rf node_modules/ diff --git a/.config/shell/graphical b/.config/shell/graphical index 544e2f6..53fc60a 100644 --- a/.config/shell/graphical +++ b/.config/shell/graphical @@ -1,6 +1,6 @@ # Pop up a message, for long running commands 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$//'\'')"' + 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$//'\'')"' xo() { while test $# -gt 0; do @@ -9,6 +9,15 @@ xo() { done } + +if which jrnl >/dev/null; then + alias j='jrnl' + jn() { jrnl -to today "$@" | less +G } + compdef jn=jrnl + alias jnc='jn -contains' + alias jne='jrnl --edit' +fi + test "$DISPLAY" || return 0 alias graphics='lspci -vnn | grep VGA --color=never && xrandr --listproviders' diff --git a/.local/bin/scripts/cj b/.local/bin/scripts/cj index 350813d..8a859db 100755 --- a/.local/bin/scripts/cj +++ b/.local/bin/scripts/cj @@ -1,3 +1,3 @@ #!/bin/sh # [c]at the given files as prettified [j]son -cat "$@" | while read -r line; do echo -n "$line" | python -m json.tool 2>/dev/null; done | bat --language json --style numbers +cat "$@" | while read -r line; do echo -n "$line" | python3 -m json.tool; done | bat --language json --style numbers diff --git a/.zprofile b/.zprofile index 041270e..05c9df9 100644 --- a/.zprofile +++ b/.zprofile @@ -14,6 +14,7 @@ export GNUPGHOME="$XDG_DATA_HOME"/gnupg export KDEHOME="$XDG_STATE_HOME"/kdehome export GOPATH="$XDG_STATE_HOME"/go export CARGO_HOME="$XDG_DATA_HOME"/cargo +export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export RLWRAP_HOME="$XDG_STATE_HOME"/rlwrap @@ -32,8 +33,8 @@ export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java" export GRADLE_USER_HOME="$XDG_STATE_HOME"/gradle export ANDROID_PREFS_ROOT="$XDG_CONFIG_HOME"/android export ANDROID_EMULATOR_HOME="$XDG_STATE_HOME"/android/emulator -export ANDROID_SDK_ROOT="/opt/android/sdk" -export PATH="$PATH:$ANDROID_SDK_ROOT/platform-tools" +export ANDROID_SDK_ROOT="/opt/android-sdk" +export PATH="$PATH:$ANDROID_SDK_ROOT/platform-tools:$CARGO_HOME/bin" # taskwarrior & timewarrior export TIMEWARRIORDB="$XDG_DATA_HOME/timewarrior" export TASKRC="$XDG_CONFIG_HOME/task/taskrc"