From 255d81f9cc8a7e51cc0b138a0ef83f3724541b70 Mon Sep 17 00:00:00 2001 From: Alexander Bocken Date: Wed, 10 Mar 2021 15:31:40 +0100 Subject: [PATCH] smaller improvements modified: .config/aliasrc modified: .config/dunst/dunstrc modified: .config/mutt/muttrc modified: .config/qutebrowser/autoconfig.yml modified: .config/qutebrowser/quickmarks modified: .config/ranger/rc.conf modified: .local/bin/displayselect modified: .local/bin/dmenumount modified: .local/bin/statusbar/appointments modified: .local/bin/statusbar/music deleted: .local/bin/tools/timer --- .config/aliasrc | 1 - .config/dunst/dunstrc | 2 +- .config/mutt/muttrc | 1 + .config/qutebrowser/autoconfig.yml | 4 +++ .config/qutebrowser/quickmarks | 2 ++ .config/ranger/rc.conf | 39 ++++++++++++++---------------- .local/bin/displayselect | 2 +- .local/bin/dmenumount | 4 +-- .local/bin/statusbar/appointments | 8 +++--- .local/bin/statusbar/music | 8 +++++- .local/bin/tools/timer | 23 ------------------ 11 files changed, 41 insertions(+), 53 deletions(-) delete mode 100755 .local/bin/tools/timer diff --git a/.config/aliasrc b/.config/aliasrc index 8b46846..c5e9755 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -53,6 +53,5 @@ alias \ tmux="tmux -f ${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf"\ cast="mkchromecast --video --control -i"\ castaudio="mkchromecast --control --screencast --b 320"\ - mlterm="matlab -nosplash -nodesktop -noopengl" alias config='/usr/bin/git --git-dir=/home/alex/.local/share/git_dotfiles --work-tree=/home/alex' diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index c658825..8d7f571 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -22,7 +22,7 @@ plain_text = no # %I iconname (without its path) # %p progress value if set ([ 0%] to [100%]) or nothing # Markup is allowed -format = "%s\n%b" +format = "%s\n%b\n%p" # Sort messages by urgency. sort = no diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 8724625..a14ae62 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -3,3 +3,4 @@ source /usr/local/share/mutt-wizard/mutt-wizard.muttrc # mw-autogenerated macro index,pager i2 'source /home/alex/.config/mutt/accounts/2-ethz.muttrc!;' "switch to abocken@ethz.ch" # mw-autogenerated source /home/alex/.config/mutt/accounts/1-bocken.muttrc # mw-autogenerated macro index,pager i1 'source /home/alex/.config/mutt/accounts/1-bocken.muttrc!;' "switch to alexander@bocken.org" # mw-autogenerated +macro index,pager i3 'source /home/alex/.config/mutt/accounts/3-moodle.muttrc!;' "switch to moodle@bocken.org" # mw-autogenerated diff --git a/.config/qutebrowser/autoconfig.yml b/.config/qutebrowser/autoconfig.yml index 17939cc..e9350c2 100644 --- a/.config/qutebrowser/autoconfig.yml +++ b/.config/qutebrowser/autoconfig.yml @@ -38,6 +38,10 @@ settings: content.headers.user_agent: global: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36 + content.media.audio_capture: + https://teams.microsoft.com: true + content.media.audio_video_capture: + https://teams.microsoft.com: true content.notifications: https://1337x.to: false https://boards.4chan.org: true diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks index a3b06ae..e78a113 100644 --- a/.config/qutebrowser/quickmarks +++ b/.config/qutebrowser/quickmarks @@ -11,3 +11,5 @@ dynamics https://video.ethz.ch/live/lectures/zentrum/ml/ml-d-28/blackboard.html dim1 https://video.ethz.ch/live/lectures/zentrum/hg/hg-f-7.html wuf2 https://video.ethz.ch/live/lectures/zentrum/eta/eta-f-5.html rt2 https://moodle-app2.let.ethz.ch/course/view.php?id=14186 +mech2live https://video.ethz.ch/live/lectures/zentrum/eta/eta-f-5.html +mech2unterlagen https://n.ethz.ch/~bamertd/download/ diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index 97869b2..dc1d7de 100644 --- a/.config/ranger/rc.conf +++ b/.config/ranger/rc.conf @@ -281,17 +281,13 @@ set save_tabs_on_exit false # Enable scroll wrapping - moving down while on the last item will wrap around to # the top and vice versa. set wrap_scroll false - -map gmd cd ~/eth/mad -map gm2 cd ~/eth/mech2 -map gw2 cd ~/eth/wuf2 -map gev cd ~/eth/videos -map gq cd ~/eth/quant -map gf1 cd ~/eth/fluid1 -map gij cd ~/eth/innoproj -map giz cd ~/eth/innproz -map get cd ~/eth/thermo2 -map gew cd ~/eth/werkstatt +map gNe cd ~/eth/negotiation +map gMe cd ~/eth/mech2 +map gWu cd ~/eth/wuf2 +map gIn cd ~/eth/inno +map gDa cd ~/eth/data +map gRt cd ~/eth/rt2 +map gCh cd ~/eth/chemie map gvl cd vl map gus cd üs map gco cd coll @@ -440,22 +436,22 @@ map ) jump_non map gh cd ~ map gE cd ~/eth -map gee cd ~/eth/el_eng -map gmd cd ~/eth/mad -map gm2 cd ~/eth/mech2 -map gw2 cd ~/eth/wuf2 -map gev cd ~/eth/videos -map gq cd ~/eth/quant -map gf1 cd ~/eth/fluid1 -map gij cd ~/eth/innoproj -map giz cd ~/eth/innoproz +#map gee cd ~/eth/el_eng +#map gmd cd ~/eth/mad +#map gm2 cd ~/eth/mech2 +#map gw2 cd ~/eth/wuf2 +#map gev cd ~/eth/videos +#map gq cd ~/eth/quant +#map gf1 cd ~/eth/fluid1 +#map gij cd ~/eth/innoproj +#map giz cd ~/eth/innoproz map gl cd -r . map gL cd -r %f #map gi eval fm.cd('/run/media/' + os.getenv('USER')) map gM cd /mnt map gs cd /srv map gr cd / -map gR eval fm.cd(ranger.RANGERDIR) +#map gR eval fm.cd(ranger.RANGERDIR) map g/ cd / map g? cd /usr/share/doc/ranger @@ -745,3 +741,4 @@ tmap eval -q fm.ui.taskview.task_remove() tmap redraw_window tmap taskview_close copytmap q Q w +map shell st ranger '%d' & disown diff --git a/.local/bin/displayselect b/.local/bin/displayselect index fade44d..e73e2f4 100755 --- a/.local/bin/displayselect +++ b/.local/bin/displayselect @@ -5,7 +5,7 @@ # selection" which opens arandr. #automatically scale HD screens to better work with hidpi -scale_factor_HD=1.6 +scale_factor_HD=${1:-1.6} #fixes issue that script gets called twice for some reason [ "$(pgrep -c displayselect)" -gt 1 ] && exit diff --git a/.local/bin/dmenumount b/.local/bin/dmenumount index 5884f45..66d9c85 100755 --- a/.local/bin/dmenumount +++ b/.local/bin/dmenumount @@ -34,9 +34,9 @@ mountandroid() { \ chosen="$(echo "$anddrives" | dmenu -i -p "Which Android device?")" || exit 1 chosen="$(echo "$chosen" | cut -d : -f 1)" getmount "$HOME -maxdepth 3 -type d" - simple-mtpfs --device "$chosen" "$mp" + mtpfs --device "$chosen" "$mp" #echo "OK" | dmenu -i -p "Tap Allow on your phone if it asks for permission and then press enter" || exit 1 - simple-mtpfs --device "$chosen" "$mp" + mtpfs --device "$chosen" "$mp" notify-send "🤖 Android Mounting" "Android device mounted to $mp." } diff --git a/.local/bin/statusbar/appointments b/.local/bin/statusbar/appointments index 0789340..a7643e4 100755 --- a/.local/bin/statusbar/appointments +++ b/.local/bin/statusbar/appointments @@ -6,6 +6,10 @@ if [ -n "$diff" ]; then secs=$(( $(echo "$diff" | cut -f1 -d ':') * 3600 + $(echo "$diff" | cut -f2 -d ':') *60 )) time_appointment="$(date --date "@$(( $( date +'%s' ) + $secs ))" +"%s")" appointment="$(calcurse --next | tail -n1 | awk '{$1=""; print $0}' | sed 's/^\s*//')" + #shorten lecture appointments to just the name of lecture without profs + if [ "${#appointment}" -gt 20 ]; then + appointment="$(echo "$appointment" | sed -E 's/\(([VUG])\).*/(\1)/')" + fi if [ "$1" = "notif" ]; then msg="$(printf '%s\n%s' "$(date --date "@$time_appointment" +'%H:%M')" "$appointment")" notify-send "Appointment coming up" "$msg" @@ -15,9 +19,7 @@ if [ -n "$diff" ]; then if [ ! -f /tmp/nodunst ]; then printf '%s %s' "$(date --date "@$time_appointment" +'%H:%M')" "$appointment" fi - printf '\n' fi fi -else - printf '\n' fi +printf '\n' diff --git a/.local/bin/statusbar/music b/.local/bin/statusbar/music index 617c8a3..f649a93 100755 --- a/.local/bin/statusbar/music +++ b/.local/bin/statusbar/music @@ -5,6 +5,12 @@ 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") + full_length="$(mpc status | sed "/^volume:/d" | tac | sed -e "s/\\[paused\\].*//g;s/\\[playing\\].*//g" | tr -d '\n' | sed -e "s/$/ /g")" + #remove full directory structure if no title present and too long + if [ ${#full_length} -gt 40 ]; then + echo "${full_length##*/}" + else + echo "$full_length" + fi exit fi diff --git a/.local/bin/tools/timer b/.local/bin/tools/timer deleted file mode 100755 index c2e4fab..0000000 --- a/.local/bin/tools/timer +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -turns=15 -if [[ -n $1 ]];then - turns=$1 -fi -echo "Starting!" -let "i=1" -notify-send "Timer" "Starting, $turns minutes to go" -for ((turn=1; turn<=$turns; turn++)); -do - clear - echo "turn $turn" - echo "###########" - sleep 2 - for seconds in {1..60} - do - echo "$seconds secs. passed" - sleep 1 - done - notify-send "Timer" "Switch\n($i/$turns done)" - let "i=i+1" -done -clear