aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Renamed "power-utilities.zsh" to just "utilities.zsh".Dominik Ritter2015-10-242-1/+1
|
* Merge branch 'next' into color_detectionDominik Ritter2015-10-223-21/+163
|\
| * Merge branch 'master' into nextBen Hilburn2015-10-221-2/+2
| |\
| | * Merge pull request #123 from martinpelikan/masterBen Hilburn2015-10-221-1/+1
| | |\ | | | | | | | | Fixes #122, SI prefixes should be evaluated as strings.
| | | * Fixes #122, SI prefixes should be evaluated as strings.Martin Pelikan2015-10-181-1/+1
| | | |
| | * | Merge pull request #128 from DanielGGordon/masterBen Hilburn2015-10-221-1/+1
| | |\ \ | | | |/ | | |/| Rephrasing of error message when TERM not 256 color
| | | * Rephrasing of error message when TERM not 256 colorDaniel Gordon2015-10-191-1/+1
| | |/ | | | | | | | | | | | | - Literal command to be added is highlighted in blue - Now beginners won't try to add an incorrect command to ~/.zshrc
| * | Merge pull request #126 from rjorgenson/nextBen Hilburn2015-10-222-0/+92
| |\ \ | | | | | | | | added a prompt segment to display battery status on laptops
| | * | fixed some edge cases I ran into during usage of the linux segmentrjorgenson2015-10-191-2/+7
| | | |
| | * | added time remaining support to battery segment on Linuxrjorgenson2015-10-192-1/+5
| | | |
| | * | erroneous whitespace commit undonerjorgenson2015-10-191-1/+1
| | | |
| | * | added Linux support to battery prompt segmentrjorgenson2015-10-192-19/+40
| | | |
| | * | editor automatically removed whitespacerjorgenson2015-10-181-1/+1
| | | |
| | * | fixed output string color declarationrjorgenson2015-10-181-1/+1
| | | |
| | * | added battery prompt segment usable on OS X systemsrjorgenson2015-10-182-1/+63
| | | |
| * | | Merge pull request #127 from dritter/go_promptBen Hilburn2015-10-222-0/+11
| |\ \ \ | | | | | | | | | | Adding Go version segment.
| | * | | Merge branch 'next' into go_promptDominik Ritter2015-10-192-74/+96
| | |\| |
| | * | | Merge remote-tracking branch 'ben/next' into go_promptDominik Ritter2015-10-162-430/+95
| | |\ \ \
| | * \ \ \ Merge branch 'next' into go_promptDominik Ritter2015-09-302-107/+192
| | |\ \ \ \
| | * | | | | Added a segment that shows the current GO version number.Dominik Ritter2015-09-212-0/+11
| | | | | | |
| * | | | | | Merge pull request #129 from dritter/ram_promptBen Hilburn2015-10-222-18/+58
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | Breaking RAM and Swap out of load segment into their own segment.
| | * | | | | Added documentation.Dominik Ritter2015-10-201-1/+11
| | | | | | |
| | * | | | | Merge branch 'next' into ram_promptDominik Ritter2015-10-202-74/+96
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'ben/next' into ram_promptDominik Ritter2015-10-162-430/+95
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'ram_prompt' of github.com:dritter/powerlevel9k into ram_promptDominik Ritter2015-10-011-25/+26
| | |\ \ \ \ \
| | | * | | | | Alphabetical order.Dominik Ritter2015-09-261-43/+44
| | | | | | | |
| | | * | | | | Corrected calculation of used swap under linux.Dominik Ritter2015-09-261-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'next' into ram_promptDominik Ritter2015-09-302-107/+192
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | |
| | * | | | | Ram as own prompt.Dominik Ritter2015-09-201-14/+42
| | | | | | |
| | * | | | | printHumanReadableSize should be able to process floats.Dominik Ritter2015-09-201-2/+3
| | | |_|/ / | | |/| | |
* | | | | | Moved utility-functions to "functions/power-utilities.zsh".Dominik Ritter2015-10-192-179/+192
| | | | | |
* | | | | | Merge branch 'next' into color_detectionDominik Ritter2015-10-182-74/+96
|\| | | | |
| * | | | | Merge branch 'master' into nextBen Hilburn2015-10-181-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | README: Updating second image to use @natemccurdy awesome gif.Ben Hilburn2015-10-181-2/+2
| | | |_|/ | | |/| |
| * | | | Merge pull request #118 from dritter/whitespace_customizationBen Hilburn2015-10-181-7/+9
| |\ \ \ \ | | | | | | | | | | | | Made whitespaces between segment separators customizable
| | * | | | Made whitespaces between segment separators customizable.Dominik Ritter2015-10-161-7/+9
| | |/ / /
| * | | | README: Updating the docs about `vi_mode` segment.Ben Hilburn2015-10-181-21/+9
| | | | |
| * | | | Merge pull request #117 from dritter/vi_customizationsBen Hilburn2015-10-182-2/+10
| |\ \ \ \ | | | | | | | | | | | | Make the vi_mode segement more customizable.
| | * | | | vi_mode segement more customizable.Dominik Ritter2015-10-162-2/+10
| | |/ / /
| * | | | Merge branch 'dritter-vcs_cleanup' into nextBen Hilburn2015-10-181-47/+45
| |\ \ \ \
| | * | | | Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into ↵Ben Hilburn2015-10-181-47/+45
| |/| | | | | | | | | | | | | | | | | | | | | | dritter-vcs_cleanup
| | * | | | Merge remote-tracking branch 'ben/next' into vcs_cleanupDominik Ritter2015-10-162-430/+95
| | |\| | |
| | * | | | Cleanup of VCS-segment. Now `vcs_info` is only invoked, if the user ↵Dominik Ritter2015-10-111-47/+45
| | | |_|/ | | |/| | | | | | | | | | | | configured to show the `vcs` segment.
| * | | | Merge pull request #114 from alexlafroscia/add-nvm-prompt-segmentBen Hilburn2015-10-182-0/+12
| |\ \ \ \ | | | | | | | | | | | | Add nvm prompt segment
| | * | | | Add note about NVM to the readmeAlex LaFroscia2015-10-141-0/+1
| | | | | |
| | * | | | Add NVM prompt segmentAlex LaFroscia2015-10-141-0/+11
| | | |/ / | | |/| | | | | | | | | | | | Prints out the Node version that is currently active if it is different than the default version specified by NVM
| * | | | Merge pull request #120 from partp/fix-virtualenvBen Hilburn2015-10-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition
| | * | | | Fixes `VIRTUAL_ENV_DISABLE_PROMPT` conditionParth Panchal2015-10-171-1/+1
| | |/ / /
| * | | | README: changing name of `todo.txt` segment to `todo`Ben Hilburn2015-10-181-1/+1
| | | | |
| * | | | reverting unnoticed white space changerjorgenson2015-10-171-1/+1
| | | | |