From 5caefa1b2bf4979a77aac842d1672e21927c3b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 18 Sep 2013 19:27:36 +0200
Subject: [PATCH 01/12] Added dynamic config generation for i3.

The script genconfig.bash concatenates the main configuration file with
a host specific one to create a session-specific configration file that
is then passed to i3. It therefore has to be called in .xinitrc or
something comparable before starting i3. If no host specific
configuration is found, a default file will be used instead. This is
useful for providing default that should not go into the main
configuration file, maybe because they are incompatible with some host
specific settings. For example a default bar{} block goes there, as if
this was in the main config, two i3bar instances would be started when a
host specific config specifies its own.
---
 i3/i3/.gitignore              |  1 +
 i3/i3/config                  | 39 -----------------------------------
 i3/i3/config.d/default.config |  3 +++
 i3/i3/config.d/netbook.config | 38 ++++++++++++++++++++++++++++++++++
 i3/i3/i3status.conf           |  2 +-
 i3/i3/scripts/genconfig.bash  | 31 ++++++++++++++++++++++++++++
 vim/vimrc                     |  2 +-
 x/xinitrc                     | 24 ++++++++++++++-------
 8 files changed, 91 insertions(+), 49 deletions(-)
 create mode 100644 i3/i3/.gitignore
 create mode 100644 i3/i3/config.d/default.config
 create mode 100644 i3/i3/config.d/netbook.config
 create mode 100644 i3/i3/scripts/genconfig.bash

diff --git a/i3/i3/.gitignore b/i3/i3/.gitignore
new file mode 100644
index 0000000..6e74f38
--- /dev/null
+++ b/i3/i3/.gitignore
@@ -0,0 +1 @@
+session.config
diff --git a/i3/i3/config b/i3/i3/config
index e5cbfd1..6cb223e 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -214,38 +214,6 @@ for_window [class="^Xfce4-notifyd$"] floating enable
 
 for_window [class="^Conky$" ] floating enable
 
-# 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
-}
 
 
 
@@ -274,10 +242,3 @@ mode "$mode_system" {
 }
 bindsym $mod+Pause mode "$mode_system"
 bindsym $mod+Shift+Pause exec --no-startup-id $path_i3exit lock
-
-
-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-
diff --git a/i3/i3/config.d/default.config b/i3/i3/config.d/default.config
new file mode 100644
index 0000000..b3c19a2
--- /dev/null
+++ b/i3/i3/config.d/default.config
@@ -0,0 +1,3 @@
+bar {
+    status_command i3status
+}
diff --git a/i3/i3/config.d/netbook.config b/i3/i3/config.d/netbook.config
new file mode 100644
index 0000000..5197a9f
--- /dev/null
+++ b/i3/i3/config.d/netbook.config
@@ -0,0 +1,38 @@
+
+# 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
+}
diff --git a/i3/i3/i3status.conf b/i3/i3/i3status.conf
index 6021e11..cda31b7 100644
--- a/i3/i3/i3status.conf
+++ b/i3/i3/i3status.conf
@@ -54,7 +54,7 @@ run_watch VPN {
 }
 
 tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
+        format = "%a %Y-%m-%d %H:%M:%S"
 }
 
 load {
diff --git a/i3/i3/scripts/genconfig.bash b/i3/i3/scripts/genconfig.bash
new file mode 100644
index 0000000..332d5d7
--- /dev/null
+++ b/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"
diff --git a/vim/vimrc b/vim/vimrc
index 4f5d884..0d8a4e6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -126,7 +126,7 @@ set foldmethod=indent               " fold according to indet
 set foldnestmax=2                   " fold a maximum of 2 levels
 set nofoldenable                    " unfold everything by default
 
-set scrolloff=5                     " show context at the screen edges
+set scrolloff=4                     " show context at the screen edges
 
 
 set showcmd                         " show (partial) command in the command line
diff --git a/x/xinitrc b/x/xinitrc
index cc654e1..3e0a07b 100755
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -10,19 +10,27 @@ fi
 [ -f /etc/xprofile ] && source /etc/xprofile
 [ -f ~/.xprofile ] && source ~/.xprofile
 
+
+# keyboard options
+keyboard_layout=de
+keyboard_options= nodeadkeys
+keyboard_repeat_delay=150
+keyboard_repeat_speed=30
+
 # execute the host-specific .xinitrc-addition
 hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc"
 [[ -f "$hostfile" ]] && bash "$hostfile" &
 
+# set keyboard layout
+setxkbmap $keyboard_layout $keyboard_options
+
+# set key repeat delay
+xset r rate $keyboard_repeat_delay $keyboard_repeat_speed
+
+
 case $1 in
-e17)
-	exec enlightenment_start
-	;;
-i3)
-	exec i3
-	;;
-xfce4) ;;
 *)
