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

.config/terminator/config

@@ -0,0 +1,22 @@
+[global_config]
+  tab_position = bottom
+[keybindings]
+[profiles]
+  [[default]]
+    scrollbar_position = hidden
+    use_system_font = False
+    background_darkness = 0.8
+    background_type = transparent
+    background_image = None
+    foreground_color = "#ffffff"
+    show_titlebar = False
+    font = Inconsolata Medium 15
+[layouts]
+  [[default]]
+    [[[child1]]]
+      type = Terminal
+      parent = window0
+    [[[window0]]]
+      type = Window
+      parent = ""
+[plugins]

.vim/filetype.vim

@@ -74,6 +74,13 @@ augroup mediawiki
     autocmd BufRead,BufNewFile *.wikipedia.org* setfiletype mediawiki
 augroup END
 
+augroup go
+  autocmd FileType go set ts=2
+  autocmd FileType go set softtabstop=2
+  autocmd FileType go set shiftwidth=2
+  autocmd FileType go set noexpandtab
+augroup END
+
 autocmd FileType go let b:auto_trim_whitespace=1
 autocmd FileType cpp let b:auto_trim_whitespace=1
 autocmd FileType perl let b:auto_trim_whitespace=1

.xinitrc

@@ -5,7 +5,7 @@ xrdb -merge .Xdefaults &
 gnome-settings-daemon & 
 eval $(cat ~/.fehbg) &
 xscreensaver -no-splash &
-synapse -s &
+kupfer --no-splash &
 nm-applet &
 gnome-sound-applet &
 synclient PalmDetect=1