db76380563
Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065
7 years ago
3456af3aac
Merge remote-tracking branch 'opes/chruby_options' into staging_065
7 years ago
d3500625ca
Merge remote-tracking branch 'TheDan64/master' into staging_065
...
Conflicts were:
- test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826
removes grep from parsing the rust version on next; #703 changes color
names.
7 years ago
e763fa14b0
Merge remote-tracking branch 'chhschou/master' into staging_065
...
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641 ) on master and colors got
names (#703 ) on next.
7 years ago
4c2f58bdbd
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.
7 years ago
154e923033
Merge remote-tracking branch 'floor114/next' into staging_065
7 years ago
45ae153700
Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into staging_065
...
Conflicts were:
- functions/vcs.zsh: Two commits avoided wrapper behaviour. #685
in grep, #797 in git.
7 years ago
55473c450a
Merge branch 'master' into staging_065
...
Conflicts were:
- README.md: Two commits targeted the brightness table. #781 from
14. April 2018 on master and #684 from 05. December 2017 on next.
- powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both
achieve the same thing: To show the Ruby version number always. #795 on
next from 14. April 2018 and #610 on master from 28. September 2017. I
went with #795 here as this - although being newer - is the one on
master, and that should be more stable.
7 years ago
4df61d923a
Merge pull request #1 from dritter/fix_rust_tests
...
Fix test for rust segment
7 years ago
27bd1cd65d
Fix test for rust segment
7 years ago
7ab9cb150e
add comment line above battery-threshold condition
7 years ago
9b0e0c786a
Removed 'Rust' text from test; Silenced missing rustc warning
7 years ago
238b231c3e
rename variable to POWERLEVEL9K_BATTERY_HIDE_ABOVE_THRESHOLD
...
Variable now holds an integer, if your battery status is greater or equal to this integer the
segment will be hidden
7 years ago
642034eef2
remove duplicate code in battery segment
7 years ago
3c27f14581
add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"
...
Hides the battery segment if percentage hits 100%
7 years ago
5fd171c334
Fixed prompt_rust_version to avoid grep aliases
7 years ago
fbb85e77e3
Merge branch 'master' into chruby_options
7 years ago
75c6838a0d
Alphabetize chruby documentation
7 years ago
05f44b94bf
Add options for customizing `chruby` segment
7 years ago
13b0e383a0
Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777
...
Rbenv prompt option always displays #777
7 years ago
7234d52ebd
Merge pull request #791 from dritter/local_variables
...
Make variables local
7 years ago
0d8bfb68f4
Merge pull request #773 from conradhaupt/fix_dir_nav
...
Fixed home abbreviation not being exclusive with circular navigation
7 years ago
83e3267102
Merge pull request #789 from docwhat/pr/status-bug
...
workaround for ZSH status behavior
7 years ago
3dc17fce96
Merge pull request #781 from nikeee/master
...
Fix Brightness Table in README
7 years ago
356f05f0e5
Merge branch 'master' into master
7 years ago
6e3ceb8882
Merge pull request #799 from noraj/patch-1
...
add rvm to README
7 years ago
c6504ada34
Merge pull request #800 from lifehackett/patch-1
...
Fix table formatting in README
7 years ago
cfda084eb8
Another table formatting fix
7 years ago
02d4e76eb4
Fix table formatting in README
7 years ago
2eddce2f62
add rvm
...
see those files and look for `rvm`
+ https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md
+ https://github.com/bhilburn/powerlevel9k/blob/master/powerlevel9k.zsh-theme
7 years ago
111d152d48
Add vcs branch name truncating.
7 years ago
1aee125470
Fixes wrapper slowness in vcs segment
7 years ago
e85fb6c93d
#777 update Readme with POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable description
7 years ago
9f7b0b7404
#777 Add POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable to display prompt_rbenv if rbenv_version_name is the same as rbenv_global
7 years ago
f066dc1cf7
Make _path variable local in anaconda segment
7 years ago
9a895bc7e4
Make variables local
7 years ago
fe33c401ba
workaround for ZSH status behavior
...
`$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 #749
7 years ago
4c919f1a2b
Merge pull request #780 from sambadevi/next
...
update icons for nerd-fonts 2.0.0
7 years ago
b260adbc1b
Added a segment that shows the Java version.
7 years ago
4de4e8d9d7
Fix POWERLEVEL9k_BATTERY_STAGES Table
7 years ago
70fa74f631
Fix Brightness Table
7 years ago
d43f128c86
Merge branch 'dritter-fix_dir_home_issue' into fix_dir_nav
7 years ago
83ad5b598e
Add test for wrong truncation if switching back to home folder
...
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: #773
7 years ago
213ed57f68
add compatible to the list of fontconfigs
7 years ago
a3025cbebc
fixed missing icons for other fontconfigs
7 years ago
7a8fcf98c1
update icons for nerd-fonts 2.0.0
7 years ago
a761e3c28a
Fixed home abbreviation not being exclusive with circular navigation
7 years ago
99f142de36
**LARGE MERGE THAT TOUCHES LOTS OF THINGS.**
...
From this point until the next tagged release, `next` will be in a state
of heavy flux as we make some significant and invasive changes.
7 years ago
8c055f39d8
Moving documentation about newlines to the wiki.
7 years ago
203d0839f7
Merge branch 'next' into newline-count
7 years ago
Dominik Ritter
Daniel Kolsoi
Tim Otlik
Tim Otlik
Dan
Dan
Ben Hilburn
lifehackett
Alexandre ZANNI
Taras Shpachenko
Guilherme Cassolato
Ryan Davidson
Christian Höltje
Julien Roy
Niklas Mollenhauer
Conrad Haupt