From f2d5b027fda052a0d42ed6ac0f2bda59e868ddb9 Mon Sep 17 00:00:00 2001
From: Kai Hendry <hendry@iki.fi>
Date: Tue, 27 Dec 2011 21:55:00 +0800
Subject: [PATCH] take a picture of my mug

---
 .bash_profile         | 1 +
 .bashrc               | 1 +
 .vim/bundle/vim-html5 | 2 +-
 .vimrc                | 2 +-
 .xinitrc              | 9 ++++++++-
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .bash_profile

diff --git a/.bash_profile b/.bash_profile
new file mode 100644
index 0000000..d1fb79b
--- /dev/null
+++ b/.bash_profile
@@ -0,0 +1 @@
+. ~/.bashrc
diff --git a/.bashrc b/.bashrc
index 2bf3ebd..72d7446 100644
--- a/.bashrc
+++ b/.bashrc
@@ -36,6 +36,7 @@ alias suspend='sudo pm-suspend'
 alias scan="sudo iwlist wlan0 scan"
 alias rejoin="sudo wpa_action wlan0 reload"
 alias recordandroid="recordmydesktop -x 30 -y 47 --width 320 --height 480 --no-sound -o foo.ogv"
+alias feh="sxiv"
 
 ranger() {
 	command ranger --fail-unless-cd $@ &&
diff --git a/.vim/bundle/vim-html5 b/.vim/bundle/vim-html5
index dce65f2..7b3b599 160000
--- a/.vim/bundle/vim-html5
+++ b/.vim/bundle/vim-html5
@@ -1 +1 @@
-Subproject commit dce65f266ff7e0049dddba533085b9b978d6d12c
+Subproject commit 7b3b5991fa0224c73e3859afaf7958f04fc79524
diff --git a/.vimrc b/.vimrc
index ce3c1c3..c9e83bd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -26,4 +26,4 @@ colorscheme elflord
 set background=dark
 
 call pathogen#infect()
-filetype plugin indent on
+filetype plugin on
diff --git a/.xinitrc b/.xinitrc
index a2b354e..03b5dd3 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,8 @@
 #!/bin/sh
+# for terminus font in Archlinux :(
+xset +fp /usr/share/fonts/local
+xset fp rehash
+
 xset -b # disable bell
 eval `/usr/bin/ssh-agent`
 
@@ -12,11 +16,14 @@ then
 	SSH_ASKPASS=/usr/lib/ssh/x11-ssh-askpass ssh-add < /dev/null
 fi
 
+# 1280x720 = 720p
+hash fswebcam && fswebcam -q --no-banner -r 1280x720 ~/private/login-photos/$(date --rfc-3339=date).jpg &
+
 xrdb -merge $HOME/.Xresources
 xmodmap ~/.Xmodmap
 setxkbmap -layout gb -option ctrl:nocaps
 
-test -x /usr/bin/chromium && /usr/bin/chromium &
+hash chromium && chromium &
 
 while true
 do