Permalink
Browse files

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

  • Loading branch information...
2 parents de2b60a + 4f0942e commit 96620e3bf1dfad2bbce001d2d2a6b01d5564630e Tyler Ball committed Oct 10, 2012
Showing with 6 additions and 2 deletions.
  1. +1 −0 _ackrc
  2. +3 −0 _jshintrc
  3. +1 −1 _pentadactylrc
  4. +1 −1 _tmux.conf
View
@@ -9,4 +9,5 @@
--type-set=puppet=.pp
--type-set=markdown=.mdwn
--ignore-dir=compiled
+--ignore-dir=node_modules
--ignore-dir=served
View
@@ -0,0 +1,3 @@
+{
+ "laxcomma": true
+}
View
@@ -21,7 +21,7 @@ nmap I gi
set passkeys+=tumblr.com:'jk<left><right>'
set passkeys+=mail.google.com:'jkroaegi,/`~<CR><left><right><Tab>'
-set passkeys+=github.com:'jkpcs?xIUecliuh<Enter><Esc><Up><Down>'
+set passkeys+=github.com:'jkpc?xIUecliuh<Enter><Esc><Up><Down>'
map <c-r> :source! ~/.pentadactylrc<cr>
View
@@ -87,7 +87,7 @@ set -g status-interval 5
set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold]⮀'
-set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]#(itunes-current-song)⮂#[fg=colour16,bg=colour254,bold] #h '
+set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]⮂#[fg=colour16,bg=colour254,bold] #h '
set -g window-status-format "#[fg=white,bg=colour234] #I #W "
set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour16,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"

0 comments on commit 96620e3

Please sign in to comment.