aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'ben/next' into ram_promptDominik Ritter2015-10-162-430/+95
|\
| * Merge branch 'readme-v2' into nextBen Hilburn2015-10-131-428/+94
| |\
| | * README: one more wiki link to ToCBen Hilburn2015-10-131-0/+2
| | |
| | * README: Add link to Wiki at end of READMEBen Hilburn2015-10-131-0/+6
| | |
| | * README: Cleaning up ToCBen Hilburn2015-10-131-5/+6
| | |
| | * README: Final cleanupBen Hilburn2015-10-131-5/+5
| | |
| | * README: Moving styling to the wikiBen Hilburn2015-10-131-121/+8
| | |
| | * README: I'm good at markdownBen Hilburn2015-10-131-3/+3
| | |
| | * README: Adding ToCBen Hilburn2015-10-131-0/+6
| | |
| | * README: Fixing install instruction bulletsBen Hilburn2015-10-131-0/+1
| | |
| | * README: cleanupBen Hilburn2015-10-131-29/+7
| | |
| | * README: Fixing some segment linksBen Hilburn2015-10-131-9/+9
| | |
| | * README: Creating links for each segment sectionBen Hilburn2015-10-131-60/+18
| | |
| | * README: moving lots of information to the WikiBen Hilburn2015-10-131-244/+71
| | |
| * | Merge pull request #109 from jkoelndorfer/nextBen Hilburn2015-10-121-2/+1
| |\ \ | | |/ | |/| Fixing issue where BSD detection can bleed info to stdout.
| | * Quote value of IS_BSD_SED.John Koelndorfer2015-10-061-2/+1
| |/ | | | | | | | | If this isn't quoted, in can bleed through to stdout in certain circumstances.
* | 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
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #108 from V1rgul/nextBen Hilburn2015-09-291-25/+41
| |\ | | | | | | Added awesome fontconfig for next icons
| | * Font Awesome fontconfig new icons (fixed errors)v1rgul2015-09-291-2/+2
| | |
| | * Font Awesome fontconfig new iconsv1rgul2015-09-291-25/+41
| |/
| * Minor comment addition for system load prompt segment.Ben Hilburn2015-09-281-0/+1
| |
| * Cleaning up comments around font icon settings.Ben Hilburn2015-09-281-89/+87
| |
| * Merge pull request #106 from V1rgul/masterBen Hilburn2015-09-282-0/+33
| |\ | | | | | | Added awesome-fontconfig support
| | * Added awesome fontconfig supportv1rgul2015-09-272-0/+33
| | |
| * | Merge pull request #104 from dritter/vi_mode_cleanupBen Hilburn2015-09-282-11/+46
| |\ \ | | | | | | | | VI-mode cleanup
| | * | Better compatibility with shellcheck.net.Dominik Ritter2015-09-231-1/+6
| | | |
| | * | KEYMAP may be "main" or "viins" in VI-Mode.Dominik Ritter2015-09-231-2/+2
| | | |
| | * | Added documentation.Dominik Ritter2015-09-221-1/+21
| | | |
| | * | code more readable.Dominik Ritter2015-09-221-6/+8
| | | |
| | * | Made VI-Mode plugin working again.Dominik Ritter2015-09-221-0/+8
| | | |
| | * | Shellcheck-support for vi_mode segment & alphabetical order of prompts.Dominik Ritter2015-09-211-10/+10
| | | |
| * | | Merge pull request #103 from dritter/status_segment_cleanupBen Hilburn2015-09-282-32/+32
| |\ \ \ | | | | | | | | | | status vs longstatus cleanup
| | * | | There is now no difference between longstatus and status any more. Just use ↵Dominik Ritter2015-09-202-32/+32
| | |/ / | | | | | | | | | | | | | | | | | | | | status, and if you just want to display it conditionally set POWERLEVEL9K_STATUS_VERBOSE=false. Also here I unified the use of named color codes to make the subsegment-display work.
| * | | Merge pull request #102 from dritter/flat_subsegmentsBen Hilburn2015-09-281-0/+2
| |\ \ \ | | |/ / | |/| | Added subsegments in flat-mode.
| | * | Added subsegments in flat-mode.Dominik Ritter2015-09-201-0/+2
| |/ /
* | | Ram as own prompt.Dominik Ritter2015-09-201-14/+42
| | |
* | | printHumanReadableSize should be able to process floats.Dominik Ritter2015-09-201-2/+3
|/ /
* | Merge branch 'master' into nextBen Hilburn2015-09-201-2/+3
|\|
| * Merge pull request #99 from giladgo/masterBen Hilburn2015-09-202-3/+4
| |\ | | | | | | README: propely reflect difference between status and longstatus
| | * Make docs reflect difference between status and longstatusGilad Goldberg2015-09-192-3/+4
| |/
| * Revert "Merge pull request #91 from tusharsrivastava/master"Ben Hilburn2015-09-171-5/+5
| | | | | | | | | | This reverts commit 2a2dfdfa295190892deb74207173e5b00af6561c, reversing changes made to 1390fbdea5b278474eafe889da327979654c0d99.
* | Merge pull request #98 from christian-schulze/vi-mode-segmentBen Hilburn2015-09-202-0/+11
|\ \ | | | | | | Add vi-mode segment
| * | $0 suffixes for color customizationChristian Schulze2015-09-191-2/+2
| | |
| * | add vi-mode segmentChristian Schulze2015-09-192-0/+11
| | |
* | | Merge pull request #92 from dritter/shellcheck_fixesBen Hilburn2015-09-201-176/+183
|\ \ \ | |/ / |/| | Reducing 'lintian'-like warnings according to spellcheck.net report.
| * | Merge remote-tracking branch 'ben/next' into shellcheck_fixesDominik Ritter2015-09-190-0/+0
| |\ \ | |/ / |/| |
* | | Reverting merge of PR #91Ben Hilburn2015-09-171-5/+5
| | |