colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump emacs d for use-package refactor, tweaks to linux. use tango-dark for iterm.

Browse Source
This commit is contained in:
Ivan Malison 2014-11-12 02:03:43 -08:00
parent 4ce2cb6136
commit ab826de4c6
5 changed files with 84 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/emacs.d

@ -1 +1 @@
Subproject commit 29a96f783da342e0a9b79c279d1d34200c0a9a86
Subproject commit 9fd72b5f5df57dbd89ea10f4de3ca94fe2d2d1f6

2
dotfiles/gitconfig
View File

@ -75,7 +75,9 @@
added = green
changed = yellow
untracked = red
[merge]
conflictstyle = diff3
[include]
path = ~/.gitconfig.custom

171
resources/com.googlecode.iterm2.plist
View File

@ -5218,11 +5218,11 @@
<key>MaxVertically</key>
<false/>
<key>NSColorPanelMode</key>
<string>1</string>
<key>NSColorPickerSlidersDefaults</key>
<string>1</string>
<string>7</string>
<key>NSFontPanelAttributes</key>
<string>1, 0</string>
<key>NSNavLastRootDirectory</key>
<string>~/dotfiles/resources</string>
<string>~</string>
<key>NSQuotedKeystrokeBinding</key>
<string></string>
<key>NSRepeatCountBinding</key>
@ -5246,36 +5246,21 @@
<array/>
<key>NSTableView Sort Ordering KeyBingingTable</key>
<array/>
<key>NSToolbar Configuration Terminal Toolbar</key>
<dict>
<key>TB Display Mode</key>
<integer>1</integer>
<key>TB Icon Size Mode</key>
<integer>1</integer>
<key>TB Is Shown</key>
<integer>0</integer>
<key>TB Size Mode</key>
<integer>1</integer>
</dict>
<key>NSToolbar Configuration com.apple.NSColorPanel</key>
<dict>
<key>TB Is Shown</key>
<integer>1</integer>
</dict>
<key>NSWindow Frame NSColorPanel</key>
<string>1180 103 231 329 0 0 1440 877 </string>
<key>NSWindow Frame NSFontPanel</key>
<string>665 68 712 432 0 0 1440 877 </string>
<string>427 356 222 309 0 0 1920 1057 </string>
<key>NSWindow Frame Preferences</key>
<string>401 365 924 485 0 0 1440 900 </string>
<string>807 244 924 485 0 0 2560 1440 </string>
<key>NSWindow Frame SUStatusFrame</key>
<string>528 562 384 129 0 0 1440 878 </string>
<key>NSWindow Frame UKCrashReporter</key>
<string>99 294 592 584 0 0 1440 878 </string>
<string>768 697 384 129 0 0 1920 1058 </string>
<key>NSWindow Frame iTerm Window 0</key>
<string>637 472 570 401 0 0 1440 877 </string>
<string>4 0 1278 1417 0 0 2560 1417 </string>
<key>NSWindow Frame iTerm Window 1</key>
<string>184 132 880 404 0 0 1440 877 </string>
<string>936 786 585 451 0 0 2560 1440 </string>
<key>New Bookmarks</key>
<array>
<dict>
@ -5288,146 +5273,146 @@
<key>Ansi 0 Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.0</real>
</dict>
<key>Ansi 1 Color</key>
<dict>
<key>Blue Component</key>
<real>0.14145714044570923</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.10840655118227005</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.81926977634429932</real>
<real>0.80000001192092896</real>
</dict>
<key>Ansi 10 Color</key>
<dict>
<key>Blue Component</key>
<real>0.38298487663269043</real>
<real>0.2039216011762619</real>
<key>Green Component</key>
<real>0.35665956139564514</real>
<real>0.88627451658248901</real>
<key>Red Component</key>
<real>0.27671992778778076</real>
<real>0.54117649793624878</real>
</dict>
<key>Ansi 11 Color</key>
<dict>
<key>Blue Component</key>
<real>0.43850564956665039</real>
<real>0.30980390310287476</real>
<key>Green Component</key>
<real>0.40717673301696777</real>
<real>0.91372549533843994</real>
<key>Red Component</key>
<real>0.32436618208885193</real>
<real>0.98823529481887817</real>
</dict>
<key>Ansi 12 Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>0.81176471710205078</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>0.62352937459945679</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>0.44705879688262939</real>
</dict>
<key>Ansi 13 Color</key>
<dict>
<key>Blue Component</key>
<real>0.72908437252044678</real>
<real>0.65882349014282227</real>
<key>Green Component</key>
<real>0.33896297216415405</real>
<real>0.49803918600082397</real>
<key>Red Component</key>
<real>0.34798634052276611</real>
<real>0.67843139171600342</real>
</dict>
<key>Ansi 14 Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>0.88627451658248901</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>0.88627451658248901</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>0.2039216011762619</real>
</dict>
<key>Ansi 15 Color</key>
<dict>
<key>Blue Component</key>
<real>0.86405980587005615</real>
<real>0.92549020051956177</real>
<key>Green Component</key>
<real>0.95794391632080078</real>
<real>0.93333327770233154</real>
<key>Red Component</key>
<real>0.98943418264389038</real>
<real>0.93333327770233154</real>
</dict>
<key>Ansi 2 Color</key>
<dict>
<key>Blue Component</key>
<real>0.020208755508065224</real>
<real>0.023529410362243652</real>
<key>Green Component</key>
<real>0.54115492105484009</real>
<real>0.60392159223556519</real>
<key>Red Component</key>
<real>0.44977453351020813</real>
<real>0.30588239431381226</real>
</dict>
<key>Ansi 3 Color</key>
<dict>
<key>Blue Component</key>
<real>0.023484811186790466</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.46751424670219421</real>
<real>0.62745100259780884</real>
<key>Red Component</key>
<real>0.64746475219726562</real>
<real>0.76862752437591553</real>
</dict>
<key>Ansi 4 Color</key>
<dict>
<key>Blue Component</key>
<real>0.78231418132781982</real>
<real>0.64313727617263794</real>
<key>Green Component</key>
<real>0.46265947818756104</real>
<real>0.39607840776443481</real>
<key>Red Component</key>
<real>0.12754884362220764</real>
<real>0.2039216011762619</real>
</dict>
<key>Ansi 5 Color</key>
<dict>
<key>Blue Component</key>
<real>0.43516635894775391</real>
<real>0.48235291242599487</real>
<key>Green Component</key>
<real>0.10802463442087173</real>
<real>0.31372550129890442</real>
<key>Red Component</key>
<real>0.77738940715789795</real>
<real>0.45882350206375122</real>
</dict>
<key>Ansi 6 Color</key>
<dict>
<key>Blue Component</key>
<real>0.52502274513244629</real>
<real>0.60392159223556519</real>
<key>Green Component</key>
<real>0.57082360982894897</real>
<real>0.59607851505279541</real>
<key>Red Component</key>
<real>0.14679534733295441</real>
<real>0.023529410362243652</real>
</dict>
<key>Ansi 7 Color</key>
<dict>
<key>Blue Component</key>
<real>0.79781103134155273</real>
<real>0.81176471710205078</real>
<key>Green Component</key>
<real>0.89001238346099854</real>
<real>0.84313732385635376</real>
<key>Red Component</key>
<real>0.91611063480377197</real>
<real>0.82745099067687988</real>
</dict>
<key>Ansi 8 Color</key>
<dict>
<key>Blue Component</key>
<real>0.15170273184776306</real>
<real>0.32549020648002625</real>
<key>Green Component</key>
<real>0.11783610284328461</real>
<real>0.34117650985717773</real>
<key>Red Component</key>
<real>0.0</real>
<real>0.33333331346511841</real>
</dict>
<key>Ansi 9 Color</key>
<dict>
<key>Blue Component</key>
<real>0.073530435562133789</real>
<real>0.16078430414199829</real>
<key>Green Component</key>
<real>0.21325300633907318</real>
<real>0.16078430414199829</real>
<key>Red Component</key>
<real>0.74176257848739624</real>
<real>0.93725490570068359</real>
</dict>
<key>Automatically Log</key>
<false/>
@ -5436,9 +5421,9 @@
<key>Background Color</key>
<dict>
<key>Blue Component</key>
<real>0.15170273184776306</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.11783610284328461</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.0</real>
</dict>
@ -5459,11 +5444,11 @@
<key>Bold Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>1</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>1</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>1</real>
</dict>
<key>Character Encoding</key>
<integer>4</integer>
@ -5476,18 +5461,18 @@
<key>Cursor Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>1</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>1</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>1</real>
</dict>
<key>Cursor Text Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.0</real>
</dict>
@ -5510,11 +5495,11 @@
<key>Foreground Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>1</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>1</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>1</real>
</dict>
<key>Guid</key>
<string>3314520D-1E49-4605-AFCE-EA48A596636F</string>
@ -5856,20 +5841,20 @@
<key>Selected Text Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>0.0</real>
</dict>
<key>Selection Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>1</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.8353000283241272</real>
<key>Red Component</key>
<real>0.0</real>
<real>0.70980000495910645</real>
</dict>
<key>Semantic History</key>
<dict>
@ -6743,6 +6728,8 @@
<string>/Users/imalison</string>
</dict>
</array>
<key>NoSyncNeverRemindPrefsChangesLost</key>
<true/>
<key>OnlyWhenMoreTabs</key>
<true/>
<key>OpenArrangementAtStartup</key>
@ -6807,7 +6794,7 @@
<key>SUHasLaunchedBefore</key>
<true/>
<key>SULastCheckTime</key>
<date>2014-11-11T03:11:50Z</date>
<date>2014-11-12T00:16:53Z</date>
<key>SavePasteHistory</key>
<false/>
<key>Show Toolbelt</key>
@ -6836,8 +6823,6 @@
</array>
<key>TripleClickSelectsFullWrappedLines</key>
<false/>
<key>UKCrashReporterLastCrashReportDate</key>
<real>1404793472</real>
<key>URLHandlersByGuid</key>
<dict/>
<key>UseBorder</key>

4
tasks/__init__.py
View File

@ -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)

2
tasks/linux.py
View File

@ -6,7 +6,7 @@ from util import RESOURCES_DIRECTORY
@ctask(default=True)
def all(ctx):
def setup(ctx):
apt_get(ctx)
get_sbt(ctx)