-    exec i3
+    SESSION_CONF=$(bash "$HOME/.i3/scripts/genconfig.bash")
+    exec i3 -c "$SESSION_CONF"
     ;;
 esac

From 0fb42ba3e4f7218c6dd99bfea8e27ea3e12d2798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 18 Sep 2013 20:10:32 +0200
Subject: [PATCH 02/12] Renamed the setup script.

---
 scripts/{makesymlinks.bash => setup.bash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/{makesymlinks.bash => setup.bash} (100%)

diff --git a/scripts/makesymlinks.bash b/scripts/setup.bash
similarity index 100%
rename from scripts/makesymlinks.bash
rename to scripts/setup.bash

From 5506d39aea6e7bec51515b6f08316c03844731f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 18 Sep 2013 20:12:37 +0200
Subject: [PATCH 03/12] Updated readme.

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 1bb8f22..c1f74fd 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ Installation
 ------------
 
 1. ``git clone git://github.com:whatevsz/dotfiles ~/dotfiles``
-2. ``bash ~/dotfiles/scripts/makesymlinks.bash``
+2. ``bash ~/dotfiles/scripts/setup.bash``
 
 ``makesymlinks,bash`` will back up all configuration files that would otherwise
 be overridden and then symlink the content of all folders specified in $symlink_folders
@@ -15,14 +15,14 @@ into $HOME or the desired destination given in MAPPING, if present.
 
 If you want to use a different directory instead of ``~/dotfiles``, just alter the first
 line and replace  ``~/dotfiles`` with the desired destination, and change the line
-``config_dir="$HOME/dotfiles/"`` in ``scripts/makesymlinks.bash`` accordingly. You can
+``config_dir="$HOME/dotfiles/"`` in ``scripts/setup.bash`` accordingly. You can
 also choose a different folder for the backup of old files (default being ``~/.dotfiles,bak``
-by altering ``backup_dir`` in ``scripts/makesymlinks.bash`` to your needs.
+by altering ``backup_dir`` in ``scripts/setup.bash`` to your needs.
 
 Structure
 ---------
 
-- ``scripts/`` - Scripts for setting up the configuration.
+- ``scripts/`` - Scripts, e.g.  for setting up the configuration.
 - ``MAPPING`` - File that contains mapping directives.
 - All other folders - These are the folders that contain the configuration files.
 

From 2b73e43832b6d90788d0cefb20947c325c3f8c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 18 Sep 2013 23:03:20 +0200
Subject: [PATCH 04/12] Minor changes.

- archey in .zshrc
- no scrollbar in terminator
- no border for terminator windows in .i3/config
---
 conky/conkyrc                | 2 +-
 i3/i3/config                 | 4 ++--
 terminator/terminator/config | 3 ++-
 zsh/zshrc                    | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/conky/conkyrc b/conky/conkyrc
index 34cf63a..859bde8 100644
--- a/conky/conkyrc
+++ b/conky/conkyrc
@@ -105,7 +105,7 @@ own_window_title Conky
 own_window_transparent yes
 
 # will be ignored if own_window_type is override
-own_window_hints none
+#own_window_hints none
 
 # window will not be controlled by the window manager, hints are ignored
 own_window_type override
diff --git a/i3/i3/config b/i3/i3/config
index 6cb223e..13aec17 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -212,9 +212,9 @@ 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
 
 
 # Start the wallpaper changer.
diff --git a/terminator/terminator/config b/terminator/terminator/config
index 91cb39a..d3420ce 100644
--- a/terminator/terminator/config
+++ b/terminator/terminator/config
@@ -1,8 +1,10 @@
 [global_config]
   enabled_plugins = ,
+  focus = mouse
 [keybindings]
 [profiles]
   [[default]]
+    scrollbar_position = hidden
     palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
     font = Deja Vu Sans Mono 10
     background_image = None
@@ -10,7 +12,6 @@
     use_system_font = False
     foreground_color = "#839496"
     show_titlebar = False
-    antialias = True
     copy_on_selection = True
     background_color = "#002b36"
 [layouts]
diff --git a/zsh/zshrc b/zsh/zshrc
index f92148d..11423f2 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -45,3 +45,5 @@ plugins=(git)
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
+
+archey

From 266ad314cd91ec007f3eb5e24c14c63eab3f59c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 18 Sep 2013 23:10:32 +0200
Subject: [PATCH 05/12] $mod+Shift+c will now generate a new config first.

---
 i3/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i3/i3/config b/i3/i3/config
index 13aec17..239ab5c 100644
--- a/i3/i3/config
+++ b/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)

From 9f1492cc84542d0524b55e5f0d87cc8b9839cb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Thu, 19 Sep 2013 14:45:05 +0200
Subject: [PATCH 06/12] Minor changes, x/Xresources added.

---
 i3/i3/config                 |  2 ++
 terminator/terminator/config |  6 ++++--
 x/Xresources                 | 27 +++++++++++++++++++++++++++
 x/xinitrc                    |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 x/Xresources

diff --git a/i3/i3/config b/i3/i3/config
index 239ab5c..ea3c04f 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -216,6 +216,8 @@ for_window [class="^Conky$"] floating enable
 
 for_window [class="^Terminator$"] border none
 
+for_window [class="^Firefox$"] border none
+
 
 # Start the wallpaper changer.
 exec --no-startup-id $path_wallchanger $wallpaper_directory $wallpaper_interval > $wallpaper_logfile
diff --git a/terminator/terminator/config b/terminator/terminator/config
index d3420ce..69bdc5b 100644
--- a/terminator/terminator/config
+++ b/terminator/terminator/config
@@ -6,13 +6,15 @@
   [[default]]
     scrollbar_position = hidden
     palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
-    font = Deja Vu Sans Mono 10
+    copy_on_selection = True
     background_image = None
+    background_darkness = 0.90
     urgent_bell = True
+    background_type = transparent
     use_system_font = False
     foreground_color = "#839496"
     show_titlebar = False
-    copy_on_selection = True
+    font = Deja Vu Sans Mono 10
     background_color = "#002b36"
 [layouts]
   [[default]]
diff --git a/x/Xresources b/x/Xresources
new file mode 100644
index 0000000..19d1b41
--- /dev/null
+++ b/x/Xresources
@@ -0,0 +1,27 @@
+! mouse cursor setup
+Xcursor.theme: Vanilla-DMZ
+
+!! urxvt setup
+!! colored man pages
+!URxvt.colorIT:           #87af5f
+!URxvt.colorBD:           #d7d7d7
+!URxvt.colorUL:           #87afd7
+!
+!URxvt*.transparent: false
+!! URxvt*.shading: 0 to 99 darkens, 101 to 200 lightens
+!URxvt*.shading:          110
+!
+!URxvt.scrollBar:         false
+!
+!URxvt.font:              xft:DejaVu Sans Mono:size=10
+!
+!! clickable links opened in firefox
+!!URxvt.perl-ext-common:   default,matcher
+!URxvt.url-launcher:      /usr/bin/firefox
+!URxvt.matcher.button:    1
+!
+!! enable tabs
+!! enable scrollwheel support
+!URxvt.perl-ext-common:   default,tabbed,vtwheeel
+
+
diff --git a/x/xinitrc b/x/xinitrc
index 3e0a07b..9f3f840 100755
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -27,6 +27,7 @@ setxkbmap $keyboard_layout $keyboard_options
 # set key repeat delay
 xset r rate $keyboard_repeat_delay $keyboard_repeat_speed
 
+#[[ -f ~/.Xresources ]] && xrdb ~/.Xresources
 
 case $1 in
 *)

