Merge remote-tracking branch 'VanRoy/master' into staging_065

Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
This commit is contained in:
Dominik Ritter 2018-06-07 00:11:15 +02:00
commit 4c2f58bdbd
3 changed files with 16 additions and 0 deletions

View file

@ -109,6 +109,7 @@ case $POWERLEVEL9K_MODE in
DROPBOX_ICON $'\UF16B' # 
DATE_ICON $'\uE184' # 
TIME_ICON $'\uE12E' # 
JAVA_ICON $'\U2615' # ☕︎
)
;;
'awesome-fontconfig')
@ -202,6 +203,7 @@ case $POWERLEVEL9K_MODE in
DROPBOX_ICON $'\UF16B' # 
DATE_ICON $'\uF073 ' # 
TIME_ICON $'\uF017 ' # 
JAVA_ICON $'\U2615' # ☕︎
)
;;
'awesome-mapped-fontconfig')
@ -300,6 +302,7 @@ case $POWERLEVEL9K_MODE in
DROPBOX_ICON '\u'$CODEPOINT_OF_AWESOME_DROPBOX # 
DATE_ICON $'\uF073 ' # 
TIME_ICON $'\uF017 ' # 
JAVA_ICON $'\U2615' # ☕︎
)
;;
'nerdfont-complete'|'nerdfont-fontconfig')
@ -394,6 +397,7 @@ case $POWERLEVEL9K_MODE in
DROPBOX_ICON $'\UF16B' # 
DATE_ICON $'\uF073 ' # 
TIME_ICON $'\uF017 ' # 
JAVA_ICON $'\U2615' # ☕︎
)
;;
*)
@ -487,6 +491,7 @@ case $POWERLEVEL9K_MODE in
DROPBOX_ICON 'Dropbox'
DATE_ICON ''
TIME_ICON ''
JAVA_ICON $'\U2615' # ☕︎
)
;;
esac