better screenshots and spl

diff --git a/shell/.bashrc b/shell/.bashrc
index e199fb4..5a93dcc 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -13,14 +13,14 @@ export BROWSER=firefox
 export PAGER=less
 
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
-export NOTMUCH_CONFIG=/home/mart/.mutt/notmuch-config
+export NOTMUCH_CONFIG=~/.mutt/notmuch-config
 
 export CLEAN_HOME=~/projects/clean-itasks
 export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:~/.local/bin
 
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias vi='vim'
+alias vi=vim
 alias autoclean='sudo pacman -R $(pacman -Qtdq)'
 
 set_prompt(){

diff --git a/x/.config/i3/config b/x/.config/i3/config
index b21cb98..1d1485c 100644 (file)
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -56,7 +56,7 @@ bindsym $mod+s focus right
 # alternatively, you can use the cursor keys:
 bindsym XF86MonBrightnessUp exec xbacklight -inc 5
 bindsym XF86MonBrightnessDown exec xbacklight -dec 5
-bindsym XF86AudioMute exec amixer -c 1 set Master mute
+bindsym XF86AudioMute exec amixer -c 1 set Master toggle
 bindsym XF86AudioLowerVolume exec amixer -c 1 set Master 5%-
 bindsym XF86AudioRaiseVolume exec amixer -c 1 set Master 5%+
 

diff --git a/x/.local/bin/scr b/x/.local/bin/scr
index 85bca85..5a888fc 100755 (executable)
--- a/x/.local/bin/scr
+++ b/x/.local/bin/scr
@@ -1,9 +1,6 @@
-#!/bin/bash
-[[ "$#" -eq 0 ]] && WINDOW=root || WINDOW="$(xdotool getwindowfocus -f)"
-URL="$(date +%F_%H-%M-%S).png"
-import -window "$WINDOW" -quality 90 png:- | curl -s\
-       -u "ftp@martlubbers.net:$(pass ftp.martlubbers.net/ftp@martlubbers.net)"\
-       -T- "ftp://martlubbers.net/public_html/scr/$URL"
-echo "http://martlubbers.net/scr/$URL" | pee \
-       "xclip -selection clipboard" "xclip"\
-       "xargs -I{} notify-send {}"
+#!/bin/sh -e
+[ "$#" -eq 1 ] && CROP="$(slop -t 0 -f "-crop %g")"
+URL="scr/$(date +%F_%H-%M-%S).png"
+import -window root $CROP png:- | \
+               ssh ygdrassil ssh martlubbers.net "cat \> public_html/$URL"
+echo "https://martlubbers.net/$URL" | xclip -f | xargs -I{} notify-send {}