diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc index 95bed38..fa9d388 100644 --- a/dots/bash/.bashrc +++ b/dots/bash/.bashrc @@ -24,19 +24,17 @@ eval "$(jump shell --bind=j)" # miscellaneous aliases # --- -alias aafire="aafire -driver curses" # terminal idle "screensaver" alias azurevpnclient="/opt/microsoft/microsoft-azurevpnclient/microsoft-azurevpnclient" -alias cacafire="DISPLAY= cacafire" # terminal idle "screensaver" -alias cmatrix="cmatrix -a -b -s -u 5" # terminal idle "screensaver" + alias cp="cp -i" # confirm before overwriting something alias ct="sudo ct" -alias decrypt="gpg --decryp" +#alias decrypt="gpg --decrypt" alias df='df -h' # human-readable sizes alias diskusage="ncdu -x" -alias dr="dragon-drop --and-exit --all --print-path" +alias dragon="dragon-drop --and-exit --all --print-path" alias du="du --summarize --human-readable" alias dus="du --summarize --human-readable * | sort -h" -alias encrypt="gpg --encrypt --sign --recipient frode@klevstul.com" +#alias encrypt="gpg --encrypt --sign --recipient frode@klevstul.com" alias faf="find . -type f -iname" # faf (find a file) alias fif="grep -rnw . -e" # fif (find in file) | https://stackoverflow.com/questions/16956810/find-all-files-containing-a-specific-text-string-on-linux alias gparted="sudo gparted" @@ -47,29 +45,24 @@ alias ipify='http https://api.ipify.org?format=json' alias journal='journalctl --since "1 hour ago"' alias keymap="setxkbmap -model pc105 -layout us,no -option grp:caps_toggle,grp_led:scroll" alias keyringreset="trash-put /home/poq/.local/share/keyrings/*.keyrings" -alias lock="xautolock -locknow" +#alias lock="xautolock -locknow" alias ls='ls --color=auto' -alias mapscii='telnet mapscii.me' alias myip="echo $(wget http://ipinfo.io/ip -qO -)" alias neofetch='fastfetch' -alias nr="nitrogen --restore" alias quantumfix="pw-metadata -n settings 0 clock.force-quantum 1024" alias sb="source ~/.bashrc" alias sbr="source /home/poq/syncDir/gitRepos/gi.op.fo/lnx-arch/dots/bash/.bashrc" # source bash (from) repo alias sizeInBytes="stat -c %s" -alias ssh_weba_r="ssh -t root@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'" -alias ssh_weba_u="ssh -t usr@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'" -alias starwars="telnet towel.blinkenlights.nl" +alias ssh="ssh -v" +alias ssh_weba_r="ssh -v -t root@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'" +alias ssh_weba_u="ssh -v -t usr@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'" alias tp-empty="trash-empty" alias tp-list="tree ~/.local/share/Trash/" alias tp-restore="trash-restore" alias tp="tp.sh" alias tree="tree --du -h" -alias unimatrix="unimatrix.py" # terminal idle "screensaver" -#alias weba-connect="ssh -t root@178.156.192.201 -p 1808 'export TERM=xterm; cd /tmp; bash -l'" # app images -#alias dbgate="/home/poq/syncDir/quick/swas/installationFiles/dbGate/dbgate-latest.AppImage" alias pgmodeler2="/home/poq/syncDir/swas/portableApps/pgmodeler_plus-2*" alias pgmodeler="/home/poq/syncDir/swas/portableApps/pgmodeler_plus-1*" @@ -95,18 +88,18 @@ case ${TERM} in esac # tss (terminal screen saver) - start a random one -tss() { - # https://unix.stackexchange.com/questions/118714/how-can-i-get-cacafire-to-show-up-in-the-original-gnome-terminal-instead-of-a - OLD_DISPAY=$(echo $DISPLAY) - export DISPLAY= - commands=("aafire -driver curses" "cacafire" "cmatrix -a -b -s -u 5" "unimatrix.py") - random_command="${commands[ $RANDOM % ${#commands[@]} ]}" - $random_command - export DISPLAY=${OLD_DISPAY} -} - -alias tbt="printf '\x1b]10;red\x1b\\'; printf '\x1b]11;#000\x1b\\'" # tbt (terminal black theme) | https://sw.kovidgoyal.net/kitty/faq/#how-do-i-change-the-colors-in-a-running-kitty-instance -alias tdt="printf '\x1b]10;#00ffff\x1b\\'; printf '\x1b]11;#161021\x1b\\';" # tdt (terminal default theme) +#tss() { +# # https://unix.stackexchange.com/questions/118714/how-can-i-get-cacafire-to-show-up-in-the-original-gnome-terminal-instead-of-a +# OLD_DISPAY=$(echo $DISPLAY) +# export DISPLAY= +# commands=("aafire -driver curses" "cacafire" "cmatrix -a -b -s -u 5" "unimatrix.py") +# random_command="${commands[ $RANDOM % ${#commands[@]} ]}" +# $random_command +# export DISPLAY=${OLD_DISPAY} +#} +# +#alias tbt="printf '\x1b]10;red\x1b\\'; printf '\x1b]11;#000\x1b\\'" # tbt (terminal black theme) | https://sw.kovidgoyal.net/kitty/faq/#how-do-i-change-the-colors-in-a-running-kitty-instance +#alias tdt="printf '\x1b]10;#00ffff\x1b\\'; printf '\x1b]11;#161021\x1b\\';" # tdt (terminal default theme) # --- @@ -114,9 +107,9 @@ alias tdt="printf '\x1b]10;#00ffff\x1b\\'; printf '\x1b]11;#161021\x1b\\';" # td # --- # https://serverfault.com/questions/170706/easy-way-to-get-ip-address-from-hostname-using-a-unix-shell -function hostip() { - python -c "import sys, socket; print (socket.gethostbyname('$1'))" -} +#function hostip() { +# python -c "import sys, socket; print (socket.gethostbyname('$1'))" +#} nmrestart() { systemctl restart NetworkManager @@ -124,49 +117,49 @@ nmrestart() { } # https://wiki.archlinux.org/title/Proxy_server -function proxy_on() { - export no_proxy="localhost,127.0.0.1,localaddress,.localdomain.com" - - if (( $# > 0 )); then - valid=$(echo $@ | sed -n 's/\([0-9]\{1,3\}.\?\)\{4\}:\([0-9]\+\)/&/p') - if [[ $valid != $@ ]]; then - >&2 echo "Invalid address" - return 1 - fi - local proxy=$1 - export http_proxy="$proxy" \ - https_proxy=$proxy \ - ftp_proxy=$proxy \ - rsync_proxy=$proxy - echo "Proxy environment variable set." - return 0 - fi - - echo -n "username: "; read username - if [[ $username != "" ]]; then - echo -n "password: " - read -es password - local pre="$username:$password@" - fi - - echo -n "server: "; read server - echo -n "port: "; read port - local proxy=$pre$server:$port - export http_proxy="$proxy" \ - https_proxy=$proxy \ - ftp_proxy=$proxy \ - rsync_proxy=$proxy \ - HTTP_PROXY=$proxy \ - HTTPS_PROXY=$proxy \ - FTP_PROXY=$proxy \ - RSYNC_PROXY=$proxy -} - -function proxy_off(){ - unset http_proxy https_proxy ftp_proxy rsync_proxy \ - HTTP_PROXY HTTPS_PROXY FTP_PROXY RSYNC_PROXY - echo -e "Proxy environment variable removed." -} +#function proxy_on() { +# export no_proxy="localhost,127.0.0.1,localaddress,.localdomain.com" +# +# if (( $# > 0 )); then +# valid=$(echo $@ | sed -n 's/\([0-9]\{1,3\}.\?\)\{4\}:\([0-9]\+\)/&/p') +# if [[ $valid != $@ ]]; then +# >&2 echo "Invalid address" +# return 1 +# fi +# local proxy=$1 +# export http_proxy="$proxy" \ +# https_proxy=$proxy \ +# ftp_proxy=$proxy \ +# rsync_proxy=$proxy +# echo "Proxy environment variable set." +# return 0 +# fi +# +# echo -n "username: "; read username +# if [[ $username != "" ]]; then +# echo -n "password: " +# read -es password +# local pre="$username:$password@" +# fi +# +# echo -n "server: "; read server +# echo -n "port: "; read port +# local proxy=$pre$server:$port +# export http_proxy="$proxy" \ +# https_proxy=$proxy \ +# ftp_proxy=$proxy \ +# rsync_proxy=$proxy \ +# HTTP_PROXY=$proxy \ +# HTTPS_PROXY=$proxy \ +# FTP_PROXY=$proxy \ +# RSYNC_PROXY=$proxy +#} +# +#function proxy_off(){ +# unset http_proxy https_proxy ftp_proxy rsync_proxy \ +# HTTP_PROXY HTTPS_PROXY FTP_PROXY RSYNC_PROXY +# echo -e "Proxy environment variable removed." +#} # --- @@ -174,187 +167,187 @@ function proxy_off(){ # --- # https://en.wikipedia.org/wiki/List_of_common_resolutions -alias res-low="xrandr -s 1920x1080" -alias res-med="xrandr -s 2560x1440" -alias res-high="xrandr -s 3840x2160" +#alias res-low="xrandr -s 1920x1080" +#alias res-med="xrandr -s 2560x1440" +#alias res-high="xrandr -s 3840x2160" +# +#monitor() { +# cmd="info" +# if [[ -n $1 ]]; then +# cmd=$1 +# fi +# +# if [ ${cmd} == "on" ] ; then +# # (standby) (suspend) (off) +# # 18.2 hours | https://superuser.com/questions/1876254/how-to-turn-off-monitor-and-dont-enable-screen-blanking-in-arch-linux +# xset dpms 65535 65535 65535 +# # disable screensaver +# xautolock -disable # disable screen locker +# elif [ ${cmd} == "off" ] ; then +# sleep 3 # sleep, to prevent mouse movement and immediate wake up +# xset dpms 0 0 600 # 10 min timout will be active after monitor wakes up +# xset dpms force off # shut off the monitor +# xautolock -enable # turns on screen locker again +# elif [ ${cmd} == "info" ] ; then +# xset -q +# else +# echo "error: unknown command \"${cmd}\"" +# fi +#} +# +#screensaver() { +# cmd="info" +# if [[ -n $1 ]]; then +# cmd=$1 +# fi +# +# if [ ${cmd} == "on" ] ; then +# xset dpms +# xautolock -enable +# # tmp file used by i3status - by default screensaver is on, so no need for "screensaver_on.tmp" +# trash-put "/tmp/screensaver_off.tmp" +# elif [ ${cmd} == "off" ] ; then +# xset -dpms +# xautolock -disable +# touch "/tmp/screensaver_off.tmp" +# elif [ ${cmd} == "reset" ] ; then +# if xset -q | grep -q 'DPMS is Enabled' ; then +# xset -dpms +# xset dpms +# xautolock -restart +# fi +# elif [ ${cmd} == "set" ] ; then +# minutes=15 +# if [[ -n $2 ]]; then +# minutes=$2 +# fi +# xautolock -time ${minutes} -locker i3lock_fk.sh +# elif [ ${cmd} == "info" ] ; then +# xset -q +# else +# echo "error: unknown command \"${cmd}\"" +# fi +#} -monitor() { - cmd="info" - if [[ -n $1 ]]; then - cmd=$1 - fi - - if [ ${cmd} == "on" ] ; then - # (standby) (suspend) (off) - # 18.2 hours | https://superuser.com/questions/1876254/how-to-turn-off-monitor-and-dont-enable-screen-blanking-in-arch-linux - xset dpms 65535 65535 65535 - # disable screensaver - xautolock -disable # disable screen locker - elif [ ${cmd} == "off" ] ; then - sleep 3 # sleep, to prevent mouse movement and immediate wake up - xset dpms 0 0 600 # 10 min timout will be active after monitor wakes up - xset dpms force off # shut off the monitor - xautolock -enable # turns on screen locker again - elif [ ${cmd} == "info" ] ; then - xset -q - else - echo "error: unknown command \"${cmd}\"" - fi -} - -screensaver() { - cmd="info" - if [[ -n $1 ]]; then - cmd=$1 - fi - - if [ ${cmd} == "on" ] ; then - xset dpms - xautolock -enable - # tmp file used by i3status - by default screensaver is on, so no need for "screensaver_on.tmp" - trash-put "/tmp/screensaver_off.tmp" - elif [ ${cmd} == "off" ] ; then - xset -dpms - xautolock -disable - touch "/tmp/screensaver_off.tmp" - elif [ ${cmd} == "reset" ] ; then - if xset -q | grep -q 'DPMS is Enabled' ; then - xset -dpms - xset dpms - xautolock -restart - fi - elif [ ${cmd} == "set" ] ; then - minutes=15 - if [[ -n $2 ]]; then - minutes=$2 - fi - xautolock -time ${minutes} -locker i3lock_fk.sh - elif [ ${cmd} == "info" ] ; then - xset -q - else - echo "error: unknown command \"${cmd}\"" - fi -} - -rshift() { - cmd="info" - if [[ -n $1 ]]; then - cmd=$1 - fi - - temperature_file="/tmp/temperature.txt" - - if [ ${cmd} == "info" ] ; then - echo "{morning, day, evening, night, bedtime, off}" - return 1 - elif - [ ${cmd} == "status" ] || - [ ${cmd} == "show" ] || - [ ${cmd} == "display" ] ; then - if [ -f "${temperature_file}" ] ; then - temperature=$(cat /tmp/temperature.txt) - echo "${temperature}K" - else - echo "unknown temperature value" - fi - return 1 - elif - [ ${cmd} == "disable" ] || - [ ${cmd} == "off" ] ; then - redshift -x - return 1 - elif [ ${cmd} == "morning" ] ; then - temperature=4500 - elif [ ${cmd} == "day" ] ; then - temperature=6500 - elif [ ${cmd} == "evening" ] ; then - temperature=3500 - elif [ ${cmd} == "night" ] ; then - temperature=2500 - elif [ ${cmd} == "bedtime" ] ; then - temperature=1200 - else - temperature=${cmd} - fi - - echo "setting temperature to ${temperature}K" - echo ${temperature} > ${temperature_file} - redshift -P -O ${temperature} -} +#rshift() { +# cmd="info" +# if [[ -n $1 ]]; then +# cmd=$1 +# fi +# +# temperature_file="/tmp/temperature.txt" +# +# if [ ${cmd} == "info" ] ; then +# echo "{morning, day, evening, night, bedtime, off}" +# return 1 +# elif +# [ ${cmd} == "status" ] || +# [ ${cmd} == "show" ] || +# [ ${cmd} == "display" ] ; then +# if [ -f "${temperature_file}" ] ; then +# temperature=$(cat /tmp/temperature.txt) +# echo "${temperature}K" +# else +# echo "unknown temperature value" +# fi +# return 1 +# elif +# [ ${cmd} == "disable" ] || +# [ ${cmd} == "off" ] ; then +# redshift -x +# return 1 +# elif [ ${cmd} == "morning" ] ; then +# temperature=4500 +# elif [ ${cmd} == "day" ] ; then +# temperature=6500 +# elif [ ${cmd} == "evening" ] ; then +# temperature=3500 +# elif [ ${cmd} == "night" ] ; then +# temperature=2500 +# elif [ ${cmd} == "bedtime" ] ; then +# temperature=1200 +# else +# temperature=${cmd} +# fi +# +# echo "setting temperature to ${temperature}K" +# echo ${temperature} > ${temperature_file} +# redshift -P -O ${temperature} +#} # --- # misc # --- -ascii() { - if [[ -n $1 ]] ; then - if [[ $1 == "banner" ]] && [[ -n $2 ]] ; then - figlet -w 200 -f ANSI\ Shadow $2 - elif [[ $1 == "date" ]] ; then - date | figlet -w 200 -f future - elif [[ $1 == "info" ]] ; then - echo "toilet -f future Hello, World!" - echo "figlet -f future Hello, World!" - elif [[ $1 == "fav" ]] || [[ $1 == "favs" ]] || [[ $1 == "favorites" ]] ; then - text="Klevstul" - if [[ -n $2 ]]; then - text=$2 - fi - echo - echo "3D-ASCII" - figlet -w 200 -f 3D-ASCII ${text} - echo - echo "Alpha" - figlet -w 200 -f Alpha ${text} - echo - echo "ANSI Regular" - figlet -w 200 -f ANSI\ Regular ${text} - echo - echo "Banner3-D" - figlet -w 200 -f Banner3-D ${text} - echo - echo "cyberlarge" - figlet -w 200 -f cyberlarge ${text} - echo - echo "cybermedium" - figlet -w 200 -f cybermedium ${text} - echo - echo "doh" - figlet -w 200 -f doh ${text} - echo - echo "future" - figlet -w 200 -f future ${text} - echo - echo "isometric1" - figlet -w 200 -f isometric1 ${text} - echo - echo "isometric2" - figlet -w 200 -f isometric2 ${text} - echo - echo "s-relief" - figlet -w 200 -f s-relief ${text} - echo - echo "smbraille" - figlet -w 200 -f smbraille ${text} - echo - echo "pagga" - figlet -w 200 -f pagga ${text} - elif [[ $1 == "figlets" ]] ; then - figlets.sh - elif [[ $1 == "fonts" ]] ; then - tree /usr/share/figlet/ - elif [[ $1 == "help" ]] ; then - echo "ascii {banner [text], info, fav [text], figlets, fonts, help, toilets}" - elif [[ $1 == "toilets" ]] ; then - toilets.sh - else - toilet -f smbraille Try something else... - fi - else - toilet -f future --rainbow ASCII - fi -} +#ascii() { +# if [[ -n $1 ]] ; then +# if [[ $1 == "banner" ]] && [[ -n $2 ]] ; then +# figlet -w 200 -f ANSI\ Shadow $2 +# elif [[ $1 == "date" ]] ; then +# date | figlet -w 200 -f future +# elif [[ $1 == "info" ]] ; then +# echo "toilet -f future Hello, World!" +# echo "figlet -f future Hello, World!" +# elif [[ $1 == "fav" ]] || [[ $1 == "favs" ]] || [[ $1 == "favorites" ]] ; then +# text="Klevstul" +# if [[ -n $2 ]]; then +# text=$2 +# fi +# echo +# echo "3D-ASCII" +# figlet -w 200 -f 3D-ASCII ${text} +# echo +# echo "Alpha" +# figlet -w 200 -f Alpha ${text} +# echo +# echo "ANSI Regular" +# figlet -w 200 -f ANSI\ Regular ${text} +# echo +# echo "Banner3-D" +# figlet -w 200 -f Banner3-D ${text} +# echo +# echo "cyberlarge" +# figlet -w 200 -f cyberlarge ${text} +# echo +# echo "cybermedium" +# figlet -w 200 -f cybermedium ${text} +# echo +# echo "doh" +# figlet -w 200 -f doh ${text} +# echo +# echo "future" +# figlet -w 200 -f future ${text} +# echo +# echo "isometric1" +# figlet -w 200 -f isometric1 ${text} +# echo +# echo "isometric2" +# figlet -w 200 -f isometric2 ${text} +# echo +# echo "s-relief" +# figlet -w 200 -f s-relief ${text} +# echo +# echo "smbraille" +# figlet -w 200 -f smbraille ${text} +# echo +# echo "pagga" +# figlet -w 200 -f pagga ${text} +# elif [[ $1 == "figlets" ]] ; then +# figlets.sh +# elif [[ $1 == "fonts" ]] ; then +# tree /usr/share/figlet/ +# elif [[ $1 == "help" ]] ; then +# echo "ascii {banner [text], info, fav [text], figlets, fonts, help, toilets}" +# elif [[ $1 == "toilets" ]] ; then +# toilets.sh +# else +# toilet -f smbraille Try something else... +# fi +# else +# toilet -f future --rainbow ASCII +# fi +#} # https://boulderappsco.postach.io/post/convert-decimal-to-base-36-alpha-numeric-in-bash-linux function decimal_to_base36(){ @@ -592,14 +585,14 @@ nas() { # fi # ffmpeg -i "$1" -c copy -bsf:a aac_adtstoasc "/home/poq/syncDir/0_downloads/${output}" # } -alias videoCompressor="/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2104_videoCompressor/src/vc_v2.sh" +#alias videoCompressor="/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2104_videoCompressor/src/vc_v2.sh" # alias videoWatermark="/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2104_videoCompressor/src/vcwm_v1.sh" -alias notesArchiver='/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2306_notesArchiver/notesArchiver.sh' -alias toJpg='/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2306_toJpg/toJpg.sh' +#alias notesArchiver='/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2306_notesArchiver/notesArchiver.sh' +#alias toJpg='/home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2306_toJpg/toJpg.sh' -imgResize() { - /home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2305_imgResizer/resize.sh 1200 "$1" jpg -} +#imgResize() { +# /home/poq/syncDir/gitRepos/gi.op.fo/miniProjects/2305_imgResizer/resize.sh 1200 "$1" jpg +#} # https://itsfoss.com/compress-pdf-linux/ pdfCompress() { @@ -630,25 +623,6 @@ podigy() { # podigy # /home/poq/syncDir/gitRepos/gi.op.fo/pyws/deploy/deployToBuildServer.sh db # } -# -# # --- -# # c19vaxno -# # --- -# #alias c19vaxno-deploy="/home/poq/syncDir/gitRepos/gitlab.com/c19vaxno/helperScripts/deployToGitlab.sh" - -# --- -# hummed -# --- -#hummed-activate() { -# cd /home/poq/syncDir/gitRepos/gi.op.fo/hummed/src -# source venv/bin/activate -#} -#hummed() { -# hummed-activate -# python /home/poq/syncDir/gitRepos/gi.op.fo/hummed/src/archi.py "$@" -# deactivate -# jump-to-downloads -#} # --- @@ -791,29 +765,3 @@ klevstul.com-build-all() { jump-to-downloads } alias klevstul.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/klevstul.com/jongleur/html_export/ usr@178.156.192.201:/var/www/klevstul.com/jongleur/" -noctur.no-build() { - jongleur-activate - /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/run.sh - deactivate - jump-to-downloads -} -noctur.no-build-all() { - jongleur-activate - /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/runAll.sh - deactivate - jump-to-downloads -} -alias noctur.no-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/html_export/ usr@178.156.192.201:/var/www/noctur.no/jongleur/" -christcast.org-build() { - jongleur-activate - /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/run.sh - deactivate - jump-to-downloads -} -christcast.org-build-all() { - jongleur-activate - /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/runAll.sh - deactivate - jump-to-downloads -} -alias christcast.org-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/html_export/ usr@178.156.192.201:/var/www/christcast.org/jongleur/" diff --git a/dots/bash/obsolete.bashrc b/dots/bash/obsolete.bashrc index ed77e9f..3b61641 100644 --- a/dots/bash/obsolete.bashrc +++ b/dots/bash/obsolete.bashrc @@ -1,3 +1,7 @@ +####################################################### +### MOST RECENT REMOVALS AT THE BOTTOM OF THIS PAGE ### +####################################################### + #alias dpi="xrandr --dpi" #alias free='free -m' # show sizes in MB #alias np='nano -w PKGBUILD' @@ -40,3 +44,61 @@ # frodr.com-build-all # } +--- + +#alias aafire="aafire -driver curses" # terminal idle "screensaver" +#alias cacafire="DISPLAY= cacafire" # terminal idle "screensaver" +#alias cmatrix="cmatrix -a -b -s -u 5" # terminal idle "screensaver" +#alias mapscii='telnet mapscii.me' +#alias nr="nitrogen --restore" +#alias starwars="telnet towel.blinkenlights.nl" +#alias unimatrix="unimatrix.py" # terminal idle "screensaver" +#alias weba-connect="ssh -t root@178.156.192.201 -p 1808 'export TERM=xterm; cd /tmp; bash -l'" +#alias dbgate="/home/poq/syncDir/quick/swas/installationFiles/dbGate/dbgate-latest.AppImage" + +# +# # --- +# # c19vaxno +# # --- +# #alias c19vaxno-deploy="/home/poq/syncDir/gitRepos/gitlab.com/c19vaxno/helperScripts/deployToGitlab.sh" + +# --- +# hummed +# --- +#hummed-activate() { +# cd /home/poq/syncDir/gitRepos/gi.op.fo/hummed/src +# source venv/bin/activate +#} +#hummed() { +# hummed-activate +# python /home/poq/syncDir/gitRepos/gi.op.fo/hummed/src/archi.py "$@" +# deactivate +# jump-to-downloads +#} + +#noctur.no-build() { +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/run.sh +# deactivate +# jump-to-downloads +#} +#noctur.no-build-all() { +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/runAll.sh +# deactivate +# jump-to-downloads +#} +#alias noctur.no-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/html_export/ usr@178.156.192.201:/var/www/noctur.no/jongleur/" +#christcast.org-build() { +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/run.sh +# deactivate +# jump-to-downloads +#} +#christcast.org-build-all() { +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/runAll.sh +# deactivate +# jump-to-downloads +#} +#alias christcast.org-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/html_export/ usr@178.156.192.201:/var/www/christcast.org/jongleur/" diff --git a/dots/bin/deploySshKeys.sh b/dots/bin/deploySshKeys.sh index 5ef7654..f66eeb9 100755 --- a/dots/bin/deploySshKeys.sh +++ b/dots/bin/deploySshKeys.sh @@ -20,23 +20,24 @@ fi if ! [[ -d "$trg_ssh_dir" ]]; then echo "creating non-existing target dir '${trg_ssh_dir}'." mkdir -p ${trg_ssh_dir} + chmod 0700 ${trg_ssh_dir} fi files=$(shopt -s nullglob dotglob; echo ${trg_ssh_dir}/*.pub) if (( ${#files} )) then - echo "*.pub already exist in ${trg_ssh_dir}" + echo "*.pub file(s) already exist in ${trg_ssh_dir}" else - echo "deploy .pub file" + echo "deploy .pub file(s)" cp ${src_ssh_dir}/*.pub ${trg_ssh_dir} fi files=$(shopt -s nullglob dotglob; echo ${trg_ssh_dir}/*.gpg) if (( ${#files} )) then - echo "*.gpg already exist in ${trg_ssh_dir}" + echo "*.gpg file(s) already exist in ${trg_ssh_dir}" else - echo "deploy .gpg file" + echo "deploy .gpg file(s)" cp ${src_ssh_dir}/*.gpg ${trg_ssh_dir} fi @@ -55,6 +56,7 @@ if [[ ${user_input} == "y" ]]; then gpg -d ${trg_ssh_dir}/${filename}.gpg > ${trg_ssh_dir}/${filename} chmod 0600 ${trg_ssh_dir}/${filename} # id_rsa can not be accessible by other users + trash-put ${trg_ssh_dir}/${filename}.gpg done else diff --git a/dots/ssh/config b/dots/ssh/config index a83efdc..3f5d8ec 100644 --- a/dots/ssh/config +++ b/dots/ssh/config @@ -5,10 +5,6 @@ # User differentusername # IdentityFile ~/.ssh/identity_file2 -Host quickSilver - HostName 46.62.245.126 - IdentityFile ~/.ssh/251110_quickSystems - Host weba HostName 178.156.192.201 - IdentityFile ~/.ssh/251110_ed25519_klevstul + IdentityFile ~/.ssh/2024_id_rsa