diff options
| author | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 01:11:15 +0300 |
|---|---|---|
| committer | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 01:11:15 +0300 |
| commit | 4c2f58bdbdaee400b076f2dd56aa5fea2bf9e309 (patch) | |
| tree | 58563969b91e31abe24f44a1403c2ced50e0419f /functions/icons.zsh | |
| parent | 154e9230339e85009407b01e4aff076a3d76efa9 (diff) | |
| parent | b260adbc1bc68d9729d6eebcfd344f83655bfda9 (diff) | |
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.
Diffstat (limited to 'functions/icons.zsh')
| -rwxr-xr-x | functions/icons.zsh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/functions/icons.zsh b/functions/icons.zsh index f758d55c..cf724b6a 100755 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -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 |