diff options
| author | Keith Miyake <keith.miyake@gmail.com> | 2017-01-22 00:40:51 +0300 |
|---|---|---|
| committer | Keith Miyake <keith.miyake@gmail.com> | 2017-01-22 00:40:51 +0300 |
| commit | f9d2f3a3a5b54b6a6128b2b96d187bd3560a5146 (patch) | |
| tree | 35bd5be1ea093251e2c292907998cc7e0dedb686 /functions | |
| parent | 82aa37d230cfb48bc6172ce72413077ca78996d0 (diff) | |
| parent | 9ead1c15480249b082bf93c59540f4a09fa44c8d (diff) | |
Merge remote-tracking branch 'upstream/next' into nerdfont
* upstream/next: (41 commits)
vcs icons: fixing branch spacing and remote icon in fontawesome
same deal for the "FAIL_ICON"!
fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken
Change powerlevel9k_init to prompt_powerlevel_setup
Fix MacOS specific battery segment logic.
Minor fix-up to the README.
Adding license note about the new logo.
more typos
Adding the new logo to the README!
fixed typo fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
fixed typo
reverted testing value to default value
added link to segemnt documenation in README
fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real
fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty
added README section for public_ip segment
added the ability to specify and only attempt a particular method
Add Changelog for v0.5.0
added configurable string when there is no IP
updated some comments changed some offline behavior
...
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/icons.zsh | 35 | ||||
| -rw-r--r-- | functions/vcs.zsh | 13 |
2 files changed, 36 insertions, 12 deletions
diff --git a/functions/icons.zsh b/functions/icons.zsh index adb6e93e..c02e84e8 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -65,14 +65,18 @@ case $POWERLEVEL9K_MODE in VCS_TAG_ICON $'\uE817 ' # VCS_BOOKMARK_ICON $'\uE87B' # VCS_COMMIT_ICON $'\uE821 ' # - VCS_BRANCH_ICON $'\uE220' # - VCS_REMOTE_BRANCH_ICON ' '$'\uE804 ' # + VCS_BRANCH_ICON $'\uE220 ' # + VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_GIT_ICON $'\uE20E ' # + VCS_GIT_GITHUB_ICON $'\uE20E ' # + VCS_GIT_BITBUCKET_ICON $'\uE20E ' # + VCS_GIT_GITLAB_ICON $'\uE20E ' # VCS_HG_ICON $'\uE1C3 ' # VCS_SVN_ICON '(svn) ' RUST_ICON '' PYTHON_ICON $'\U1F40D' # 🐍 SWIFT_ICON '' + PUBLIC_IP_ICON '' ) ;; 'awesome-fontconfig') @@ -93,8 +97,8 @@ case $POWERLEVEL9K_MODE in TEST_ICON $'\uF291' # TODO_ICON $'\u2611' # ☑ BATTERY_ICON $'\U1F50B' # 🔋 - OK_ICON $'\uF23A' # - FAIL_ICON $'\uF281' # + OK_ICON $'\u2713' # ✓ + FAIL_ICON $'\u2718' # ✘ SYMFONY_ICON 'SF' NODE_ICON $'\u2B22' # ⬢ MULTILINE_FIRST_PROMPT_PREFIX $'\u256D'$'\U2500' # ╭─ @@ -120,14 +124,18 @@ case $POWERLEVEL9K_MODE in VCS_TAG_ICON $'\uF217 ' # VCS_BOOKMARK_ICON $'\uF27B' # VCS_COMMIT_ICON $'\uF221 ' # - VCS_BRANCH_ICON $'\uF126' # - VCS_REMOTE_BRANCH_ICON ' '$'\uF204 ' # - VCS_GIT_ICON $'\uF113 ' # + VCS_BRANCH_ICON $'\uF126 ' # + VCS_REMOTE_BRANCH_ICON $'\u2192' # → + VCS_GIT_ICON $'\uF1D3 ' # + VCS_GIT_GITHUB_ICON $'\uF113 ' # + VCS_GIT_BITBUCKET_ICON $'\uF171 ' # + VCS_GIT_GITLAB_ICON $'\uF296 ' # VCS_HG_ICON $'\uF0C3 ' # VCS_SVN_ICON '(svn) ' RUST_ICON $'\uE6A8' # PYTHON_ICON $'\U1F40D' # 🐍 SWIFT_ICON '' + PUBLIC_IP_ICON '' ) ;; 'nerd-patched-complete') @@ -147,7 +155,7 @@ case $POWERLEVEL9K_MODE in BACKGROUND_JOBS_ICON $'\uF013 ' # TEST_ICON $'\uF188' # TODO_ICON $'\u2611' # ☑ - BATTERY_ICON $'\U1F50B' # 🔋 + BATTERY_ICON $'\uF241' # OK_ICON $'\u2713' # ✓ FAIL_ICON $'\u2718' # ✘ SYMFONY_ICON $'\uE757' # @@ -181,8 +189,9 @@ case $POWERLEVEL9K_MODE in VCS_HG_ICON $'\uF0C3 ' # VCS_SVN_ICON '(svn) ' RUST_ICON $'\uE7A8' # - PYTHON_ICON $'\U1F40D' # 🐍 + PYTHON_ICON $'\uE73C' # SWIFT_ICON $'\uE755' # + PUBLIC_IP_ICON '' ) ;; *) @@ -233,11 +242,15 @@ case $POWERLEVEL9K_MODE in VCS_BRANCH_ICON $'\uE0A0 ' # VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_GIT_ICON '' + VCS_GIT_GITHUB_ICON '' + VCS_GIT_BITBUCKET_ICON '' + VCS_GIT_GITLAB_ICON '' VCS_HG_ICON '' VCS_SVN_ICON '' - RUST_ICON '' + RUST_ICON '' PYTHON_ICON '' - SWIFT_ICON '' + SWIFT_ICON 'Swift' + PUBLIC_IP_ICON '' ) ;; esac diff --git a/functions/vcs.zsh b/functions/vcs.zsh index 93925f15..5defa9bc 100644 --- a/functions/vcs.zsh +++ b/functions/vcs.zsh @@ -110,7 +110,18 @@ function +vi-hg-bookmarks() { function +vi-vcs-detect-changes() { if [[ "${hook_com[vcs]}" == "git" ]]; then - vcs_visual_identifier='VCS_GIT_ICON' + + local remote=`git ls-remote --get-url` + if [[ "$remote" =~ "github" ]] then + vcs_visual_identifier='VCS_GIT_GITHUB_ICON' + elif [[ "$remote" =~ "bitbucket" ]] then + vcs_visual_identifier='VCS_GIT_BITBUCKET_ICON' + elif [[ "$remote" =~ "gitlab" ]] then + vcs_visual_identifier='VCS_GIT_GITLAB_ICON' + else + vcs_visual_identifier='VCS_GIT_ICON' + fi + elif [[ "${hook_com[vcs]}" == "hg" ]]; then vcs_visual_identifier='VCS_HG_ICON' elif [[ "${hook_com[vcs]}" == "svn" ]]; then |