From a9a73cf80dcc38558b782e258be37b991fff81b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 20 Sep 2013 15:22:06 +0200
Subject: [PATCH 07/12] Setting BROWSER variable on login.

---
 bash/bash_profile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bash/bash_profile b/bash/bash_profile
index e69de29..7a55c40 100644
--- a/bash/bash_profile
+++ b/bash/bash_profile
@@ -0,0 +1,3 @@
+f [ -n "$DISPLAY" ]; then
+    BROWSER=firefox
+fi

From ef5eb6c960d0106b13342f5843edd32f4e9c118d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 20 Sep 2013 15:22:35 +0200
Subject: [PATCH 08/12] netbook: Autostarting of dropbox enabled.

---
 i3/i3/config.d/netbook.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i3/i3/config.d/netbook.config b/i3/i3/config.d/netbook.config
index 5197a9f..c5c9fd8 100644
--- a/i3/i3/config.d/netbook.config
+++ b/i3/i3/config.d/netbook.config
@@ -1,3 +1,4 @@
+exec --no-startup-id dropbox start &
 
 # bind some keys
 bindsym XF86Sleep exec --no-startup-id $path_i3exit suspend

From 588abd131b49ef2a329af6be9d558e4e0baa19b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 20 Sep 2013 15:23:40 +0200
Subject: [PATCH 09/12] Enabled colored manpages.

---
 zsh/zshrc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/zsh/zshrc b/zsh/zshrc
index 11423f2..9032f9e 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -46,4 +46,18 @@ source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
 
+man() {
+        env LESS_TERMCAP_mb=$'\E[01;31m' \
+        LESS_TERMCAP_md=$'\E[01;38;5;74m' \
+        LESS_TERMCAP_me=$'\E[0m' \
+        LESS_TERMCAP_se=$'\E[0m' \
+        LESS_TERMCAP_so=$'\E[38;5;246m' \
+        LESS_TERMCAP_ue=$'\E[0m' \
+        LESS_TERMCAP_us=$'\E[04;38;5;146m' \
+        man "$@"
+}
+
+
 archey
