Merge branch 'master' into laptop

diff --git a/shell/.bashrc b/shell/.bashrc
index 9914d82..4427af9 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -21,7 +21,6 @@ export PATH=~/.local/bin:$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
-alias autoclean='sudo pacman -R $(pacman -Qtdq)'
 
 set_prompt(){
        last_c=$?

diff --git a/x/.local/bin/scr b/x/.local/bin/scr
index 5a888fc..dfe5edd 100755 (executable)
--- a/x/.local/bin/scr
+++ b/x/.local/bin/scr
@@ -2,5 +2,5 @@
 [ "$#" -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"
+       ssh ygdrassil ssh martlubbers.net "cat \> public_html/$URL"
 echo "https://martlubbers.net/$URL" | xclip -f | xargs -I{} notify-send {}