Some changes.

conky/conky/clock.conkyrc

@@ -28,6 +28,10 @@
 
 alignment middle_right
 
+# gap between window and screen borders
+gap_x 100
+gap_y 0
+
 # do not fork to the background after startup
 background no
 
@@ -47,7 +51,7 @@ cpu_avg_samples 2
 draw_borders no
 
 # white text with black outline
-default_outline_color black
+default_outline_color black #\#e16b40
 default_color white
 
 # number of samples to average for I/O monitoring
@@ -71,10 +75,6 @@ extra_newline no
 # print byte values in human readable form
 format_human_readable yes
 
-# gap between window and screen borders
-gap_x 10
-gap_y 10
-
 # do not break lines
 max_text_width 0
 
@@ -253,4 +253,4 @@ xftfont DejaVu Sans Mono:size=10
 TEXT
 ${font Ubuntu:size=70:bold}${alignr}${time %R}${font}
 
-${font Ubuntu:size=14}${alignr}${time %A, %d %B %Y}${font}
+${font Ubuntu:size=24}${alignr}${time %A, %d %B %Y}${font}

git/gitconfig

@@ -19,6 +19,9 @@
 
 
     last = "log -1 HEAD"
+
+    logl = log --graph --decorate --pretty=oneline --abbrev-commit --all
+
 [core]
     editor = vim
     pager = less
@@ -32,3 +35,5 @@
 	default = simple
 [merge]
 	tool = vimdiff
+[gc]
+	auto = 0

i3/i3/config

@@ -181,7 +181,7 @@
 
     ### START APPLICATIONS #####################################################
 
-    bindsym $mod+d exec i3-dmenu-desktop --dmenu="dmenu -b -i -l 10 -p '>'"
+    bindsym $mod+d exec j4-dmenu-desktop --dmenu="dmenu -b -i -l 10 -p '>'"
     bindsym $mod+Return exec $terminal
     bindsym $mod+F1 exec firefox
 
@@ -303,7 +303,7 @@ client.urgent           #2f343a #900000 #ffffff #900000
     for_window [class="^Terminator$"] border 1pixel
     for_window [class="^Firefox$"] border none
     for_window [class="^Truecrypt$"] floating enable
-    for_window [class="^URxvt$"] border none
+    for_window [class="^URxvt$"] border 1pixel
     for_window [class="^Cairo-dock$"] floating enable , border none
     for_window [class="^Pavucontrol$"] floating enable
     for_window [title="^Skype.*for Linux$" ] floating enable , border none
@@ -311,7 +311,7 @@ client.urgent           #2f343a #900000 #ffffff #900000
     for_window [class="^yad-status$" ] floating enable , border none
     for_window [class="^Docky$" ] floating enable , border none
     for_window [class="^Skype$" ] border 1pixel
-    for_window [class="^Steam$" ] border 1pixel
+    for_window [class="^Steam$" ] border none
     for_window [class="^Eclipse$" ] border none
     #for_window [class="^Steam$" title="^Friends$" ] border 1pixel , floating enable , floating_maximum_size 200 x 700
     #for_window [class="^Steam$" title="Chat$" ] border 1pixel , floating enable
@@ -319,6 +319,7 @@ client.urgent           #2f343a #900000 #ffffff #900000
     for_window [class="^Evince$" ] border none
     for_window [class="^Designer$" ] border none
     for_window [class="^main\.py$" ] floating enable
+    for_window [class="^Xfce4-panel$"] floating enable
 
 
 

i3/i3/config.d/notebook.config

@@ -4,8 +4,8 @@ bindsym XF86AudioMute exec --no-startup-id amixer set Master toggle
 bindsym XF86AudioRaiseVolume exec --no-startup-id bash $HOME/.i3/scripts/pa-volume.bash set-vol +5 ; exec --no-startup-id "bash $HOME/.i3/scripts/update-status.bash"
 bindsym XF86AudioLowerVolume exec --no-startup-id bash $HOME/.i3/scripts/pa-volume.bash set-vol -5 ; exec --no-startup-id "bash $HOME/.i3/scripts/update-status.bash"
 # keys seemingly switched