+
+

From 7392ae52e341a3f915d51adf6fc50319505c2c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 20 Sep 2013 15:23:54 +0200
Subject: [PATCH 10/12] Made xinitrc slim-compatlibe and bugfix of
 $keyboard_options.

---
 x/xinitrc | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/x/xinitrc b/x/xinitrc
index 9f3f840..c054c6f 100755
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -13,7 +13,7 @@ fi
 
 # keyboard options
 keyboard_layout=de
-keyboard_options= nodeadkeys
+keyboard_variant=nodeadkeys
 keyboard_repeat_delay=150
 keyboard_repeat_speed=30
 
@@ -22,15 +22,24 @@ hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc"
 [[ -f "$hostfile" ]] && bash "$hostfile" &
 
 # set keyboard layout
-setxkbmap $keyboard_layout $keyboard_options
+setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant"
 
 # set key repeat delay
-xset r rate $keyboard_repeat_delay $keyboard_repeat_speed
+xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed"
 
 #[[ -f ~/.Xresources ]] && xrdb ~/.Xresources
 
-case $1 in
-*)
+case "$1" in
+kde)
+    exec startkde
+    ;;
+xfce4)
+    exec startxfce4
+    ;;
+e17)
+    exec enlightenment_start
+    ;;
+i3|*)
     SESSION_CONF=$(bash "$HOME/.i3/scripts/genconfig.bash")
     exec i3 -c "$SESSION_CONF"
     ;;

From ef02a4e161501d7da8ab9c96ba6b9334d93ca95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 20 Sep 2013 15:24:44 +0200
Subject: [PATCH 11/12] Minor changes.

---
 terminator/terminator/config | 7 +++----
 vim/vimrc                    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/terminator/terminator/config b/terminator/terminator/config
index 69bdc5b..37d0d70 100644
--- a/terminator/terminator/config
+++ b/terminator/terminator/config
@@ -6,15 +6,14 @@
   [[default]]
     scrollbar_position = hidden
     palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
-    copy_on_selection = True
+    font = Deja Vu Sans Mono 10
     background_image = None
-    background_darkness = 0.90
+    background_darkness = 0.9
     urgent_bell = True
-    background_type = transparent
     use_system_font = False
     foreground_color = "#839496"
     show_titlebar = False
-    font = Deja Vu Sans Mono 10
+    copy_on_selection = True
     background_color = "#002b36"
 [layouts]
   [[default]]
diff --git a/vim/vimrc b/vim/vimrc
index 0d8a4e6..5128fc1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -144,8 +144,8 @@ set autochdir                       " automatically change to the directory that
 
 let mapleader = ","
 
-nnoremap / /\v
-vnoremap / /\v
+"nnoremap / /\v
+"vnoremap / /\v
 nnoremap <leader><space> :noh<cr>
 nnoremap <tab> %
 vnoremap <tab> %

From fc1eea343a49bdfcf9a6b880da40ea0b8d5ebe5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 20 Sep 2013 15:32:47 +0200
Subject: [PATCH 12/12] Fixed README.

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index c1f74fd..4a5d2df 100644
--- a/README.rst
+++ b/README.rst
@@ -9,14 +9,14 @@ Installation
 1. ``git clone git://github.com:whatevsz/dotfiles ~/dotfiles``
 2. ``bash ~/dotfiles/scripts/setup.bash``
 
-``makesymlinks,bash`` will back up all configuration files that would otherwise
+``makesymlinks.bash`` will back up all configuration files that would otherwise
 be overridden and then symlink the content of all folders specified in $symlink_folders
 into $HOME or the desired destination given in MAPPING, if present.
 
 If you want to use a different directory instead of ``~/dotfiles``, just alter the first
-line and replace  ``~/dotfiles`` with the desired destination, and change the line
+line and replace  ``~/dotfiles`` with the desired destination and change the line
 ``config_dir="$HOME/dotfiles/"`` in ``scripts/setup.bash`` accordingly. You can
-also choose a different folder for the backup of old files (default being ``~/.dotfiles,bak``
+also choose a different folder for the backup of old files (default being ``~/.dotfiles.bak``)
 by altering ``backup_dir`` in ``scripts/setup.bash`` to your needs.
 
 Structure
@@ -41,7 +41,7 @@ Example::
 
     terminator::.config/
 
-This will place the contents of the folder ``dotfiles/terminator`` into ``~/.config/``
+This will symlink the contents of the folder ``dotfiles/terminator`` into ``~/.config/``
 
 When you provide multiple lines for the same folder, the first one that matches
 will be used.