aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextBen Hilburn2016-07-070-0/+0
|\
| * Merge pull request #268 from mateusmedeiros/hide-custom-segment-when-emptyBen Hilburn2016-05-271-1/+4
| |\ | | | | | | Make prompt_custom not print the segment if empty
| | * Make prompt_custom not print the segment if emptyMateus "Doodad" Medeiros2016-05-241-1/+4
| |/ | | | | | | | | | | | | | | | | Currently you can't make a conditional custom segment. This changes the prompt_custom function responsible for printing custom segments so that it won't print the segment in case the content is empty. With this it becomes possible to make conditional custom prompts simply by making it not print anything when it's not supposed to be shown.
* | revise mac battery error when mac default date use linux'sruifeng.shan2016-07-071-1/+2
| |
* | Make prompt_custom not print the segment if emptyMateus "Doodad" Medeiros2016-07-071-1/+4
| | | | | | | | | | | | | | | | | | Currently you can't make a conditional custom segment. This changes the prompt_custom function responsible for printing custom segments so that it won't print the segment in case the content is empty. With this it becomes possible to make conditional custom prompts simply by making it not print anything when it's not supposed to be shown.
* | Merge pull request #282 from Mrngilles/new_python_iconBen Hilburn2016-07-071-2/+2
|\ \ | | | | | | Changed python icon to snake
| * | Changed python icon to snakeMarin Gilles2016-06-231-2/+2
| | |
* | | Merge pull request #275 from andjscott/prompt_dir_shorteningBen Hilburn2016-06-141-18/+10
|\ \ \ | |/ / |/| | Handle shorting path when in the .git directory
| * | Use git's show-toplevel to get top level directoryAndrew Scott2016-06-141-22/+10
| | |
| * | Handle shorting path when in the .git directoryAndrew Scott2016-06-121-0/+4
| | | | | | | | | | | | | | | | | | `git rev-parse --git-dir` returns just `.` when in the top level of a`.git` directory. This would cause a problem when extracting the package_path. Closes #271
* | | Merge pull request #276 from andjscott/package_nameBen Hilburn2016-06-141-1/+1
|\ \ \ | | | | | | | | Only match first name in package.json
| * | | Only match first name in package.jsonAndrew Scott2016-06-121-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the following package.json extract would just give the prompt "foo" rather than "foo\nbar". { "name": "foo", "author": { "name": "bar", } }
* | | Merge pull request #261 from wadkar/pyenvBen Hilburn2016-06-142-0/+17
|\ \ \ | |/ / |/| | Add pyenv segment to show active non-system python version
| * | Add new pyenv segment to show active python versionSudarshan Wadkar2016-06-032-0/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This commit provides a new segment `pyenv` to show current python environment. This prompt can be used in place of `virtualenv` segment. However, it is targeted at users of [pyenv](https://github.com/yyuu/pyenv) and not meant to replace the `virtualenv` segment. The prompt works by parsing output of `pyenv version` and displaying the first word of the output as segment text. The design (color etc.) is same as the `virtualenv` segment including the icon. The segment would need to be revisited if `pyenv version` changes its output format. Tested on my personal machines (Mac OSX 10.11.4 and Ubuntu 15.04).
* | Merge pull request #260 from thuandt/python-iconBen Hilburn2016-05-272-4/+7
|\ \ | | | | | | PYTHON ICON for virtualenv prompt
| * | [ADD] python icon in virtualenv promptThuan (Duong Tien)2016-05-041-1/+1
| | |
| * | [ADD] PYTHON_ICONThuan (Duong Tien)2016-05-041-3/+6
| |/
* | Merge pull request #266 from dritter/264_fix_script_locationBen Hilburn2016-05-271-27/+28
|\ \ | |/ |/| Refactor location installation path code
| * Refactor location installation path codeDominik Ritter2016-05-241-27/+28
|/ | | | | | Now it is possible to set the installation path by setting POWERLEVEL9K_INSTALLATION_PATH. If set, this path will always be used. If it was not set manually, we try to determine the path automatically.
* Merge pull request #256 from cbourgeois/nextBen Hilburn2016-05-041-0/+4
|\ | | | | Fix incorrect background jobs number
| * Fix incorrect background jobs numberClement Bourgeois2016-04-291-0/+4
| |
* | Merge pull request #252 from rawkode/feature/better-battery-core-improvementsBen Hilburn2016-05-031-6/+11
|\ \ | |/ |/| Improvements to load prompt, now reporting warning and critical at 50…
| * Using logical CPUs, as it's a fairer reflection of CPU loadDavid McKay2016-05-021-1/+1
| |
| * Consolidated if statements and fixed OSX cpu cores commandDavid McKay2016-04-251-6/+2
| |
| * Improvements to load prompt, now reporting warning and critical at 50% and ↵David McKay2016-04-221-6/+15
|/ | | | 70% cpu core utilisation
* Changelog: Remove tag "next" for version 0.4.0Dominik Ritter2016-04-211-1/+1
|
* Changelog: Add a note about TravisCIDominik Ritter2016-04-211-0/+4
|
* Changelog: Add a note about vcs untracked stateDominik Ritter2016-04-211-0/+3
|
* Changelog: Add a note about `rbenv` segmentDominik Ritter2016-04-211-0/+5
|
* Changelog: Add a note about `swap` segmentDominik Ritter2016-04-211-5/+10
|
* Changelog: Reformat; first changes then additionsDominik Ritter2016-04-211-4/+4
|
* Changelog: Reformat; first changes then additionsDominik Ritter2016-04-201-4/+4
|
* Changelog: Add entry about new `nodeenv` segmentDominik Ritter2016-04-201-0/+4
|
* Changelog: Fix name for docker_machine segmentDominik Ritter2016-04-201-2/+2
|
* Changelog: Add a note about the changed shorten delimiterDominik Ritter2016-04-201-1/+6
|
* Changelog: Update headlines for better readabilityDominik Ritter2016-04-201-3/+3
|
* Changelog: Add entry for new anaconda segmentDominik Ritter2016-04-201-0/+5
|
* Changelog: Add a note about obsolete variablesDominik Ritter2016-04-201-0/+6
| | | | | The variables `POWERLEVEL9K_VCS_FOREGROUND` and `POWERLEVEL9K_VCS_DARK_FOREGROUND` are no longer used.
* Making `anaconda` list item a link to full description.Ben Hilburn2016-04-201-1/+1
|
* Merge pull request #249 from jaermanx9/anaconda-segmentBen Hilburn2016-04-202-0/+23
|\ | | | | Add anaconda segment.
| * Added anaconda segment.Jan Laermann2016-04-192-0/+23
|/ | | | | | | | The segment relies on a lookaround to determine the currently active conda environment. If available ack is preferred, otherwise grep will be used. Recent versions of grep offer `-P` to support perl-regex. Older ones (e.g. those shipped on OSX) will fail.
* Merge pull request #247 from orhanbalci/nextBen Hilburn2016-04-193-2/+5
|\ | | | | rust icon added to rust segment
| * Merge branch 'next' of https://github.com/orhanbalci/powerlevel9k into nextorhanbalci2016-04-191-1/+1
| |\
| | * add rust icon information to READMEorhanbalci2016-04-191-1/+1
| | |
| * | whitespace fixorhanbalci2016-04-191-1/+1
| |/
| * empty rust icon for patched modeorhanbalci2016-04-171-0/+1
| |
| * rust icon addedorhanbalci2016-04-162-2/+4
| |
* | Merge branch 'vcs-tag-display' into nextBen Hilburn2016-04-192-11/+28
|\ \ | |/ |/|
| * Fix truncation of changeset in detached tag modeDominik Ritter2016-04-172-8/+9
| |
| * Fixing comments in vi-gitBen Hilburn2016-04-121-5/+6
| | | | | | | | -tagname
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 00:57:21 +0300