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

Conflicts:
	vim/vimrc

terminator/terminator/config

@@ -1,26 +1,55 @@
 [global_config]
   enabled_plugins = ,
+  title_transmit_bg_color = "#d30102"
   focus = mouse
+
 [keybindings]
+
 [profiles]
+
   [[default]]
-    scrollbar_position = hidden
+
+  [[solarized-dark]]
     palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
-    font = DejaVu Sans Mono 10
+#    cursor_color = "#eee8d5"
-    background_image = None
+    foreground_color = "#eee8d5"
-    background_darkness = 0.9
+    background_color = "#002b36"
-    urgent_bell = True
+
-    use_system_font = False
+    visible_bell = False
-    foreground_color = "#839496"
+    scrollbar_position = hidden
+    icon_bell = False
     show_titlebar = False
     copy_on_selection = True
-    background_color = "#002b36"
+    scrollback_infinite = True
+
+    font = DejaVu Sans Mono 10
+    background_image = None
+    background_darkness = 0.5
+    urgent_bell = True
+    use_system_font = False
+
+  [[solarized-light]]
+    palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
+    background_color = "#eee8d5"
+    cursor_color = "#002b36"
+    foreground_color = "#002b36"
+
+    visible_bell = False
+    scrollbar_position = hidden
+    icon_bell = False
+    show_titlebar = False
+    copy_on_selection = True
+    scrollback_infinite = True
+
 [layouts]
+
   [[default]]
+
     [[[child1]]]
       type = Terminal
       parent = window0
-      profile = default
+      profile = solarized-dark
+
     [[[window0]]]
       type = Window
       parent = ""

vim/vimrc

@@ -64,19 +64,25 @@ Bundle 'tpope/vim-fugitive'
 
 filetype plugin indent on
 
-" setup for vim-airline
+set t_Co=256
-" enable tabline at the top showing all buffers
-let g:airline#extensions#tabline#enabled = 1
 
 " setup for the solarized color theme
 set background=dark
 let g:solarized_termcolors=16
 let g:solarized_termtrans=1
-let g:solarized_contrase="normal"
+let g:solarized_contrast="normal"
 let g:solarized_visibility="normal"
 syntax enable
 colorscheme solarized
 
+" setup for vim-airline
+let g:airline_left_sep = '▶'
+let g:airline_right_sep = '◀'
+" enable tabline at the top showing all buffers
+let g:airline#extensions#tabline#enabled = 1
+"let g:airline_theme=
+
+set colorcolumn=79
 set clipboard=unnamed               " enable copying into the clipboard
 
 

x/xinitrc

@@ -29,18 +29,5 @@ xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed"
 
 [[ -f ~/.Xresources ]] && xrdb ~/.Xresources
 
-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"
+exec i3 -c "$SESSION_CONF" >> ~/.i3/logs/i3.log
-    ;;
-esac