Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add option for non-verbose battery | Dan Miller | 2016-06-17 | 1 | -0/+2 |
| | |||||
* | Make prompt_custom not print the segment if empty | Mateus "Doodad" Medeiros | 2016-05-24 | 1 | -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 #256 from cbourgeois/next | Ben Hilburn | 2016-05-04 | 1 | -0/+4 |
|\ | | | | | Fix incorrect background jobs number | ||||
| * | Fix incorrect background jobs number | Clement Bourgeois | 2016-04-29 | 1 | -0/+4 |
| | | |||||
* | | Using logical CPUs, as it's a fairer reflection of CPU load | David McKay | 2016-05-02 | 1 | -1/+1 |
| | | |||||
* | | Consolidated if statements and fixed OSX cpu cores command | David McKay | 2016-04-25 | 1 | -6/+2 |
| | | |||||
* | | Improvements to load prompt, now reporting warning and critical at 50% and ↵ | David McKay | 2016-04-22 | 1 | -6/+15 |
|/ | | | | 70% cpu core utilisation | ||||
* | Added anaconda segment. | Jan Laermann | 2016-04-19 | 1 | -0/+12 |
| | | | | | | | | 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/next | Ben Hilburn | 2016-04-19 | 1 | -1/+1 |
|\ | | | | | rust icon added to rust segment | ||||
| * | rust icon added | orhanbalci | 2016-04-16 | 1 | -1/+1 |
| | | |||||
* | | Fix truncation of changeset in detached tag mode | Dominik Ritter | 2016-04-17 | 1 | -7/+8 |
| | | |||||
* | | git-tagname: Now showing hash/branchname when sitting on a tag | Ben Hilburn | 2016-04-12 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #229 from alexlafroscia/add-package-name-shortening-strategy | Ben Hilburn | 2016-04-11 | 1 | -1/+37 |
|\ | | | | | Add shortening strategy based on package.json name | ||||
| * | Apply max dir length to package name shortener | Alex LaFroscia | 2016-03-22 | 1 | -3/+3 |
| | | |||||
| * | Add shortening strategy based on package.json name | Alex LaFroscia | 2016-03-06 | 1 | -1/+37 |
| | | |||||
* | | Fix configurability of actionformat color | Dominik Ritter | 2016-04-03 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #230 from sabricot/docker_machine | Ben Hilburn | 2016-03-22 | 1 | -1/+10 |
|\ \ | | | | | | | Add a new segment for current active docker machine | ||||
| * | | Add a docker machine segment | sabricot | 2016-03-06 | 1 | -1/+10 |
| |/ | |||||
* | | Combine two checks into one | Sudarshan Wadkar | 2016-03-17 | 1 | -2/+1 |
| | | |||||
* | | Fix NVM prompt to return if not used | Sudarshan Wadkar | 2016-03-15 | 1 | -0/+1 |
|/ | | | | | | | | | | This commit changes nvm prompt setup to return immediately if no node version is installed/available. Currently, prompt complains for lack of global node version. Specifically, if you install nvm (from brew or manually) and do not have global node installed (or set), then the prompt should not set or show anything. This commit ensures this by immediately returning if `nvm current` returns "none". | ||||
* | [WIP] Rebase to origin:next branch | Sudarshan Wadkar | 2016-03-04 | 1 | -0/+11 |
| | |||||
* | Fixed actionformat color coding | Ben Hilburn | 2016-03-04 | 1 | -2/+1 |
| | |||||
* | trying to debug color code that won't deref in `vcs_states` | Ben Hilburn | 2016-03-04 | 1 | -3/+5 |
| | |||||
* | Merge pull request #220 from dritter/rename_vcs_default_state | Ben Hilburn | 2016-02-26 | 1 | -3/+3 |
|\ | | | | | Rename vcs default state | ||||
| * | Rename VCS default state to `clean` | Dominik Ritter | 2016-02-26 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #219 from rmad17/nodeenv-support | Ben Hilburn | 2016-02-26 | 1 | -0/+9 |
|\ \ | |/ |/| | Adding `nodeenv` segment. | ||||
| * | Fixed name issue | rmad17 | 2016-02-26 | 1 | -3/+3 |
| | | |||||
| * | Added nodeenv support | rmad17 | 2016-02-26 | 1 | -16/+8 |
| | | |||||
| * | Nodeenv work | rmad17 | 2016-02-26 | 1 | -0/+17 |
| | | |||||
* | | Merge pull request #214 from dritter/fix_vcs_foreground_color | Ben Hilburn | 2016-02-26 | 1 | -12/+17 |
|\ \ | | | | | | | Allowing VCS Foreground Color to be over-rideable. | ||||
| * | | Clean up states in VCS segment | Dominik Ritter | 2016-02-26 | 1 | -5/+13 |
| | | | |||||
| * | | Fix dynamic coloring of VCS segment | Dominik Ritter | 2016-02-18 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | The VCS segment had a lot of own color definitions. Now they are all gone, so that the only color definitions are when the segment gets printed. | ||||
* | | | Merge pull request #216 from natemccurdy/issues/215 | Ben Hilburn | 2016-02-21 | 1 | -2/+10 |
|\ \ \ | |/ / |/| | | Improve the rbenv prompt by using `version-name` | ||||
| * | | Improve the rbenv prompt by using `version-name` | Nate McCurdy | 2016-02-20 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this, the rbenv prompt only showed something if the $RBENV_VERSION environment variable was set. This was not a complete solution because rbenv can be configured locally, per directory, with dotfiles. When using dotfiles, the $RBENV_VERSION variables is not set. This fixes the issue by taking the output of the `rbenv version-name` command which shows the real rbenv version being used based on any of the 4 ways to change rbenv as shown here: https://github.com/rbenv/rbenv#choosing-the-ruby-version If the current version of Ruby being used is the same as the global Ruby, nothing is shown. This commit also adds documentation to the README that describes the prompt. Fixes issue #215 | ||||
* | | | Fix go test | Dominik Ritter | 2016-02-17 | 1 | -1/+1 |
|/ / | | | | | | | If no GO is available, there should be no output. | ||||
* | | Merging @theminor's changes from PR #204 | Ben Hilburn | 2016-02-05 | 1 | -2/+8 |
|\ \ | |||||
| * | | Add "_UNTRACKED" option for _VCS to change colors - default yellow | John Minor | 2016-01-28 | 1 | -2/+8 |
| | | | |||||
* | | | Merge branch 'master' into next | Ben Hilburn | 2016-02-05 | 1 | -0/+9 |
|\ \ \ | | |/ | |/| | |||||
| * | | Reworked the AWS Elastic Beanstalk segment. | Dominik Ritter | 2016-01-23 | 1 | -3/+4 |
| | | | |||||
| * | | Adding command prompt for AWS Elastic Beanstalk environment name. | James Bowman | 2016-01-23 | 1 | -0/+8 |
| |/ | |||||
* | | Merge pull request #205 from dritter/dir_delimiter | Ben Hilburn | 2016-02-05 | 1 | -1/+1 |
|\ \ | | | | | | | Change default dir truncation delimitor to ellipsis | ||||
| * | | Change default dir truncation delimitor to ellipsis | Dominik Ritter | 2016-02-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #198 from dritter/vcs_customizable | Ben Hilburn | 2016-02-05 | 1 | -2/+4 |
|\ \ | | | | | | | VCS-hooks customizable | ||||
| * | | Made the VCS-hooks customizable. | Dominik Ritter | 2016-01-23 | 1 | -2/+4 |
| |/ | |||||
* | | Merge pull request #181 from dritter/split_up_ram_segment | Ben Hilburn | 2016-02-05 | 1 | -39/+35 |
|\ \ | | | | | | | Split up `ram` segment into `ram` and `swap`. | ||||
| * | | Split up `ram` segment into `ram` and `swap`. | Dominik Ritter | 2016-01-23 | 1 | -39/+35 |
| |/ | |||||
* | | Joining conditional segments now work as expected. If between the last | Dominik Ritter | 2016-01-23 | 1 | -44/+33 |
| | | | | | | | | | | | | printed segment is a full but conditional segment, the joined one gets promoted. This fixes #186 | ||||
* | | First try: Now joined segments are promoted to "full" segments, if their | Dominik Ritter | 2016-01-23 | 1 | -4/+30 |
|/ | | | | predecessor was conditional and had no output. | ||||
* | Syntax fix. | Dominik Ritter | 2016-01-22 | 1 | -1/+1 |
| | |||||
* | fix wc glitch on OSX | v1rgul | 2016-01-22 | 1 | -1/+1 |
| |