diff --git a/.config/coc/extensions/db.json b/.config/coc/extensions/db.json index 39d290a..e7a4df5 100644 --- a/.config/coc/extensions/db.json +++ b/.config/coc/extensions/db.json @@ -1,3 +1,3 @@ { - "lastUpdate": 1594283334586 + "lastUpdate": 1594985134646 } \ No newline at end of file diff --git a/.config/newsboat/config b/.config/newsboat/config index 88431ee..cc4853a 100644 --- a/.config/newsboat/config +++ b/.config/newsboat/config @@ -1,7 +1,8 @@ #show-read-feeds no auto-reload yes -external-url-viewer "urlscan -dc -r 'linkhandler {}'" +#external-url-viewer "urlscan -dc -r 'linkhandler {}'" +external-url-viewer "newsboat_urlscan {}" bind-key j down bind-key k up @@ -21,20 +22,32 @@ bind-key N prev-unread bind-key D pb-download bind-key U show-urls bind-key x pb-delete -bind-key ^t next-unread color listnormal cyan default color listfocus black yellow standout bold color listnormal_unread blue default color listfocus_unread yellow default bold color info red black bold -color article cyan default +color article white default bold browser linkhandler macro , open-in-browser -macro t set browser "tsp youtube-dl --add-metadata -ic"; open-in-browser ; set browser linkhandler -macro a set browser "tsp youtube-dl --add-metadata -xic -f bestaudio/best"; open-in-browser ; set browser linkhandler -macro v set browser "setsid nohup mpv"; open-in-browser ; set browser linkhandler -macro w set browser "w3m"; open-in-browser ; set browser linkhandler -macro p set browser "setsid dmenuhandler"; open-in-browser ; set browser linkhandler -macro c set browser "xsel -b <<<" ; open-in-browser ; set browser linkandler +macro t set browser "qndl" ; open-in-browser ; set browser linkhandler +macro a set browser "tsp youtube-dl --add-metadata -xic -f bestaudio/best" ; open-in-browser ; set browser linkhandler +macro v set browser "setsid -f mpv" ; open-in-browser ; set browser linkhandler +macro w set browser "lynx" ; open-in-browser ; set browser linkhandler +macro p set browser "dmenuhandler" ; open-in-browser ; set browser linkhandler +macro c set browser "xsel -b <<<" ; open-in-browser ; set browser linkhandler + +highlight all "---.*---" yellow +highlight feedlist ".*(0/0))" black +highlight article "(^Feed:.*|^Title:.*|^Author:.*)" cyan default bold +highlight article "(^Link:.*|^Date:.*)" default default +highlight article "https?://[^ ]+" green default +highlight article "^(Title):.*$" blue default +highlight article "\\[[0-9][0-9]*\\]" magenta default bold +highlight article "\\[image\\ [0-9]+\\]" green default bold +highlight article "\\[embedded flash: [0-9][0-9]*\\]" green default bold +highlight article ":.*\\(link\\)$" cyan default +highlight article ":.*\\(image\\)$" blue default +highlight article ":.*\\(embedded flash\\)$" magenta default diff --git a/.config/qutebrowser/autoconfig.yml b/.config/qutebrowser/autoconfig.yml index 7713ce0..520a7af 100644 --- a/.config/qutebrowser/autoconfig.yml +++ b/.config/qutebrowser/autoconfig.yml @@ -19,6 +19,7 @@ settings: content.notifications: https://boards.4chan.org: true https://boards.4channel.org: true + https://nobodyhasthe.biz: true https://riot.im: true https://support.cloud.google.com: true https://www.reddit.com: false diff --git a/.config/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls index 3ed044f..bd8c89a 100644 --- a/.config/qutebrowser/bookmarks/urls +++ b/.config/qutebrowser/bookmarks/urls @@ -1 +1,2 @@ https://security.stackexchange.com/questions/220068/using-local-port-forwarding-from-raspberrypi-to-vps-in-order-to-be-able-to-acces ssh - Using local port forwarding from RaspberryPI to VPS in order to be able to access the PI from anywhere on the Internet, security considerations? - Information Security Stack Exchange +https://gist.github.com/attacus/cb5c8a53380ca755b10a5b37a636a0b9 Create your own encrypted chat server with Riot and Matrix diff --git a/.config/xprofile b/.config/xprofile index d02296c..3b16bf4 100755 --- a/.config/xprofile +++ b/.config/xprofile @@ -20,8 +20,8 @@ xcompmgr & # xcompmgr for transparency dunst & # dunst for notifications dwmblocks & xset r rate 300 50 & # Speed xrate up -unclutter --ignore-scrolling & # Remove mouse when idle -insync start 2>&1 /dev/null & +unclutter --timeout 2 --ignore-scrolling & # Remove mouse when idle +insync start & riot-desktop --hidden & echo "$HOME/.config/mpd/state" | entr -np pkill -RTMIN+11 dwmblocks & xrandr --listactivemonitors | grep -q '1920.*x1080.*HDMI-1$' && ( xrandr --output HDMI-1 --scale 1.5 && setbg ) # set scale for 2nd monitor if connected diff --git a/.local/bin/bt b/.local/bin/bt index 6b90de7..47f399c 100755 --- a/.local/bin/bt +++ b/.local/bin/bt @@ -1,7 +1,7 @@ #!/bin/sh SCAN_PERIOD=5 AUTOTRUST=false #trust every newly paired device -AUTOSCAN=true #immediately start scanning when started to speed up pairing process +AUTOSCAN=false #immediately start scanning when started to speed up pairing process #locations of blacklist and hard coded list of paired devices (watch out, need to modify Makefile as well if you want to change these values and still use make install) BLACKLIST=${XDG_DATA_HOME:-$HOME/.local/share}/bt/blacklist PAIRLIST=${XDG_DATA_HOME:-$HOME/.local/share}/bt/paired @@ -30,11 +30,12 @@ scan(){ scanstatus="$( bluetoothctl show | grep Discovering | awk '{print $2}' )" if [ "$1" = on ]; then #sets variable in case scanning was no already on before the start of bt - [ "$start_scan" = "" ] && start_scan="$( date +'%s' )" + [ -f /tmp/bt_start_scan$$ ] || start_scan="$( date +'%s' )" if [ "$scanstatus" = "no" ]; then bluetoothctl scan on & start_scan="$( date +'%s' )" fi + echo "$start_scan" > /tmp/bt_start_scan$$ elif [ "$1" = off ]; then if [ "$scanstatus" = "yes" ]; then bluetoothctl scan off @@ -54,8 +55,15 @@ update_pair_list(){ #start scanning as early as possible to speed up pairing process -#In function to more quickly display the menu startup(){ + #remove old tmp files + for f in /tmp/* + do + case $f in + /tmp/bt_start_scan*) rm "$f";; + *) true;; + esac + done if $AUTOSCAN then power on @@ -64,7 +72,7 @@ startup(){ } #Sadly needs to be run without '&' for now, since it otherwise breaks start_scan variable -startup +startup & update_pair_list & # shellcheck disable=SC1091 @@ -91,6 +99,7 @@ poweroption="$( echo "$powerstatus" | sed 's/yes/power off/; s/no/power on/' )" cleanup(){ scan off + rm /tmp/bt_start_scan$$ 2> /dev/null exit 0 } @@ -99,6 +108,7 @@ pair(){ power on scan on #check whether $SCAN_PERIOD seconds has already passed since starting scanning, if not, wait for the rest of that time. + start_scan="$(cat /tmp/bt_start_scan$$)" if [ $((( "$(date +'%s')" - "$start_scan" ))) -lt $SCAN_PERIOD ]; then sleep_period="$((( "$SCAN_PERIOD" - "$( date +'%s')" + "$start_scan" )))" if [ "$sleep_period" -eq 1 ]; then @@ -125,6 +135,7 @@ pair(){ if [ -n "$choice" ]; then if [ "$choice" = "rescan" ]; then start_scan="$( date +'%s')" + echo "$start_scan" > /tmp/bt_start_scan$$ pair else dev_no=$( echo "$new_devices" | nl | grep "$choice" | awk '{print $1}') @@ -210,7 +221,9 @@ case $choice in [ "$dev_no" != "" ] && dev_id=$( echo "$bt_IDS" | nl | grep -P "^.*$dev_no\t" | awk '{print $2}') if [ -n "$dev_id" ]; then power on - bluetoothctl pair "$dev_id" + bluetoothctl devices | grep -q "$dev_id" || bluetoothctl pair "$dev_id" bluetoothctl connect "$dev_id" fi;; esac + +cleanup diff --git a/.local/bin/dropdowncalc b/.local/bin/dropdowncalc index bdb53b4..a4a1c6b 100755 --- a/.local/bin/dropdowncalc +++ b/.local/bin/dropdowncalc @@ -1,2 +1,2 @@ #!/bin/sh -ifinstalled python && python -iq -c "print('Welcome to the Calculator'); from numpy import *" +ifinstalled python && python -iq -c "print('Welcome to the Calculator'); from numpy import *; import sys; sys.ps1='>'" diff --git a/.local/bin/statusbar/cpu b/.local/bin/statusbar/cpu index bfcf15d..1c3c058 100755 --- a/.local/bin/statusbar/cpu +++ b/.local/bin/statusbar/cpu @@ -7,6 +7,6 @@ case $BLOCK_BUTTON in - % is of single core." ;; esac -temp=$(sensors | awk '/Package id 0/ {print "🌡 "$4}' | sed 's/\.[0-9]//; s/+//') +temp=$(sensors | awk '/Package id 0/ {print "🌡"$4}' | sed 's/\.[0-9]//; s/+//') [ -n "$temp" ] && echo $temp > /tmp/cpu_temp cat /tmp/cpu_temp diff --git a/.local/bin/statusbar/getbright b/.local/bin/statusbar/getbright index 06617ab..59146d5 100755 --- a/.local/bin/statusbar/getbright +++ b/.local/bin/statusbar/getbright @@ -1,2 +1,2 @@ #!/bin/bash -echo ☀ $(bc <<< "scale=0; $(cat /sys/class/backlight/intel_backlight/brightness) /9.37")% +echo ☀$(bc <<< "scale=0; $(cat /sys/class/backlight/intel_backlight/brightness) /9.37")% diff --git a/.local/bin/statusbar/getmail b/.local/bin/statusbar/getmail index 7288e63..d832137 100755 --- a/.local/bin/statusbar/getmail +++ b/.local/bin/statusbar/getmail @@ -1,3 +1,3 @@ #!/bin/bash num=$(find ~/.local/share/mail/*/INBOX/new -type f | wc -l) -[ $num != 0 ] && echo "📬 "$num +[ $num != 0 ] && echo "📬"$num diff --git a/.local/bin/statusbar/music b/.local/bin/statusbar/music index 9ca8b29..7255734 100755 --- a/.local/bin/statusbar/music +++ b/.local/bin/statusbar/music @@ -4,6 +4,6 @@ if [ $( mpc status | grep '\[paused\]' | wc -l ) -eq 1 ]; then fi if [ $( mpc status | grep '\[playing\]' | wc -l ) -eq 1 ]; then - #echo $(mpc status | sed "/^volume:/d" | tac | sed -e "s/\\[paused\\].*//g;s/\\[playing\\].*//g" | tr -d '\n' | sed -e "s/$/ /g") + echo $(mpc status | sed "/^volume:/d" | tac | sed -e "s/\\[paused\\].*//g;s/\\[playing\\].*//g" | tr -d '\n' | sed -e "s/$/ /g") exit fi diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf index 3f42c11..ae94922 100755 --- a/.local/bin/statusbar/nettraf +++ b/.local/bin/statusbar/nettraf @@ -27,8 +27,14 @@ lasttime=${XDG_CACHE_HOME:-$HOME/.cache}/nettraf_time rx=$(update /sys/class/net/[ew]*/statistics/rx_bytes) tx=$(update /sys/class/net/[ew]*/statistics/tx_bytes) timedifference=$(( "$(date +'%s')" - "$previoustime" )) -rx_avg=$(( "$rx" / "$timedifference" )) -tx_avg=$(( "$tx" / "$timedifference" )) +if [ -n "$timedifference" ]; then + rx_avg=$(( "$rx" / "$timedifference" )) + tx_avg=$(( "$rx" / "$timedifference" )) +else + rx_avg=rx_bytes + tx_avg=tx_bytes +fi + #only print if any traffic at all if [ "$rx_avg" -gt 0 ] || [ "$tx_avg" -gt 0 ] diff --git a/.local/bin/statusbar/news b/.local/bin/statusbar/news index d836533..667f729 100755 --- a/.local/bin/statusbar/news +++ b/.local/bin/statusbar/news @@ -1,3 +1,4 @@ #!/bin/bash +newsboat -x reload num=$( cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print $1}' | sed s/^0$//g)$(cat ~/.config/newsboat/.update 2>/dev/null)") [ "$num" = "" ] || echo 📰$num diff --git a/.local/bin/statusbar/pacpackages b/.local/bin/statusbar/pacpackages index 418bc2d..2f1beba 100755 --- a/.local/bin/statusbar/pacpackages +++ b/.local/bin/statusbar/pacpackages @@ -1,18 +1,9 @@ #!/bin/sh -# i3blocks module for pacman upgrades. # Displays number of upgradeable packages. # For this to work, have a `pacman -Sy` command run in the background as a # cronjob every so often as root. This script will then read those packages. # When clicked, it will run an upgrade via pacman. -case $BLOCK_BUTTON in - 1) $TERMINAL -e popupgrade ;; - 2) notify-send "$(/usr/bin/pacman -Qu)" ;; - 3) pgrep -x dunst >/dev/null && notify-send "Upgrade module" "📦: number of upgradable packages -- Left click to upgrade packages -- Middle click to show upgradable packages" ;; -esac - - -pacman -Qu | grep -v "\[ignored\]" | wc -l | sed -e "s/^0$//g" +no="$( pacman -Qu | grep -Fcv "[ignored]" )" +echo "$no" | sed "s/^/📦/;s/^📦0$//g" diff --git a/.local/bin/statusbar/popupgrade b/.local/bin/statusbar/popupgrade index 83035c3..d1f2c33 100755 --- a/.local/bin/statusbar/popupgrade +++ b/.local/bin/statusbar/popupgrade @@ -2,7 +2,7 @@ printf "Beginning upgrade.\\n" -yay -Syu +yay -Qyu pkill -RTMIN+8 i3blocks printf "\\nUpgrade complete.\\nPress to exit window.\\n\\n" diff --git a/.local/bin/statusbar/volume b/.local/bin/statusbar/volume index acb8586..0442eca 100755 --- a/.local/bin/statusbar/volume +++ b/.local/bin/statusbar/volume @@ -45,4 +45,4 @@ else icon="🔉" fi -printf "%s %s%%\\n" "$icon" "$vol" +printf "%s%s%%\\n" "$icon" "$vol"