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.
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.
While zsh accepts the following code:
```
local paths=(${(s:/:)${1//"~\/"/}})
```
Travis fails unless it is
```
local paths=$1
paths=(${(s:/:)${paths//"~\/"/}})
```
Added `function truncatePath()` to utilities.zsh to take care of
truncation. This is pure zsh code, without calls to `sed`. Parameters
are:
* $1 Path: string - the directory path to be truncated
* $2 Length: integer - length to truncate to
* $3 Delimiter: string - the delimiter to use
* $4 From: string - "right" | "middle". If omited, assumes right.
Cleaned up code to use the new function instead.
If user defined alias of grep command with '-r' or '--recursive'
option, it causes a slow response of command line. It is not
unexpected behavior of vcs info.
This commit explicitly disables alias of grep to suppress side
effects.
- fix for packageName truncated by POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
- processing the pwd/HOME replacement ONCE.
- fix tests for named colors
- use color names by default to allow dark/light themes to adjust colors based on names
The newline segment will now show ├─ when using
`POWERLEVEL9K_PROMPT_ON_NEWLINE`
Note: This can be overridden via `POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX`
As this function gets more and more important, it now checks for
overrides the user has made and prints these icons instead. At least
unless the first parameter is not set to "original". Then it will print
the default icons.
* 'next' of https://github.com/bhilburn/powerlevel9k:
CHANGELOG: Updating to reflect work on `next`
README: fixing name of `detect-virt` to `detect_virt`
README: default segment list was no longer accurate
updating changelog for segment name change `disk_usage`
incorportaing feedback from review on `hdd_usage` segment
Fix swift segment
Updating the readme wih `hdd_usage` details.
changing `hdd_usage` to actually show usage
Moving `HDD_ICON` definition to consistent spot.
Fix
Fix
Fix
Fix
Fix
Fix
Change colors
Add anion155's HDD segment
* upstream/next: (41 commits)
vcs icons: fixing branch spacing and remote icon in fontawesome
same deal for the "FAIL_ICON"!
fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken
Change powerlevel9k_init to prompt_powerlevel_setup
Fix MacOS specific battery segment logic.
Minor fix-up to the README.
Adding license note about the new logo.
more typos
Adding the new logo to the README!
fixed typo fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
fixed typo
reverted testing value to default value
added link to segemnt documenation in README
fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real
fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty
added README section for public_ip segment
added the ability to specify and only attempt a particular method
Add Changelog for v0.5.0
added configurable string when there is no IP
updated some comments changed some offline behavior
...
Dominik Ritter
Max O'Cull
Tim Otlik
Ben Hilburn
Taras Shpachenko
Guilherme Cassolato
Julien Roy
Tim Otlik
Christo Kotze
Christian Höltje
Michael Louwrens
Justus Flerlage
Charles Peterson
Ben Hilburn
Daniel Porter
Kentaro Hayashi
Chris Chou
Simon Pettersson
Timothy Earley
Paul Frybarger
Giorgi Gzirishvili
Diego Rabatone Oliveira
David Sabatie
Jason Hutchinson
Jason Hutchinson
guixxx
Luca Corsini
David Paz
Riadh Habbachi
Benoit Averty
Keith Miyake