From 99c9ba936709f6fccb2da6630e0a40de00d85af4 Mon Sep 17 00:00:00 2001 From: Jason Hutchinson Date: Thu, 25 May 2017 16:38:14 -0500 Subject: [PATCH 1/5] add Gopher icon to go_version segment --- functions/icons.zsh | 4 ++++ powerlevel9k.zsh-theme | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/functions/icons.zsh b/functions/icons.zsh index c2cdcba5..5e719be1 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -78,6 +78,7 @@ case $POWERLEVEL9K_MODE in RUST_ICON '' PYTHON_ICON $'\U1F40D' # 🐍 SWIFT_ICON '' + GO_ICON '' PUBLIC_IP_ICON '' LOCK_ICON $'\UE138' #  EXECUTION_TIME_ICON $'\UE89C' #  @@ -144,6 +145,7 @@ case $POWERLEVEL9K_MODE in RUST_ICON $'\uE6A8' #  PYTHON_ICON $'\U1F40D' # 🐍 SWIFT_ICON '' + GO_ICON '' PUBLIC_IP_ICON '' LOCK_ICON $'\UE138' #  EXECUTION_TIME_ICON $'\uF253' @@ -210,6 +212,7 @@ case $POWERLEVEL9K_MODE in RUST_ICON $'\uE7A8 ' #  PYTHON_ICON $'\UE73C ' #  SWIFT_ICON $'\uE755' #  + GO_ICON $'\uE626' #  PUBLIC_IP_ICON $'\UF0AC' #  LOCK_ICON $'\UF023' #  EXECUTION_TIME_ICON $'\uF252' #  @@ -276,6 +279,7 @@ case $POWERLEVEL9K_MODE in RUST_ICON '' PYTHON_ICON '' SWIFT_ICON 'Swift' + GO_ICON 'Go' PUBLIC_IP_ICON '' LOCK_ICON $'\UE0A2' EXECUTION_TIME_ICON 'Dur' diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 7c7e2cfa..26ab9cd5 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -759,7 +759,7 @@ prompt_go_version() { go_path=$(go env GOPATH 2>/dev/null) if [[ -n "$go_version" && "${PWD##$go_path}" != "$PWD" ]]; then - "$1_prompt_segment" "$0" "$2" "green" "255" "$go_version" + "$1_prompt_segment" "$0" "$2" "green" "255" "$go_version" "GO_ICON" fi } From a6887eb1653cc330135146e7b50b94df48e670bc Mon Sep 17 00:00:00 2001 From: Jason Hutchinson Date: Thu, 25 May 2017 16:59:54 -0500 Subject: [PATCH 2/5] update test --- test/segments/go_version.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/segments/go_version.spec b/test/segments/go_version.spec index 907dceb3..f964df08 100755 --- a/test/segments/go_version.spec +++ b/test/segments/go_version.spec @@ -39,7 +39,8 @@ function testGo() { PWD="$HOME/go/src/github.com/bhilburn/powerlevel9k" - assertEquals "%K{green} %F{255}go1.5.3 %k%F{green}%f " "$(build_left_prompt)" + assertEquals "%K{green} %F{255}go1.5.3 %k%F{green}%f " "$(build_left_prompt)" + unset PWD unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS From f81ecc11f6f81b10070abeb70dcedb8035f55056 Mon Sep 17 00:00:00 2001 From: Jason Hutchinson Date: Thu, 25 May 2017 17:19:56 -0500 Subject: [PATCH 3/5] set GO_ICON manually in test --- test/segments/go_version.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/segments/go_version.spec b/test/segments/go_version.spec index f964df08..2aac460b 100755 --- a/test/segments/go_version.spec +++ b/test/segments/go_version.spec @@ -35,13 +35,14 @@ function mockGoEmptyGopath() { function testGo() { alias go=mockGo + POWERLEVEL9K_GO_ICON="" POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(go_version) PWD="$HOME/go/src/github.com/bhilburn/powerlevel9k" - assertEquals "%K{green} %F{255}go1.5.3 %k%F{green}%f " "$(build_left_prompt)" - + assertEquals "%K{green} %F{255%}%f %F{255}go1.5.3 %k%F{green}%f " "$(build_left_prompt)" + unset POWERLEVEL9K_GO_ICON unset PWD unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS unalias go From 65c770606b621a9d1cf809345f7baac6c800ff2a Mon Sep 17 00:00:00 2001 From: Pavel Peganov Date: Sun, 11 Jun 2017 04:09:00 +0300 Subject: [PATCH 4/5] Fixed RVM segment for usernames with dashes Having a username with a dash, such as mine, `d-side`, currently results in RVM segment displaying the wrong thing, e. g. `side/.rvm/rubies/ruby`. This fixes the issue. --- powerlevel9k.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 26ab9cd5..657d691d 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -990,7 +990,7 @@ prompt_rvm() { local gemset=$(echo $GEM_HOME | awk -F'@' '{print $2}') [ "$gemset" != "" ] && gemset="@$gemset" - local version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $2}') + local version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $NF}') if [[ -n "$version$gemset" ]]; then "$1_prompt_segment" "$0" "$2" "240" "$DEFAULT_COLOR" "$version$gemset" 'RUBY_ICON' From 82f319d1fbe25fe450d0851a5556545a11d9502d Mon Sep 17 00:00:00 2001 From: Ben Hilburn Date: Wed, 12 Jul 2017 10:33:26 -0400 Subject: [PATCH 5/5] Adding Code of Conduct Slightly modified version of Contributors Covenant. --- CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..22c9ebb4 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at bhilburn@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/