This repository has been archived by the owner on Apr 24, 2020. It is now read-only.
[WIP] Staging 0.6.5 #859
Merged
[WIP] Staging 0.6.5 #859
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t only if icon is unavailable
This happens if a user switches from a subdirectory of $HOME back to the home folder and truncation strategy is "truncate folders from left". Then the folder is displayed as .../~ PR: Powerlevel9k#773
`$pipestatus` is returning all zeros when using `[[ ]]` expressions that are false. This works around it by using `$status` (A.K.A. `$?`) when `$pipestatus` has only 1 items. Fixes Powerlevel9k#749
…o display prompt_rbenv if rbenv_version_name is the same as rbenv_global
…SHOW variable description
Fix table formatting in README
add rvm to README
Fix Brightness Table in README
workaround for ZSH status behavior
Fixed home abbreviation not being exclusive with circular navigation
…always-displays-#777 Rbenv prompt option always displays Powerlevel9k#777
Hides the battery segment if percentage hits 100%
Variable now holds an integer, if your battery status is greater or equal to this integer the segment will be hidden
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.
Conflicts were: - powerlevel9k.zsh-theme and test/segments/rust_version.spec: rust_version Segment changed (Powerlevel9k#641) on master and colors got names (Powerlevel9k#703) on next.
Conflicts were: - test/segments/rust_version.spec and powerlevel9k.zsh-theme. Powerlevel9k#826 removes grep from parsing the rust version on next; Powerlevel9k#703 changes color names.
… into staging_065
…ment' into staging_065
Conflicts were: - test/segments/command_execution_time.spec and test/segments/go_version.spec: All conflicts come from renaming color names on next (Powerlevel9k#703) and adding a whitespace to the Visual Identifier (Powerlevel9k#854) on master.
|
@dritter - I'm using this branch, now, and everything is looking solid. In fact, this has sped up the prompt a bit, just on its own. I'd like to go ahead and get this merged to make our next release (see the conversation in gitter). Let me know what your thoughts are on that plan here (or in Gitter), and let's kick this thing out the door! =) |
dritter
added a commit
to dritter/powerlevel9k
that referenced
this pull request
Jun 9, 2018
…taging_700 Merge of Powerlevel9k#771 into Powerlevel9k#859
Closed
- Fix the variable name for the VCS shorten strategy. - Add a heading for VCS truncation.
ZSH displays the right prompt indented one space from the right margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that makes display problems very likely and I don't recommend it. But all is not lost. The %E prompt format does continue the current background color through that last indent space. So it can *look* like our prompt goes right up to the margin, if: 1) We remove the trailing space from the last segment, and 2) We add %E before clearing the background color
|
Okay. I started to test this branch. First impression is good, but the named colors do not work well in ZSH < 5.1: @bhilburn We should set the minimum ZSH requirement to 5.1.. |
|
@dritter - agreed re: setting the minimum version. ZSH 5.1 was released in August of 2015, so I'm okay requiring something newer than that |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a staging branch to be merged in
next.It includes the following changes (in order of merge):
master. For easier merging later on,masterwas merged in first. There were two conflicts, one being a conflict in theREADME.md(Fix Brightness Table #781 vs Use color names, plus fixes #684) and another one in thepowerlevel9k.zsh-theme(Rbenv prompt option always displays #777 #795 vs Add ability to always show rbenv prompt #610). The latter one being the more impacting one, as I had to drop one completely (both implemented the same thing). I went with Rbenv prompt option always displays #777 #795, even this one is more recent. The reason for that is that this commit is the one onmaster, and I don't want to deprecate a variable just for naming reasons (or the naming must improve vastly, which didn't here).functions/vcs.zsh: Two commits avoided wrapper behaviour. vcs: Disable alias of grep to fix performance penalty #685in grep, Fix wrapper slowness in vcs segment #797 in git.
functions/icons.zshandpowerlevel9k.zsh-theme: Onmasterthe Java Segment was added, onnextthe Dropbox Segment.Rustor(rust)for rust_version segment only if ic… #641 Conflicts:test/segments/rust_version.specandpowerlevel9k.zsh-theme: Onmasterthe "Rust" was refactored as Visual Identifier; Onnextthe color names changed.test/segments/rust_version.specandpowerlevel9k.zsh-theme: Onmasterthe Rust version is now parsed differently; Onnextthe color names changed.test/segments/command_execution_time.specandtest/segments/go_version.spec: All conflicts come from renaming color names onnext([next] -- fix for colors #703) and adding a whitespace to the Visual Identifier (Fix icons cut off in some terminal emulators #854) onmaster.functions/icons.zsh: Java Segment (Added a segment that shows the Java version. #783) was added onmasterwith icons.Not yet merged (This is on purpose and will be done in #863 ):