From 27b38c5573113dbd7b768a91f07a5971796adcb1 Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 5 Apr 2019 02:11:37 -0600 Subject: [PATCH] Enhacement: Go Version segment uses Go colours and only the version number is shown. 1. Why is this change neccesary? Because the go_version segment had a green background when other segments (like rbenv) have a colour that matches the language. The Go version had the string "go" before the semantic versioning being redundant to have the Gopher icon and the String. The segment was only visible when inside the GOPATH, and some users (like me) may be interested in the segment being shown persistently. 2. How does it address the issue? The background colour was changed from green to cyan and the foreground colour from white to black in order to match Go colours. Only the version of Go is shown in the segment. A variable was added to see the segment persistently if the user wishes to. 3. What side effects does this change have? None! --- segments/go_version/README.md | 14 +++++++++++++- segments/go_version/go_version.p9k | 10 +++++++--- segments/go_version/go_version.spec | 2 +- segments/go_version/segment.png | Bin 2545 -> 4656 bytes segments/go_version/segment.svg | 10 +++++----- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/segments/go_version/README.md b/segments/go_version/README.md index bf70e79e3..a6b72f174 100644 --- a/segments/go_version/README.md +++ b/segments/go_version/README.md @@ -10,6 +10,18 @@ where you want to show this segment. ## Configuration +This segment shows the version of Go installed. + +It figures out the version being used by taking the output of the `go version` command. + +* If `go` is not in $PATH, nothing will be shown. +* By default, if the current Go version is only shown while inside your GOPATH. See the configuration variable, below, to modify this behavior. + +| Variable | Default Value | Description | +|----------|---------------|-------------| +|`P9K_GO_VERSION_PROMPT_ALWAYS_SHOW` |`false`|Set to true if you wish to show the go_version segment even if you're not inside your GOPATH. | + + ### Color Customization You can change the foreground and background color of this segment by setting @@ -21,4 +33,4 @@ P9K_GO_VERSION_BACKGROUND='blue' ### Customize Icon The main Icon can be changed by setting `P9K_GO_VERSION_ICON="my_icon"`. To change the -icon color only, set `P9K_GO_VERSION_ICON_COLOR="red"`. \ No newline at end of file +icon color only, set `P9K_GO_VERSION_ICON_COLOR="red"`. diff --git a/segments/go_version/go_version.p9k b/segments/go_version/go_version.p9k index ea163adf2..7424a2902 100644 --- a/segments/go_version/go_version.p9k +++ b/segments/go_version/go_version.p9k @@ -12,7 +12,11 @@ # Parameters: # segment_name context background foreground Generic Flat/Awesome-Patched Awesome-FontConfig Awesome-Mapped-FontConfig NerdFont #   - p9k::register_segment "GO_VERSION" '' 'green' 'grey93' 'Go' '' '' '\u'${CODEPOINT_OF_DEVICONS_GIT_PULL_REQUEST} $'\uE626' + p9k::register_segment "GO_VERSION" '' 'cyan' 'black' 'Go' '' '' '\u'${CODEPOINT_OF_DEVICONS_GIT_PULL_REQUEST} $'\uE626' + + ################################################################ + # Register segment default values + p9k::set_default P9K_GO_VERSION_PROMPT_ALWAYS_SHOW false } ################################################################ @@ -27,10 +31,10 @@ prompt_go_version() { local go_version local go_path - go_version=$(go version 2>/dev/null | sed -E "s/.*(go[0-9.]*).*/\1/") + go_version=$(go version 2>/dev/null | sed -E 's/.*(go[0-9.]*).*/\1/; s/go//g') go_path=$(go env GOPATH 2>/dev/null) - if [[ -n "$go_version" && "${PWD##$go_path}" != "$PWD" ]]; then + if [[ -n "$go_version" && "${PWD##$go_path}" != "$PWD" || "${P9K_GO_VERSION_PROMPT_ALWAYS_SHOW}" == "true" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "$go_version" fi } diff --git a/segments/go_version/go_version.spec b/segments/go_version/go_version.spec index c84fd8b5c..ca53d293d 100755 --- a/segments/go_version/go_version.spec +++ b/segments/go_version/go_version.spec @@ -44,7 +44,7 @@ function testGo() { PWD="$HOME/go/src/github.com/bhilburn/powerlevel9k" - assertEquals "%K{002} %F{255}Go %F{255}go1.5.3 %k%F{002}%f " "$(__p9k_build_left_prompt)" + assertEquals "%K{006} %F{000}Go %F{000}1.5.3 %k%F{006}%f " "$(__p9k_build_left_prompt)" unset P9K_GO_ICON unset PWD diff --git a/segments/go_version/segment.png b/segments/go_version/segment.png index d7e4b84fe8413e1543dca3680822ff02f8685f9e..ee0387a2af50141d069b98b1194d81618dce93a8 100644 GIT binary patch literal 4656 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 go1.5.3 + sodipodi:role="line"> 1.12.1