Merge branch 'master' of git.barakmich.com:barak/dotfiles

.bash_aliases

@@ -53,6 +53,7 @@ alias grep="grep --color=auto"
 alias dvtm="dvtm -m \"^w\""
 alias tm="tmux -2 attach"
 alias ppjson="python -mjson.tool"
+alias miranda="ssh -D 7777 -Y barak@miranda.barakmich.com"
 #alias tmux-pwn='tmux list-clients | sed "s|^\(/dev/ttys[0-9]\+\).*\[\([0-9]\+x[0-9]\+\).*$|\2 \1|" | sort -r -n | tail -n +2 | cut -d " " -f 2 | xargs -n 1 tmux detach-client -t'
 
 #Cosmetic/useful

.config/awesome/rc.lua

@@ -54,6 +54,7 @@ naughty.config.default_preset.font = "Inconsolata 14"
 terminal = "run_terminal"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
+browser = "run_browser"
 
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.
@@ -343,6 +344,7 @@ globalkeys = awful.util.table.join(
 
     -- Standard program
     awful.key({ modkey, "Shift"   }, "Return", function () awful.util.spawn(terminal) end),
+    awful.key({ modkey, "Shift"   }, ",", function () awful.util.spawn(browser) end),
     awful.key({ modkey, "Control" }, "r", awesome.restart),
     awful.key({ modkey, "Shift"   }, "q", awesome.quit),
 

.setup_new_env.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+function main {
+  mv -f .* $HOME
+  mv -f bin $HOME
+  cd $HOME
+  git submodule update --init --recursive
+}
+
+read -p "This will overwrite files in $HOME. Type 'yes' to confirm: " confirm
+if [ "$confirm" == "yes" ]; then
+  main;
+fi

bin/run_browser

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -n "`which firefox`" ]; then
+  firefox
+elif [ -n "`which iceweasel`" ]; then
+  iceweasel
+elif [ -n "`which google-chrome`" ]; then
+  google-chrome
+else
+  exit 1
+fi