-bindsym XF86MonBrightnessUp   exec --no-startup-id sudo /usr/local/bin/backlight.sh -10
-bindsym XF86MonBrightnessDown exec --no-startup-id sudo /usr/local/bin/backlight.sh +10
+bindsym XF86MonBrightnessUp   exec --no-startup-id sudo /usr/local/bin/backlight.sh -10 ; exec --no-startup-id "bash $HOME/.i3/scripts/update-status.bash"
+bindsym XF86MonBrightnessDown exec --no-startup-id sudo /usr/local/bin/backlight.sh +10 ; exec --no-startup-id "bash $HOME/.i3/scripts/update-status.bash"
 
 bindsym XF86AudioPlay exec --no-startup-id mpc toggle
 

i3/i3/conky/virtualarch.conkyrc

@@ -153,11 +153,15 @@ ${endif}\
 \
 \
 \
-{ "full_text" : "     $uptime_short " , "color" : "\#FFFFFF" , "name" : "sysinfo" },\
+{ "full_text" : "     ${texeci 60 /usr/local/bin/backlight.sh get-current-perc}% " , "color" : "\#FFFFFF" , "name" : "backlight" },\
 \
 \
 \
-{ "full_text" : " ${time %a %F %T} " , "color" : "\#FFFFFF" , "name" : "time" },\
+{ "full_text" : "     $uptime_short " , "color" : "\#FFFFFF" , "name" : "sysinfo" },\
+\
+\
+\
+{ "full_text" : "     ${time %a %F %T} " , "color" : "\#FFFFFF" , "name" : "time" },\
 \
 \
 \

vim/vimrc

@@ -370,3 +370,5 @@ nnoremap Q <nop>
 nnoremap <leader>r :%s///<Left><Left>
 
 set virtualedit="onemore,all"
+
+autocmd BufWritePre *.rst silent :%s/\s\+$//e

x/xinitrc

@@ -76,13 +76,16 @@ fi
 #    urxvtd -q --fork
 #fi
 
+log "starting conky clock on desktop"
+conky -c "$HOME/.conky/clock.conkyrc
+
 # start the pulseaudio volume control tray applet
 log "starting pasystray"
 pasystray & &> $LOGFILE
 
 # start dropbox
 log "starting dropboxd"
-dropboxd & &> $LOGFILE
+nice -n 10 ionice -c 3 dropboxd & &> $LOGFILE
 
 # start the wallpaper changer
 log "starting $path_wallchanger"
@@ -118,5 +121,4 @@ else
     log "~/.Xresources not found"
 fi
 
-
 start_wm

zsh/zshrc

@@ -1,21 +1,19 @@
-source ~/.ohmyzshrc
+autoload -U promptinit
+promptinit
 
-#autoload -U promptinit
-#promptinit
-#
-#autoload -U colors
-#colors
-#
-#autoload -U compinit
-#compinit
-#
-#HISTSIZE=10000
-#SAVEHIST=10000
+autoload -U colors
+colors
+
+autoload -U compinit
+compinit
+
+HISTSIZE=10000
+SAVEHIST=10000
 HISTFILE="$HOME/.zsh_history"
 
-#PROMPT="%{$fg[white]%}╭─%{$fg[red]%}%n%{$fg[white]%}@%{$fg[green]%}%M %{$fg[cyan]%}%~
-#%{$fg[white]%}╰─%B$%b "
-#RPROMPT="%{$fg[red]%}%? %{$fg[white]%}%*%{$reset_color%}"
+PROMPT="%{$fg[white]%}╭─%{$fg[green]%}%M %{$fg[red]%}▶ %{$fg[yellow]%}%~
+%{$fg[white]%}╰─%B$%b "
+RPROMPT="%{$fg[red]%}%? %{$fg[white]%}%*%{$reset_color%}"
 
 man() {
         env LESS_TERMCAP_mb=$'\E[01;31m' \
@@ -66,6 +64,8 @@ setopt CHECK_JOBS
 setopt HUP
 setopt LONG_LIST_JOBS
 
+bindkey -e
+
 
 [[ $TERM == "urxvt" ]] && export TERM="rxvt-unicode"
 
@@ -112,9 +112,16 @@ alias wow="git status"
 alias v="vim"
 alias g="grep"
 
+# rebase the current branch onto WTF ARE YOU DOING YOU ARE DRUNNK TO GO BED
+##alias rebase="git rebase -i $(git branch --contains HEAD | grep -v '\*.*' | head -1)"
+
 
 ### FUNCTIONS
 
+function cd() {
+    builtin cd $* && ls
+}
+
 function mount() {
     if [[ $# == 0 ]] ; then
         /usr/bin/env mount | column -t