Commit Graph

1712 Commits (0b56d123ec3c88ee81178134c14c327cb8f86db1)
 

Author SHA1 Message Date
Dominik Ritter 08a3801c81 Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065 7 years ago
Dominik Ritter 595bdb4fa3 Use cog glyph on all modes 7 years ago
Dominik Ritter d09a46f9e0 Mute errors when asking for java version 7 years ago
Tim Smith 3989834bfe Hide one-space indent at right margin
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
7 years ago
Dominik Ritter b7681a00ca Fix variable in README
- Fix the variable name for the VCS shorten strategy.
- Add a heading for VCS truncation.
7 years ago
Dominik Ritter 51b53cd4b5
Fix `rbenv` segment after merge 7 years ago
Dominik Ritter dc21b97335 Fix travis build 7 years ago
Dominik Ritter 0257159e1e Add tests for laravel version segment to travis 7 years ago
Dominik Ritter a2d8cccd09 Add a Laravel version segment 7 years ago
Dominik Ritter d9d9fb9b6b Merge remote-tracking branch 'ytang/fix-icons-cut-off' 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 (#703) and adding a whitespace to the Visual Identifier
(#854) on master.
7 years ago
Dominik Ritter 5eedb2586b Merge remote-tracking branch 'Maxattax97/next' into staging_065 7 years ago
Dominik Ritter 40219759bb Merge branch 'fix_rprompt_newline' into staging_065 7 years ago
Dominik Ritter 47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 7 years ago
Dominik Ritter db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065 7 years ago
Dominik Ritter 3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065 7 years ago
Dominik Ritter 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
Dominik Ritter 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
Dominik Ritter 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
Dominik Ritter 154e923033 Merge remote-tracking branch 'floor114/next' into staging_065 7 years ago
Dominik Ritter 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
Dominik Ritter 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
Yang Tang 9c4203bdf8 Add comments about the whitespace and coloring 7 years ago
Yang Tang 5e0b924346 Update unit tests for fixing icons cut off 7 years ago
Yang Tang 2f95fd04d9 Fix icons cut off in some terminal emulators 7 years ago
Dominik Ritter 37cbc9a02d Fix RPROMPT placement
This fixes #841
7 years ago
Ben Hilburn 0e3c1924fe
Merge pull request #811 from shirts/chore/public-ip-file-name
Update default public ip file name
7 years ago
Max O'Cull fcea56be5c Fix Linux distribution detection 7 years ago
Tim Otlik 557f5993ea
add cog symbol to dir segment if folder is /etc* 7 years ago
Daniel Kolsoi 4df61d923a
Merge pull request #1 from dritter/fix_rust_tests
Fix test for rust segment
7 years ago
Dominik Ritter 27bd1cd65d Fix test for rust segment 7 years ago
Tim Otlik 7ab9cb150e
add comment line above battery-threshold condition 7 years ago
Daniel Kolsoi 9b0e0c786a Removed 'Rust' text from test; Silenced missing rustc warning 7 years ago
Tim Otlik 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
Tim Otlik 642034eef2
remove duplicate code in battery segment 7 years ago
Tim Otlik 3c27f14581
add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"
Hides the battery segment if percentage hits 100%
7 years ago
Daniel Kolsoi 5fd171c334 Fixed prompt_rust_version to avoid grep aliases 7 years ago
Dan fbb85e77e3
Merge branch 'master' into chruby_options 7 years ago
Dan 75c6838a0d Alphabetize chruby documentation 7 years ago
Dan 05f44b94bf Add options for customizing `chruby` segment 7 years ago
Kevin Chandler c36b47b007 Update default public ip file name 7 years ago
Ben Hilburn 13b0e383a0
Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777
Rbenv prompt option always displays #777
7 years ago
Ben Hilburn 7234d52ebd
Merge pull request #791 from dritter/local_variables
Make variables local
7 years ago
Ben Hilburn 0d8bfb68f4
Merge pull request #773 from conradhaupt/fix_dir_nav
Fixed home abbreviation not being exclusive with circular navigation
7 years ago
Ben Hilburn 83e3267102
Merge pull request #789 from docwhat/pr/status-bug
workaround for ZSH status behavior
7 years ago
Ben Hilburn 3dc17fce96
Merge pull request #781 from nikeee/master
Fix Brightness Table in README
7 years ago
Ben Hilburn 356f05f0e5
Merge branch 'master' into master 7 years ago
Ben Hilburn 6e3ceb8882
Merge pull request #799 from noraj/patch-1
add rvm to README
7 years ago
Ben Hilburn c6504ada34
Merge pull request #800 from lifehackett/patch-1
Fix table formatting in README
7 years ago
lifehackett cfda084eb8
Another table formatting fix 7 years ago
lifehackett 02d4e76eb4
Fix table formatting in README 7 years ago