t* dwm + patches URI git clone git://git.codevoid.de/dwm-sdk DIR Log DIR Files DIR Refs DIR README DIR LICENSE --- DIR commit 40fe6342fd394b18d6baf724cec5ad2daa6902f2 DIR parent d2fcf19029e2233002047b53ff2a6ab2b50c7352 URI Author: Stefan Hagen <sh+git[at]codevoid[dot]de> Date: Sat, 27 Apr 2019 09:02:08 +0200 Update Scripts Diffstat: M scripts/browser | 71 ++++++++++++++++++++++--------- M scripts/passmenu | 3 ++- M scripts/sshot | 14 ++++++++++---- 3 files changed, 63 insertions(+), 25 deletions(-) --- DIR diff --git a/scripts/browser b/scripts/browser t@@ -1,40 +1,71 @@ #!/bin/sh +PROMPT="Bookmarks" +BROWSER="luakit -Un" +BMPATH="$HOME/.browser-bookmarks-$(hostname -s)" +DMENUOPTS="$@" -PROMPT="Browser" -BROWSER_OPEN="luakit -Un" +d_out() { + if tty -s; then + printf "%s\n" "$@" + fi +} -echo "Launching dmenu" -BM=$(cat ~/.browser-bookmarks | dmenu -p "$PROMPT" "$@") +out() { + printf "%s\n" "$@" +} -echo "Check if search string contains dot" -if echo "$BM" | grep -q '\.'; then - echo "Check if dot string is in bookmarks" - if ! grep -q "$BM" ~/.browser-bookmarks; then - echo "Add dot string to bookmarks" - echo "$BM" >> ~/.browser-bookmarks +browse() { + PRG="$(printf "Luakit\nChrome\n" | dmenu -p "Program" $DMENUOPTS )" + case $PRG in + Luakit) BROWSER="luakit -Un";; + Chromium) BROWSER="chrome --new-window";; + Vimb) BROWSER="vimb";; + Surf) BROWSER="surf";; + Firefox) BROWSER="firefox --new-window";; + *) exit 0;; + esac + $BROWSER "$@" +} + +d_out "Launching dmenu" +BM="$(dmenu -p "$PROMPT" $DMENUOPTS < "$BMPATH")" + +d_out "Check if search string contains dot" +if out "$BM" | grep -q '\.'; then + d_out "Check if dot string is in bookmarks" + if ! grep -q "$BM" "$BMPATH"; then + d_out "Add dot string to bookmarks" + out "$BM" >> "$BMPATH" fi - echo "Open dot string in browser" - $BROWSER_OPEN "$BM" + d_out "Open dot string in browser" + browse "$BM" exit 0 fi -echo "Check for clipboard url" +d_out "Check for clipboard url" if [ "$BM" = "paste_from_clipboard" ]; then - echo "Open clipboard as URL" - $BROWSER_OPEN "$(xclip -o -selection clipboard | sed 's/ /+/g')" + d_out "Open clipboard as URL" + browse "$(xclip -o -selection clipboard | sed 's/ /+/g')" exit 0 fi -echo "Check for clipboard search" +d_out "Check for clipboard search" if [ "$BM" = "search_from_clipboard" ]; then - echo "Open clipboard as search" - $BROWSER_OPEN "https://duckduckgo.com/?q=$(xclip -o -selection clipboard | sed 's/ /+/g')" + d_out "Open clipboard as search" + browse "https://duckduckgo.com/?q=$(xclip -o -selection clipboard | sed 's/ /+/g')" + exit 0 +fi + +d_out "Check for gopher link" +if [ "$BM" = "open_gopher" ]; then + d_out "Open gopher link via proxy" + browse "https://codevoid.de/?q=$(xclip -o -selection clipboard | sed 's/ /+/g')" exit 0 fi -echo "No dot, no clipboard command... search for it!" +d_out "No dot, no gopher, no clipboard command... search for it!" if [ "$BM" != "" ]; then - $BROWSER_OPEN "https://duckduckgo.com/?q=$(echo $BM | sed 's/ /+/g')" + browse "https://duckduckgo.com/?q=$(out "$BM" | sed 's/ /+/g')" exit 0 fi DIR diff --git a/scripts/passmenu b/scripts/passmenu t@@ -19,7 +19,8 @@ password=$(printf '%s\n' "${password_files[@]}" | dmenu -i "$@") if [[ $typeit -eq 0 ]]; then pass show -c "$password" 2> /dev/null - notify-send -t 16000 -a "Password Store" $(pass "$password" | head -2 | tail -1) + #notify-send -t 16000 -a "Password Store" $(pass "$password" | head -2 | tail -1) + printf "$(pass "$password")\n" | head -2 | tail -1 | $HOME/.bin/osd_pipe.sh else pass show "$password" | { read -r pass; printf %s "$pass"; } | xdotool type --clearmodifiers --file - DIR diff --git a/scripts/sshot b/scripts/sshot t@@ -1,7 +1,8 @@ #!/bin/sh +sleep 1 # 2018-1105-1931-14tu.jpg -out=$(date "+%Y-%m%d-%H%M-%S$(pwgen -10A 2).jpg") +out=$(date "+%Y-%m%d-%H%M-%S$(pwgen -10A 2).jpg" | tr -d "\n") # take screenshot scrot -s /tmp/$out t@@ -9,7 +10,12 @@ scrot -s /tmp/$out # optimize jpegoptim --strip-all --all-normal --max=83 /tmp/$out +# move to server scp /tmp/$out git[at]codevoid[dot]de:/srv/codevoid-gopher/p/$out -echo "https://codevoid.de/?q=/I/p/$out" | xclip -echo "https://codevoid.de/?q=/I/p/$out" -echo "gophers://codevoid.de/I/p/$out" + +# copy & announce +printf "/I/p/$out" | xclip +printf "https://codevoid.de/?q=/I/p/$out\n" +printf "gophers://codevoid.de/I/p/$out\n" +printf "Screenshot ready\n" | osd_pipe.sh +printf "/I/p/$out\n" | osd_pipe.sh