diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 29a96f78..9fd72b5f 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 29a96f783da342e0a9b79c279d1d34200c0a9a86
+Subproject commit 9fd72b5f5df57dbd89ea10f4de3ca94fe2d2d1f6
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7f6945ec..7bceaf5d 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -75,7 +75,9 @@
added = green
changed = yellow
untracked = red
+
[merge]
conflictstyle = diff3
+
[include]
path = ~/.gitconfig.custom
diff --git a/resources/com.googlecode.iterm2.plist b/resources/com.googlecode.iterm2.plist
index 9634fd29..17cf9b7d 100644
--- a/resources/com.googlecode.iterm2.plist
+++ b/resources/com.googlecode.iterm2.plist
@@ -5218,11 +5218,11 @@
MaxVertically
NSColorPanelMode
- 1
- NSColorPickerSlidersDefaults
- 1
+ 7
+ NSFontPanelAttributes
+ 1, 0
NSNavLastRootDirectory
- ~/dotfiles/resources
+ ~
NSQuotedKeystrokeBinding
NSRepeatCountBinding
@@ -5246,36 +5246,21 @@
NSTableView Sort Ordering KeyBingingTable
- NSToolbar Configuration Terminal Toolbar
-
- TB Display Mode
- 1
- TB Icon Size Mode
- 1
- TB Is Shown
- 0
- TB Size Mode
- 1
-
NSToolbar Configuration com.apple.NSColorPanel
TB Is Shown
1
NSWindow Frame NSColorPanel
- 1180 103 231 329 0 0 1440 877
- NSWindow Frame NSFontPanel
- 665 68 712 432 0 0 1440 877
+ 427 356 222 309 0 0 1920 1057
NSWindow Frame Preferences
- 401 365 924 485 0 0 1440 900
+ 807 244 924 485 0 0 2560 1440
NSWindow Frame SUStatusFrame
- 528 562 384 129 0 0 1440 878
- NSWindow Frame UKCrashReporter
- 99 294 592 584 0 0 1440 878
+ 768 697 384 129 0 0 1920 1058
NSWindow Frame iTerm Window 0
- 637 472 570 401 0 0 1440 877
+ 4 0 1278 1417 0 0 2560 1417
NSWindow Frame iTerm Window 1
- 184 132 880 404 0 0 1440 877
+ 936 786 585 451 0 0 2560 1440
New Bookmarks
@@ -5288,146 +5273,146 @@
Ansi 0 Color
Blue Component
- 0.19370138645172119
+ 0.0
Green Component
- 0.15575926005840302
+ 0.0
Red Component
0.0
Ansi 1 Color
Blue Component
- 0.14145714044570923
+ 0.0
Green Component
- 0.10840655118227005
+ 0.0
Red Component
- 0.81926977634429932
+ 0.80000001192092896
Ansi 10 Color
Blue Component
- 0.38298487663269043
+ 0.2039216011762619
Green Component
- 0.35665956139564514
+ 0.88627451658248901
Red Component
- 0.27671992778778076
+ 0.54117649793624878
Ansi 11 Color
Blue Component
- 0.43850564956665039
+ 0.30980390310287476
Green Component
- 0.40717673301696777
+ 0.91372549533843994
Red Component
- 0.32436618208885193
+ 0.98823529481887817
Ansi 12 Color
Blue Component
- 0.51685798168182373
+ 0.81176471710205078
Green Component
- 0.50962930917739868
+ 0.62352937459945679
Red Component
- 0.44058024883270264
+ 0.44705879688262939
Ansi 13 Color
Blue Component
- 0.72908437252044678
+ 0.65882349014282227
Green Component
- 0.33896297216415405
+ 0.49803918600082397
Red Component
- 0.34798634052276611
+ 0.67843139171600342
Ansi 14 Color
Blue Component
- 0.56363654136657715
+ 0.88627451658248901
Green Component
- 0.56485837697982788
+ 0.88627451658248901
Red Component
- 0.50599193572998047
+ 0.2039216011762619
Ansi 15 Color
Blue Component
- 0.86405980587005615
+ 0.92549020051956177
Green Component
- 0.95794391632080078
+ 0.93333327770233154
Red Component
- 0.98943418264389038
+ 0.93333327770233154
Ansi 2 Color
Blue Component
- 0.020208755508065224
+ 0.023529410362243652
Green Component
- 0.54115492105484009
+ 0.60392159223556519
Red Component
- 0.44977453351020813
+ 0.30588239431381226
Ansi 3 Color
Blue Component
- 0.023484811186790466
+ 0.0
Green Component
- 0.46751424670219421
+ 0.62745100259780884
Red Component
- 0.64746475219726562
+ 0.76862752437591553
Ansi 4 Color
Blue Component
- 0.78231418132781982
+ 0.64313727617263794
Green Component
- 0.46265947818756104
+ 0.39607840776443481
Red Component
- 0.12754884362220764
+ 0.2039216011762619
Ansi 5 Color
Blue Component
- 0.43516635894775391
+ 0.48235291242599487
Green Component
- 0.10802463442087173
+ 0.31372550129890442
Red Component
- 0.77738940715789795
+ 0.45882350206375122
Ansi 6 Color
Blue Component
- 0.52502274513244629
+ 0.60392159223556519
Green Component
- 0.57082360982894897
+ 0.59607851505279541
Red Component
- 0.14679534733295441
+ 0.023529410362243652
Ansi 7 Color
Blue Component
- 0.79781103134155273
+ 0.81176471710205078
Green Component
- 0.89001238346099854
+ 0.84313732385635376
Red Component
- 0.91611063480377197
+ 0.82745099067687988
Ansi 8 Color
Blue Component
- 0.15170273184776306
+ 0.32549020648002625
Green Component
- 0.11783610284328461
+ 0.34117650985717773
Red Component
- 0.0
+ 0.33333331346511841
Ansi 9 Color
Blue Component
- 0.073530435562133789
+ 0.16078430414199829
Green Component
- 0.21325300633907318
+ 0.16078430414199829
Red Component
- 0.74176257848739624
+ 0.93725490570068359
Automatically Log
@@ -5436,9 +5421,9 @@
Background Color
Blue Component
- 0.15170273184776306
+ 0.0
Green Component
- 0.11783610284328461
+ 0.0
Red Component
0.0
@@ -5459,11 +5444,11 @@
Bold Color
Blue Component
- 0.56363654136657715
+ 1
Green Component
- 0.56485837697982788
+ 1
Red Component
- 0.50599193572998047
+ 1
Character Encoding
4
@@ -5476,18 +5461,18 @@
Cursor Color
Blue Component
- 0.51685798168182373
+ 1
Green Component
- 0.50962930917739868
+ 1
Red Component
- 0.44058024883270264
+ 1
Cursor Text Color
Blue Component
- 0.19370138645172119
+ 0.0
Green Component
- 0.15575926005840302
+ 0.0
Red Component
0.0
@@ -5510,11 +5495,11 @@
Foreground Color
Blue Component
- 0.51685798168182373
+ 1
Green Component
- 0.50962930917739868
+ 1
Red Component
- 0.44058024883270264
+ 1
Guid
3314520D-1E49-4605-AFCE-EA48A596636F
@@ -5856,20 +5841,20 @@
Selected Text Color
Blue Component
- 0.56363654136657715
+ 0.0
Green Component
- 0.56485837697982788
+ 0.0
Red Component
- 0.50599193572998047
+ 0.0
Selection Color
Blue Component
- 0.19370138645172119
+ 1
Green Component
- 0.15575926005840302
+ 0.8353000283241272
Red Component
- 0.0
+ 0.70980000495910645
Semantic History
@@ -6743,6 +6728,8 @@
/Users/imalison
+ NoSyncNeverRemindPrefsChangesLost
+
OnlyWhenMoreTabs
OpenArrangementAtStartup
@@ -6807,7 +6794,7 @@
SUHasLaunchedBefore
SULastCheckTime
- 2014-11-11T03:11:50Z
+ 2014-11-12T00:16:53Z
SavePasteHistory
Show Toolbelt
@@ -6836,8 +6823,6 @@
TripleClickSelectsFullWrappedLines
- UKCrashReporterLastCrashReportDate
- 1404793472
URLHandlersByGuid
UseBorder
diff --git a/tasks/__init__.py b/tasks/__init__.py
index 4db8f01e..c8fc68c9 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -18,9 +18,9 @@ def setup(ctx):
ctx.config['run']['pty'] = False
ctx.config['run']['warn'] = True
if 'darwin' in sys.platform:
- osx.all(ctx)
+ osx.setup(ctx)
else:
- linux.all(ctx)
+ linux.setup(ctx)
dotfiles(ctx, 'f')
install_python_libraries(ctx)
powerline(ctx)
diff --git a/tasks/linux.py b/tasks/linux.py
index cb89996b..366121b5 100644
--- a/tasks/linux.py
+++ b/tasks/linux.py
@@ -6,7 +6,7 @@ from util import RESOURCES_DIRECTORY
@ctask(default=True)
-def all(ctx):
+def setup(ctx):
apt_get(ctx)
get_sbt(ctx)