Permalink
Browse files

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

Conflicts:
	_ackrc
  • Loading branch information...
Tyler Ball
Tyler Ball committed Oct 3, 2012
2 parents fe65c1d + 2a5e558 commit f72ac303bb530ef9af6b05d2b4fe7de3a56cf4e0
View
6 .osx
@@ -104,9 +104,6 @@ defaults write com.apple.dock no-glass -bool true
# Make Dock icons of hidden applications translucent
defaults write com.apple.dock showhidden -bool true
-# Enable iTunes track notifications in the Dock
-defaults write com.apple.dock itunes-notifications -bool true
-
# Add a spacer to the left side of the Dock (where the applications are)
#defaults write com.apple.dock persistent-apps -array-add '{tile-data={}; tile-type="spacer-tile";}'
# Add a spacer to the right side of the Dock (where the Trash is)
@@ -157,3 +154,6 @@ defaults write com.apple.dashboard devmode -bool true
# Kill affected applications
for app in Finder Dock Mail Safari iTunes iCal Address\ Book SystemUIServer; do killall "$app" > /dev/null 2>&1; done
echo "Done. Note that some of these changes require a logout/restart to take effect."
+
+# default screenshot location
+defaults write com.apple.screencapture location ~/Dropbox/screenshots
View
2 _ackrc
@@ -7,5 +7,7 @@
--type-set=less=.less
--type-set=puppet=.pp
+--type-set=markdown=.mdwn
--ignore-dir=compiled
--ignore-dir=node_modules
+--ignore-dir=served
View
@@ -6,13 +6,16 @@
[core]
editor = "vim"
excludesfile = ~/.gitignore
+ autocrlf = false
[svn]
rmdir = true
[push]
# default = upstream
default = current
[format]
pretty = %C(blue)%h%Creset %C(238)-%Creset%C(yellow)%d%Creset %s %C(240)(%an, %cr)%Creset
+[pretty]
+ date = %C(blue)%h%Creset %C(238)-%Creset%C(yellow)%d%Creset %s %C(240)(%an, %ai)%Creset
[difftool]
prompt = false
[alias]
@@ -36,8 +39,14 @@
[merge]
tool = splice
[mergetool "splice"]
- cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+ cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
keepBackup = false
[branch]
autosetuprebase = always
+[pack]
+ SizeLimit = 100m
+ threads = 1
+ windowMemory = 100m
+[github]
+ user = tylerball
View
@@ -4,19 +4,24 @@ loadplugins '\.(js|penta)$'
group user
" UI
-highlight StatusLine -moz-appearance: none !important; font-weight: bold; background: transparent !important; border: 0px !important; min-height: 20px !important; text-shadow: none !important; font: normal 11px/1 'Menlo' !important; padding: 3px 0px 3px 5px !important;
+highlight Find color: black; background-color: #FF5D46;
+highlight StatusLine -moz-appearance: none !important; font-weight: bold; background: transparent !important; border: 0px !important; min-height: 20px !important; text-shadow: none !important; font: normal 11px/1 'Menlo' !important; padding: 3px 0px 3px 5px !important;
+
+set incfind
+set hlfind
" Usability
nmap -builtin j 3j
nmap -builtin k 3k
nmap -builtin <bs> <nop>
+imap! kj <Esc>
+nmap I gi
+
set passkeys+=tumblr.com:'jk<left><right>'
-set passkeys+=gmail.com:'jkroae<CR><left><right>,gi/'
+set passkeys+=mail.google.com:'jkroaegi,/`~<CR><left><right><Tab>'
+set passkeys+=github.com:'jkpc?xIUecliuh<Enter><Esc><Up><Down>'
map <c-r> :source! ~/.pentadactylrc<cr>
-map <c-b> :emenu Tools.Web Developer.Firebug.Open Firebug<cr>
-
-imap kj <esc>
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]⮀"
@@ -1 +1 @@
-au BufNewFile,BufRead *.html setlocal filetype=htmldjango.html
+au BufNewFile,BufRead *.html setlocal filetype=htmldjango.html.javascript
@@ -8,3 +8,5 @@ au FileType html setlocal foldmethod=indent
" delete an attribute when here: |class=
nmap <localleader>d d2f"<left>x<right>
+
+imap <c-_> <C-X><C-O>
Oops, something went wrong.

0 comments on commit f72ac30

Please sign in to comment.