Merge branch 'master' of http://www.github.com/whatevsz/dotfiles

i3/i3/config

@@ -133,7 +133,7 @@ bindsym $mod+Shift+parenright move container to workspace 9
 bindsym $mod+Shift+equal move container to workspace 10
 
 # reload the configuration file
-bindsym $mod+Shift+C reload
+bindsym $mod+Shift+C exec --no-startup-id bash ~/.i3/scripts/genconfig.bash ; reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+R restart
 # exit i3 (logs you out of your X session)
@@ -212,9 +212,11 @@ for_window [class="^Wicd-client.py$"] floating enable
 # Notifications through xfce4-notifyd, e.g. notifications from wicd
 for_window [class="^Xfce4-notifyd$"] floating enable
 
-for_window [class="^Conky$" ] floating enable
+for_window [class="^Conky$"] floating enable
 
+for_window [class="^Terminator$"] border none
 
+for_window [class="^Firefox$"] border none
 
 
 # Start the wallpaper changer.

i3/i3/config.d/default.config

@@ -0,0 +1,3 @@
+bar {
+    status_command i3status
+}

i3/i3/config.d/netbook.config

@@ -0,0 +1,39 @@
+exec --no-startup-id dropbox start &
+
+# bind some keys
+bindsym XF86Sleep exec --no-startup-id $path_i3exit suspend
+bindsym XF86AudioMute exec --no-startup-id amixer set Master toggle
+bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master %5+
+bindsym XF86AudioLowerVolume exec --no-startup-id amixer set Master %5-
+
+# start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+    # always show at the bottom of the screen
+    mode dock
+    position bottom
+
+    # show a tray area
+    tray_output primary
+
+    # show workspace buttons
+    workspace_buttons yes
+
+    id bar-1
+
+    font pango:DejaVu Sans Mono 8
+
+    colors {
+        background #000000
+        statusline #ffffff
+        separator #666666
+
+        focused_workspace  #4c7899 #285577 #ffffff
+        active_workspace   #333333 #5f676a #ffffff
+        inactive_workspace #333333 #222222 #888888
+        urgent_workspace   #2f343a #900000 #ffffff
+    }
+
+    i3bar_command i3bar
+    status_command i3status --config $path_i3status_config
+}

i3/i3/scripts/genconfig.bash

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# main configuration file that is always used
+MAIN_CONF="$HOME/.i3/config"
+# temporary configuration file used for this session
+SESSION_CONF="$HOME/.i3/session.config"
+# directory that contains host specific configuration
+CONF_DIR="$HOME/.i3/config.d"
+# file that should be used when no host specific configuration present
+DEFAULT_CONF="$CONF_DIR/default.config"
+
+host_specific_conf="$CONF_DIR/$(hostname).config"
+
+# if it's a symlink to $MAIN_CONF, cat will fail
+[[ -f "$SESSION_CONF" ]] && rm "$SESSION_CONF"
+
+if [[ ! -f "$host_specific_conf" ]] && [[ ! -f "$DEFAULT_CONF" ]]; then
+    # if there is no host-specific configuration and no default one, just use
+    # the main config
+    ln -sf "$MAIN_CONF" "$SESSION_CONF"
+else
+    # either use the host specific config if present, or the default if not
+    if [[ -f "$host_specific_conf" ]]; then
+        conf_to_use="$host_specific_conf"
+    else
+        conf_to_use="$DEFAULT_CONF"
+    fi
+    cat "$MAIN_CONF" "$conf_to_use" > "$SESSION_CONF"
+fi
+
+echo "$SESSION_CONF"