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

README.rst

@@ -7,22 +7,22 @@ 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
+``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/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``
+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.
 
@@ -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.

bash/bash_profile

@@ -0,0 +1,3 @@
+f [ -n "$DISPLAY" ]; then
+    BROWSER=firefox
+fi

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

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"

terminator/terminator/config

@@ -1,16 +1,18 @@
 [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
+    background_darkness = 0.9
     urgent_bell = True
     use_system_font = False
     foreground_color = "#839496"
     show_titlebar = False
-    antialias = True
     copy_on_selection = True
     background_color = "#002b36"
 [layouts]

vim/vimrc

@@ -144,8 +144,8 @@ set autochdir                       " automatically change to the directory that
 
 let mapleader = ","
 
-nnoremap / /\v
+"nnoremap / /\v
-vnoremap / /\v
+"vnoremap / /\v
 nnoremap <leader><space> :noh<cr>
 nnoremap <tab> %
 vnoremap <tab> %

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
+
+

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,25 @@ 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)
-    SESSION_CONF=$( bash "$HOME/.i3/genconfig.bash")
+    exec startkde
+    ;;
+xfce4)
+    exec startxfce4
+    ;;
+e17)
+    exec enlightenment_start
+    ;;
+i3|*)
+    SESSION_CONF=$(bash "$HOME/.i3/scripts/genconfig.bash")
     exec i3 -c "$SESSION_CONF"
     ;;
 esac

zsh/zshrc

@@ -45,3 +45,19 @@ plugins=(git)
 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
+
+