dotfiles

commit 6ba854b784e569aba8159f81a65cc844c2f33390
parent 8ce2c311af7357d7af50f87c40875793e5215bce
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Fri,  3 May 2019 10:30:30 +0200

Various shell improvements

Diffstat:
M
.xinitrc
 | 
14
++++----------
M
bin/xlock
 | 
14
+++++++-------

2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/.xinitrc b/.xinitrc
@@ -4,7 +4,7 @@
 xsetroot -cursor_name left_ptr &
 
 # Set background
-$HOME/bin/wallpaper.sh
+~/bin/wallpaper.sh
 
 # Set display color profile
 #[ -f ~/doc/colorprofile.icc ] && xcalib ~/doc/colorprofile.icc 
@@ -13,11 +13,11 @@ $HOME/bin/wallpaper.sh
 xrdb ~/.Xresources
 
 # Start auth deamons
-eval $(ssh-agent)
-eval $(gpg-agent)
+eval "$(ssh-agent)"
+eval "$(gpg-agent)"
 
 # Automatically suspend system after 20 mins of inactivity
-xautolock -time 10 -locker $HOME/bin/xlock -detectsleep &
+xautolock -time 10 -locker "$HOME"/bin/xlock -detectsleep &
 
 # Read .Xmodmap for modified keys
 setxkbmap -option ctrl:nocaps -option altwin:swap_lalt_lwin
@@ -26,12 +26,6 @@ setxkbmap -option ctrl:nocaps -option altwin:swap_lalt_lwin
 # Read .xbindkeysrc for special key-bindings
 xbindkeys
 
-# Setup two monitors at iddqd
-if [ "$(hostname)" = "iddqd" ]; then
-    xrandr --output DVI-D-0 --primary
-    xrandr --output DP-1 --auto --left-of DVI-D-0
-fi
-
 if [ "$(hostname)" != "phony" ]; then
     # default temperature is 6500 K day, 4500 K night
     redshift -l 56.09:10.12 -t 7500:3300 &  # Aarhus
diff --git a/bin/xlock b/bin/xlock
@@ -11,10 +11,10 @@ function get_short_fortune {
     done
 }
 
-img=/tmp/screenshot.png
-maim $img
+img="$(mktemp tmp.XXXXXXXXXX.png)"
+maim "$img"
 #gm convert $img -blur 0x10 $img
-convert $img \
+convert "$img" \
     -blur 0x10 \
     -fill black \
     -colorize 20% \
@@ -23,13 +23,13 @@ convert $img \
     -font 'PragmataPro' \
     -pointsize 142 \
     -annotate +0-7 '🔒' \
-    $img
-convert $img \
+    "$img"
+convert "$img" \
     -fill white \
     -gravity Center \
     -font 'PragmataPro' \
     -pointsize 22 \
     -annotate +0+160 \
     "$(get_short_fortune)" \
-    $img
-i3lock -i $img
+    "$img"
+i3lock -i "$img"