Commit Graph

3193 Commits (af42857637dc9a6b6122f869d81715d1fdb1f24a)
 

Author SHA1 Message Date
Ben Hilburn 4f4a15de82 Merge pull request #198 from dritter/vcs_customizable
VCS-hooks customizable
9 years ago
Ben Hilburn 25bf6d60a0 Merge pull request #181 from dritter/split_up_ram_segment
Split up `ram` segment into `ram` and `swap`.
9 years ago
Ben Hilburn 65e9438210 Merge pull request #203 from dritter/beanstalk
Reworked the AWS-Beanstalk segment
9 years ago
Ben Hilburn 6072f1e56c Merge pull request #202 from dritter/join_conditional_segments
Allows the use of `_join` on conditional segments.
9 years ago
Dominik Ritter 54254600d1 Change default dir truncation delimitor to ellipsis 9 years ago
John Minor 177bfc9602 update CHANGELOG re new UNTRACKED state in vcs segment 9 years ago
John Minor d7c26513c8 Add "_UNTRACKED" option for _VCS to change colors - default yellow 9 years ago
theminor 3b7dfff7ea Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged files 9 years ago
Dominik Ritter 15665a4f95 Joining conditional segments now work as expected. If between the last
printed segment is a full but conditional segment, the joined one gets
promoted.
This fixes #186
9 years ago
Dominik Ritter ed28b8d26f Use explicit word splitting. No need to set SH_WORD_SPLIT 9 years ago
Dominik Ritter cd78c66997 First try: Now joined segments are promoted to "full" segments, if their
predecessor was conditional and had no output.
9 years ago
Dominik Ritter 930ae170a4 Made the VCS-hooks customizable. 9 years ago
Dominik Ritter 45184839f3 Added changelog entry. 9 years ago
Dominik Ritter eba3a3ca95 Reworked the AWS Elastic Beanstalk segment. 9 years ago
Dominik Ritter 6763826c4e More space for the Beanstalk-Icon. 9 years ago
Dominik Ritter a6174e31ea Added documentation for the AWS Beanstalk segment. 9 years ago
James Bowman af119c9406 Adding command prompt for AWS Elastic Beanstalk environment name. 9 years ago
Dominik Ritter 6aadf76397 Split up `ram` segment into `ram` and `swap`. 9 years ago
Ben Hilburn 472fb6f674 README: Arrghhhhh. Newlines in tables breaking things. 9 years ago
Ben Hilburn bd88fe9637 README: Documenting new background_jobs feature 9 years ago
Ben Hilburn f58da93481 README: Updating language about ZSH frameworks 9 years ago
Dominik Ritter c379cf2657 Syntax fix. 9 years ago
Ben Hilburn 657a097ef0 Merge pull request #201 from Kayant/zsh-frameworks
Add more ZSH framework instructions
9 years ago
Ben Hilburn 8172425cd2 Merge pull request #200 from V1rgul/next
background_jobs segment : add number of jobs if >1
9 years ago
v1rgul ce72ca3a16 add background_jobs change in changelog 9 years ago
v1rgul 29b346930b fix wc glitch on OSX 9 years ago
Anthony 684291e734 Fix spacing derp 9 years ago
Kayant 193e19f597 Add more ZSH framework instructions
*Zgen
*Antibody
*ZPM
*ZIM
9 years ago
v1rgul 11d00ce713 background_jobs: show number if verbose 9 years ago
V1rgul a0c664b174 Merge pull request #1 from bhilburn/next
Merge original repo
9 years ago
Kayant 0b1849d034 Improve zsh framework install description and add zplug 9 years ago
Ben Hilburn 67895cc5da README: Added a tl;dr 9 years ago
Ben Hilburn 24e7ee75fe Merge pull request #197 from dritter/changelog_additions
Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.
9 years ago
Dominik Ritter 13b7d26e76 Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment. 9 years ago
Ben Hilburn dc4871f1a0 README: Minor cleanups 9 years ago
Ben Hilburn 02cb0fd88f README: Turns out you can't linebreak in tables. 9 years ago
Ben Hilburn 8a3c16ae24 README: Trying out tables to describe variables. 9 years ago
Ben Hilburn 273bcaed55 Merge pull request #196 from rjorgenson/next
added space to end of RVM icon
9 years ago
rjorgenson f1486620e7 added space to end of RVM icon 9 years ago
Ben Hilburn bc1af0d733 Merge pull request #195 from dritter/minor_improvements
Minor improvements to README `dir` section
9 years ago
Dominik Ritter 01e4e8d324 Added "visual identifier" concept to `icons_test` segment. 9 years ago
Dominik Ritter 701053aa73 Improved dir icon descriptions. 9 years ago
Ben Hilburn 76e020a81e Merge pull request #193 from rjorgenson/next
fixing segment call for new state implementation in prompt_load
9 years ago
rjorgenson 3767397711 fixing segment call for new state implementation in prompt_load 9 years ago
Ben Hilburn 817cdf98a1 Merge pull request #191 from rjorgenson/next
added check for nvm command before running
9 years ago
Ben Hilburn 4d25fd5dc3 Merge pull request #192 from Kayant/next
Add sub folder icon when in home subdirectories
9 years ago
Kayant cf921fb90c Add sub folder icon when in home subdirectories
Big thanks to @dritter for guidance, @rjorgenson for great explanation.
And @bhilburn for further guidance and encouragement.
See http://i.imgur.com/2Vncypo.png for a presentation of how it looks.
9 years ago
Robert Jorgenson 6f2f78b21f fixed conditional statement 9 years ago
Robert Jorgenson 446f46473b reworked nvm check
Now the prompt segment just returns without doing anything if nvm is not present.
9 years ago
Ben Hilburn 94419f54a5 Merge branch 'dritter-symlink_resolving_improvement' into next 9 years ago