Commit Graph

3553 Commits (fdac99c57cb1c1ea27319f7e405b73af5c3a3c82)
 

Author SHA1 Message Date
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 () and adding a whitespace to the Visual Identifier
() on master.
Dominik Ritter 5eedb2586b Merge remote-tracking branch 'Maxattax97/next' into staging_065
Dominik Ritter 40219759bb Merge branch 'fix_rprompt_newline' into staging_065
Dominik Ritter 47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065
Dominik Ritter db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065
Dominik Ritter 3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065
Dominik Ritter d3500625ca Merge remote-tracking branch 'TheDan64/master' into staging_065
Conflicts were:
- test/segments/rust_version.spec and powerlevel9k.zsh-theme. 
removes grep from parsing the rust version on next;  changes color
names.
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 () on master and colors got
names () on next.
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.
Dominik Ritter 154e923033 Merge remote-tracking branch 'floor114/next' into staging_065
Dominik Ritter 45ae153700 Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into staging_065
Conflicts were:
- functions/vcs.zsh: Two commits avoided wrapper behaviour. 
in grep,  in git.
Dominik Ritter 55473c450a Merge branch 'master' into staging_065
Conflicts were:
- README.md: Two commits targeted the brightness table.  from
14. April 2018 on master and  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.  on
next from 14. April 2018 and  on master from 28. September 2017. I
went with  here as this - although being newer - is the one on
master, and that should be more stable.
Yang Tang 9c4203bdf8 Add comments about the whitespace and coloring
Yang Tang 5e0b924346 Update unit tests for fixing icons cut off
Yang Tang 2f95fd04d9 Fix icons cut off in some terminal emulators
Dominik Ritter 37cbc9a02d Fix RPROMPT placement
This fixes 
Ben Hilburn 0e3c1924fe
Merge pull request from shirts/chore/public-ip-file-name
Update default public ip file name
Max O'Cull fcea56be5c Fix Linux distribution detection
Tim Otlik 557f5993ea
add cog symbol to dir segment if folder is /etc*
Daniel Kolsoi 4df61d923a
Merge pull request from dritter/fix_rust_tests
Fix test for rust segment
Dominik Ritter 27bd1cd65d Fix test for rust segment
Tim Otlik 7ab9cb150e
add comment line above battery-threshold condition
Daniel Kolsoi 9b0e0c786a Removed 'Rust' text from test; Silenced missing rustc warning
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
Tim Otlik 642034eef2
remove duplicate code in battery segment
Tim Otlik 3c27f14581
add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"
Hides the battery segment if percentage hits 100%
Daniel Kolsoi 5fd171c334 Fixed prompt_rust_version to avoid grep aliases
Dan fbb85e77e3
Merge branch 'master' into chruby_options
Dan 75c6838a0d Alphabetize chruby documentation
Dan 05f44b94bf Add options for customizing `chruby` segment
Kevin Chandler c36b47b007 Update default public ip file name
Ben Hilburn 13b0e383a0
Merge pull request from
Rbenv prompt option always displays 
Ben Hilburn 7234d52ebd
Merge pull request from dritter/local_variables
Make variables local
Ben Hilburn 0d8bfb68f4
Merge pull request from conradhaupt/fix_dir_nav
Fixed home abbreviation not being exclusive with circular navigation
Ben Hilburn 83e3267102
Merge pull request from docwhat/pr/status-bug
workaround for ZSH status behavior
Ben Hilburn 3dc17fce96
Merge pull request from nikeee/master
Fix Brightness Table in README
Ben Hilburn 356f05f0e5
Merge branch 'master' into master
Ben Hilburn 6e3ceb8882
Merge pull request from noraj/patch-1
add rvm to README
Ben Hilburn c6504ada34
Merge pull request from lifehackett/patch-1
Fix table formatting in README
lifehackett cfda084eb8
Another table formatting fix
lifehackett 02d4e76eb4
Fix table formatting in README
Alexandre ZANNI 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
Taras Shpachenko 111d152d48 Add vcs branch name truncating.
Guilherme Cassolato 1aee125470 Fixes wrapper slowness in vcs segment
Ryan Davidson e85fb6c93d update Readme with POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable description
Ryan Davidson 9f7b0b7404 Add POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable to display prompt_rbenv if rbenv_version_name is the same as rbenv_global
Dominik Ritter f066dc1cf7 Make _path variable local in anaconda segment
Dominik Ritter 9a895bc7e4 Make variables local
Christian Höltje 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 
Ben Hilburn 4c919f1a2b
Merge pull request from sambadevi/next
update icons for nerd-fonts 2.0.0