diff --git a/iterm/com.googlecode.iterm2.plist b/iterm/com.googlecode.iterm2.plist
index cca874980..14eb62945 100644
--- a/iterm/com.googlecode.iterm2.plist
+++ b/iterm/com.googlecode.iterm2.plist
@@ -14,6 +14,8 @@
1
AppleWindowTabbingMode
manual
+ BootstrapDaemon
+
CopySelection
Default Bookmark Guid
@@ -29,13 +31,9 @@
LoadPrefsFromCustomFolder
NSNavLastRootDirectory
- ~/iterm
- NSNavLastUserSetHideExtensionButtonState
-
+ ~/.oh-my-zsh/iterm
NSNavPanelExpandedSizeForOpenMode
- {712, 448}
- NSNavPanelExpandedSizeForSaveMode
- {712, 448}
+ {799, 448}
NSQuotedKeystrokeBinding
NSRepeatCountBinding
@@ -51,24 +49,24 @@
NSTableView Columns v2 KeyBingingTable
- YnBsaXN0MDDUAQIDBAUGNjdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoK4HCA8aGxwdHh8gJjAxMlUkbnVsbNIJCgsOWk5TLm9iamVjdHNWJGNsYXNzogwN
- gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm
- aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz
- ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA
- DIAIgAlRMSNAdKAAAAAAANIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP
- TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA
- ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe
- AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA
+ YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+ AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVVBcnJheYABrgsMEx4fICEiIyQqNDU2VSRu
+ dWxs0g0ODxJaTlMub2JqZWN0c1YkY2xhc3OiEBGAAoAKgA3TFA0OFRkdV05TLmtleXOj
+ FhcYgAOABIAFoxobHIAGgAeACIAJWklkZW50aWZpZXJVV2lkdGhWSGlkZGVuUTAjQGjA
+ AAAAAAAI0iUmJyhaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiJylYTlNP
+ YmplY3TTFA0OKy8doxYXGIADgASABaMwMRyAC4AMgAiACVExI0B0oZ2yLQ5W0iUmNzhe
+ TlNNdXRhYmxlQXJyYXmjNzkpV05TQXJyYXkACAARABoAJAApADIANwBJAEwAUgBUAGMA
+ aQBuAHkAgACDAIUAhwCJAJAAmACcAJ4AoACiAKYAqACqAKwArgC5AL8AxgDIANEA0gDX
+ AOIA6wD4APsBBAELAQ8BEQETARUBGQEbAR0BHwEhASMBLAExAUABRAAAAAAAAAIBAAAA
AAAAADoAAAAAAAAAAAAAAAAAAAFM
NSTableView Sort Ordering v2 KeyBingingTable
- YnBsaXN0MDDUAQIDBAUGFBVYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA1VJG51bGzSCQoLDFpOUy5vYmplY3RzViRjbGFzc6CAAtIODxARWiRjbGFz
- c25hbWVYJGNsYXNzZXNeTlNNdXRhYmxlQXJyYXmjEBITV05TQXJyYXlYTlNPYmplY3Rf
- EA9OU0tleWVkQXJjaGl2ZXLRFhdVQXJyYXmAAQgRGiMtMjc7QUZRWFlbYGt0g4ePmKqt
- swAAAAAAAAEBAAAAAAAAABgAAAAAAAAAAAAAAAAAAAC1
+ YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
+ AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVVBcnJheYABowsMEVUkbnVsbNINDg8QWk5T
+ Lm9iamVjdHNWJGNsYXNzoIAC0hITFBVaJGNsYXNzbmFtZVgkY2xhc3Nlc15OU011dGFi
+ bGVBcnJheaMUFhdXTlNBcnJheVhOU09iamVjdAgRGiQpMjdJTFJUWF5jbnV2eH2IkaCk
+ rAAAAAAAAAEBAAAAAAAAABgAAAAAAAAAAAAAAAAAAAC1
NSTableView Supports v2 KeyBingingTable
@@ -77,36 +75,16 @@
TB Is Shown
1
- NSWindow Frame Preferences
- 85 419 606 456 0 0 1440 877
- NSWindow Frame SUAutomaticUpdateAlert
- 531 742 616 174 0 0 1680 1027
- NSWindow Frame SUStatusFrame
- -1480 386 400 129 -2560 -700 2560 1577
+ NSWindow Frame NSColorPanel
+ 0 163 224 275 0 0 1536 937
+ NSWindow Frame NSNavPanelAutosaveName
+ 451 38 799 448 0 0 1536 937
NSWindow Frame SUUpdateAlert
- 370 289 700 491 0 0 1440 877
- NSWindow Frame SessionsPreferences
- 115 51 606 469 0 0 1440 877
- NSWindow Frame SharedPreferences
- 410 284 796 486 0 0 1440 877
+ 458 428 620 392 0 0 1536 937
NSWindow Frame UKCrashReporter
- 99 293 592 584 0 0 1440 877
+ 110 353 592 584 0 0 1536 937
NSWindow Frame iTerm Window 0
- 59 340 1440 433 0 0 1440 877
- NSWindow Frame iTerm Window 1
- 0 0 1440 433 0 0 1440 877
- NSWindow Frame iTerm Window 2
- 0 0 1440 433 0 0 1440 877
- NSWindow Frame iTerm Window 3
- 0 0 1440 433 0 0 1440 877
- NSWindow Frame iTerm Window 4
- 0 0 1440 877 0 0 1440 877
- NSWindow Frame iTerm Window 5
- 0 0 1440 433 0 0 1440 877
- NSWindow Frame iTerm Window 6
- 0 410 570 467 0 0 1440 877
- NSWindow Frame iTerm Window 7
- 0 4 717 873 0 0 1440 877
+ 770 470 570 467 0 0 1536 937
New Bookmarks
@@ -1341,117 +1319,30 @@
NoSyncAllAppVersions
- 3.2.9
- 3.3.1
- 3.3.4
- 3.3.0
3.3.7
+ 3.3.6
- NoSyncCommandHistoryHasEverBeenUsed
-
- NoSyncConfirmBeta
-
- NoSyncDoNotWarnBeforeMultilinePaste
-
- NoSyncDoNotWarnBeforeMultilinePaste_selection
- 0
- NoSyncDoNotWarnBeforePastingOneLineEndingInNewlineAtShellPrompt
-
- NoSyncDoNotWarnBeforePastingOneLineEndingInNewlineAtShellPrompt_selection
- 1
NoSyncFrame_SharedPreferences
screenFrame
- {{0, 0}, {1440, 900}}
+ {{0, 0}, {1536, 960}}
topLeft
- {398, 710}
+ {287, 672}
- NoSyncHaveWarnedAboutIncompatibleSoftware
-
NoSyncInstallationId
- 79E0BFAD-8822-49EF-BF4B-04C4818E34CC
- NoSyncLastTipTime
- 591776746.82684398
+ A0CD70EB-74E0-41BA-88E4-1CFF9DBCBDE5
NoSyncLaunchExperienceControllerRunCount
- 29
+ 12
+ NoSyncNeverRemindPrefsChangesLostForFile
+
+ NoSyncNeverRemindPrefsChangesLostForFile_selection
+ 1
NoSyncNextAnnoyanceTime
- 587074165.58101201
+ 599363756.47307897
NoSyncOnboardingWindowHasBeenShown
NoSyncPermissionToShowTip
-
- NoSyncRecordedVariableNames
-
- 1
-
- session.jobName
- session.id
- session.profileName
- session.name
- session.terminalIconName
- session.tmuxClientName
- session.termid
- session.triggerName
- session.tmuxWindowPane
- session.hostname
- session.username
- session.tmuxRole
- session.path
- session.creationTimeString
- session.rows
- session.tmuxWindowTitle
- session.autoLogId
- session.tty
- session.autoName
- session.terminalWindowName
- iterm2
- session.jobPid
- session.lastCommand
- session.pid
- session.presentationName
- session.columns
-
- 16
-
- titleOverride
- currentTab.currentSession.session.columns
- currentTab.currentSession.session.terminalWindowName
- currentTab
- currentTab.currentSession
- currentTab.currentSession.session.pid
- currentTab.currentSession.session.autoName
- currentTab.currentSession.session.tty
- currentTab.currentSession.session.presentationName
- currentTab.currentSession.session.name
- currentTab.currentSession.session.terminalIconName
- currentTab.currentSession.session.jobName
- currentTab.currentSession.session.rows
- iterm2
- currentTab.currentSession.session.jobPid
-
- 2
-
- currentSession
- titleOverride
- currentSession.session.pid
- currentSession.session.autoName
- currentSession.session.name
- currentSession.session.rows
- currentSession.session.terminalWindowName
- currentSession.session.jobName
- currentSession.session.tty
- iterm2
- tmuxWindow
- currentSession.session.presentationName
- currentSession.session.terminalIconName
- currentSession.session.jobPid
- currentSession.session.columns
-
- 4
-
- pid
-
-
+
NoSyncRecordedVariables
0
@@ -1691,14 +1582,6 @@
nonterminalContext
0
-
- isTerminal
-
- name
- tab
- nonterminalContext
- 0
-
isTerminal
@@ -1870,6 +1753,14 @@
nonterminalContext
0
+
+ isTerminal
+
+ name
+ number
+ nonterminalContext
+ 0
+
isTerminal
@@ -1886,14 +1777,6 @@
nonterminalContext
0
-
- isTerminal
-
- name
- number
- nonterminalContext
- 0
-
isTerminal
@@ -1942,30 +1825,22 @@
nonterminalContext
0
-
- isTerminal
-
- name
- currentTab.currentSession.tab
- nonterminalContext
- 0
-
2
isTerminal
-
+
name
- currentSession.commandLine
+ currentSession
nonterminalContext
- 0
+ 1
isTerminal
name
- currentSession.terminalIconName
+ currentSession.commandLine
nonterminalContext
0
@@ -1977,6 +1852,14 @@
nonterminalContext
1
+
+ isTerminal
+
+ name
+ title
+ nonterminalContext
+ 0
+
isTerminal
@@ -1989,7 +1872,7 @@
isTerminal
name
- title
+ currentSession.terminalIconName
nonterminalContext
0
@@ -2013,7 +1896,7 @@
isTerminal
name
- currentSession.tab
+ currentSession.jobPid
nonterminalContext
0
@@ -2089,6 +1972,14 @@
nonterminalContext
0
+
+ isTerminal
+
+ name
+ currentSession.termid
+ nonterminalContext
+ 0
+
isTerminal
@@ -2097,14 +1988,6 @@
nonterminalContext
4
-
- isTerminal
-
- name
- currentSession.path
- nonterminalContext
- 0
-
isTerminal
@@ -2113,22 +1996,6 @@
nonterminalContext
0
-
- isTerminal
-
- name
- currentSession.hostname
- nonterminalContext
- 0
-
-
- isTerminal
-
- name
- currentSession.pid
- nonterminalContext
- 0
-
isTerminal
@@ -2141,17 +2008,33 @@
isTerminal
name
- tmuxWindow
+ currentSession.hostname
nonterminalContext
0
isTerminal
-
+
name
- currentSession
+ currentSession.path
nonterminalContext
- 1
+ 0
+
+
+ isTerminal
+
+ name
+ currentSession.pid
+ nonterminalContext
+ 0
+
+
+ isTerminal
+
+ name
+ tmuxWindow
+ nonterminalContext
+ 0
isTerminal
@@ -2190,109 +2073,8 @@
- NoSyncSaveDocumentAsPathSet_saveDocumentAs:
-
- NoSyncSearchHistory
-
- thesa
- spire
-
- NoSyncSearchHistory2
-
- 38f862964ac3f542
- opencensus_shaded.io.opencensus.implcore.trace.export.SpanExporterImpl.shutdow
- db_conf
- 5078497672426259
- sis
- scaling
- hadoop-hdfs
- hdfs
-
- NoSyncTimeOfFirstLaunchOfVersionWithTip
- 480463907.33064502
- NoSyncTipsToNotShow
-
- 000
- 0000
- 0001
- 0002
- 0003
- 0004
- 0005
- 0006
- 0007
- 0008
- 0009
- 0010
- 0011
- 0012
- 0013
- 0014
- 0015
- 0016
- 0017
- 0018
- 0019
- 0020
- 0021
- 0022
- 0023
- 0024
- 0025
- 0026
- 0027
- 0028
- 0029
- 0030
- 0031
- 0032
- 0033
- 0034
- 0035
- 0036
- 0037
- 0038
- 0039
- 0040
- 0041
- 0042
- 0043
- 0044
- 0045
- 0046
- 0047
- 0048
- 0049
- 0050
- 0051
- 0052
- 0053
- 0054
- 0055
- 0056
- 0057
- 0058
- 0059
- 0060
- 0061
- 0062
- 0063
- 0064
- 0065
- 0066
- 0067
- 0068
- 0069
- 0070
- 0071
- 0072
- 0073
- 0074
- 0075
- 0076
- 0077
- 0078
-
+ NoSyncTipOfTheDayEligibilityBeganTime
+ 598844689.29870498
PMPrintingExpandedStateForPrint2
PasteTabToStringTabStopSize
@@ -2331,25 +2113,21 @@
PrefsCustomFolder
- /Users/ahirreddy/iterm
+ /Users/ahirreddy/.oh-my-zsh/iterm
Print In Black And White
- SUAutomaticallyUpdate
-
SUEnableAutomaticChecks
SUFeedAlternateAppNameKey
iTerm
SUFeedURL
- https://iterm2.com/appcasts/final_new.xml?shard=83
+ https://iterm2.com/appcasts/final_new.xml?shard=18
SUHasLaunchedBefore
SULastCheckTime
- 2019-12-29T01:49:12Z
+ 2019-12-29T01:53:37Z
SUSendProfileInfo
- SUUpdateRelaunchingMarker
-
ShowFullScreenTabBar
ShowPaneTitles
@@ -2366,6 +2144,8 @@
5
TabViewType
0
+ UKCrashReporterLastCrashReportDate
+ 1577584640
UseBorder
VisualIndicatorForEsc
@@ -2379,6 +2159,6 @@
findRegex_iTerm
iTerm Version
- 3.3.7
+ 3.3.6
diff --git a/lib/git.zsh b/lib/git.zsh
index f91b516bd..d248ec522 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,10 +1,13 @@
# Outputs current branch info in prompt format
function git_prompt_info() {
local ref
+ ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+ ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
- ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
- ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ else
+ # Still show the branch/ref, but without the status
+ echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
fi
}
@@ -120,50 +123,52 @@ function git_prompt_long_sha() {
# Get the status of the working tree
function git_prompt_status() {
- local INDEX STATUS
- INDEX=$(command git status --porcelain -b 2> /dev/null)
- STATUS=""
- if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+ if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
+ local INDEX STATUS
+ INDEX=$(command git status --porcelain -b 2> /dev/null)
+ STATUS=""
+ if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^A ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+ elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+ elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+ elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+ elif $(echo "$INDEX" | grep '^D ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+ elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+ fi
+ if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
+ fi
+ if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
+ fi
+ echo $STATUS
fi
- if $(echo "$INDEX" | grep '^A ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
- elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
- fi
- if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
- elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
- elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
- fi
- if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
- fi
- if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
- elif $(echo "$INDEX" | grep '^D ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
- elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
- fi
- if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
- STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
- fi
- if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
- fi
- if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
- fi
- if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
- fi
- if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
- STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
- fi
- echo $STATUS
}
# Compares the provided version of git to the version installed and on path