Mateus "Doodad" Medeiros
89fdfa0148
Make prompt_custom not print the segment if empty
...
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.
2016-05-24 11:02:35 -03:00
Ben Hilburn
0b57ee3669
Merge pull request #256 from cbourgeois/next
...
Fix incorrect background jobs number
2016-05-03 21:59:07 -04:00
David McKay
61a0cee4f5
Using logical CPUs, as it's a fairer reflection of CPU load
2016-05-02 15:35:43 +01:00
Clement Bourgeois
1c17acb758
Fix incorrect background jobs number
2016-04-29 14:20:19 +02:00
David McKay
d2728f0dd1
Consolidated if statements and fixed OSX cpu cores command
2016-04-25 07:08:36 +01:00
David McKay
78b4ab0414
Improvements to load prompt, now reporting warning and critical at 50% and 70% cpu core utilisation
2016-04-22 12:24:30 +01:00
Jan Laermann
391b3327ee
Added anaconda segment.
...
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.
2016-04-19 21:49:57 +02:00
Ben Hilburn
511bbcf124
Merge pull request #247 from orhanbalci/next
...
rust icon added to rust segment
2016-04-19 15:23:43 -04:00
Dominik Ritter
7b2e995299
Fix truncation of changeset in detached tag mode
2016-04-17 18:03:31 +02:00
orhanbalci
72315fdc59
rust icon added
2016-04-16 23:46:32 +03:00
Ben Hilburn
0f4e3e7588
git-tagname: Now showing hash/branchname when sitting on a tag
2016-04-12 10:43:34 -04:00
Ben Hilburn
aec9d95295
Merge pull request #229 from alexlafroscia/add-package-name-shortening-strategy
...
Add shortening strategy based on package.json name
2016-04-11 15:16:37 -04:00
Dominik Ritter
104e774873
Fix configurability of actionformat color
2016-04-03 19:13:58 +02:00
Alex LaFroscia
4ca6938801
Apply max dir length to package name shortener
2016-03-22 13:14:10 -04:00
Ben Hilburn
2d3131fb8a
Merge pull request #230 from sabricot/docker_machine
...
Add a new segment for current active docker machine
2016-03-22 12:11:45 -04:00
Sudarshan Wadkar
7fcac16c5f
Combine two checks into one
2016-03-16 17:27:00 -04:00
Sudarshan Wadkar
f7b7ff21c9
Fix NVM prompt to return if not used
...
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".
2016-03-14 20:57:30 -04:00
sabricot
3c95feb0bd
Add a docker machine segment
2016-03-06 18:25:17 +01:00
Alex LaFroscia
daa7255e85
Add shortening strategy based on package.json name
2016-03-05 22:12:44 -05:00
Sudarshan Wadkar
415194941c
[WIP] Rebase to origin:next branch
2016-03-04 15:44:58 -05:00
Ben Hilburn
9d8041fc76
Fixed actionformat color coding
2016-03-03 13:58:42 -08:00
Ben Hilburn
cd5c2e7dcd
trying to debug color code that won't deref in vcs_states
2016-03-03 13:30:58 -08:00
Ben Hilburn
b3fae48893
Merge pull request #220 from dritter/rename_vcs_default_state
...
Rename vcs default state
2016-02-26 09:53:59 -05:00
Ben Hilburn
5d31763a8e
Merge pull request #219 from rmad17/nodeenv-support
...
Adding `nodeenv` segment.
2016-02-26 09:37:34 -05:00
Dominik Ritter
9ac79bd3aa
Rename VCS default state to clean
2016-02-26 15:33:04 +01:00
Ben Hilburn
2260b83c98
Merge pull request #214 from dritter/fix_vcs_foreground_color
...
Allowing VCS Foreground Color to be over-rideable.
2016-02-26 08:01:29 -05:00
Dominik Ritter
e9953710f7
Clean up states in VCS segment
2016-02-26 13:51:39 +01:00
rmad17
8d0f4c9e1d
Fixed name issue
2016-02-26 18:02:05 +05:30
rmad17
06dd26a0bd
Added nodeenv support
2016-02-26 16:33:19 +05:30
rmad17
e0603314d5
Nodeenv work
2016-02-26 15:32:22 +05:30
Ben Hilburn
e93d053035
Merge pull request #216 from natemccurdy/issues/215
...
Improve the rbenv prompt by using `version-name`
2016-02-20 15:28:44 -08:00
Nate McCurdy
01bdee42a2
Improve the rbenv prompt by using version-name
...
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
2016-02-19 14:56:09 -08:00
Dominik Ritter
a1ef6548d5
Fix dynamic coloring of VCS segment
...
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.
2016-02-18 18:27:32 +01:00
Dominik Ritter
7efc6e4187
Fix go test
...
If no GO is available, there should be no output.
2016-02-17 18:41:46 +01:00
Ben Hilburn
4bbff138fb
Merging @theminor's changes from PR #204
2016-02-05 10:59:33 -08:00
Ben Hilburn
4897c795fa
Merge branch 'master' into next
2016-02-05 10:57:56 -08:00
Ben Hilburn
dfd7ae1f1d
Merge pull request #205 from dritter/dir_delimiter
...
Change default dir truncation delimitor to ellipsis
2016-02-05 10:49:09 -05:00
Ben Hilburn
4f4a15de82
Merge pull request #198 from dritter/vcs_customizable
...
VCS-hooks customizable
2016-02-05 10:40:20 -05:00
Ben Hilburn
25bf6d60a0
Merge pull request #181 from dritter/split_up_ram_segment
...
Split up `ram` segment into `ram` and `swap`.
2016-02-05 10:37:28 -05:00
Dominik Ritter
54254600d1
Change default dir truncation delimitor to ellipsis
2016-02-03 22:35:14 +01:00
John Minor
d7c26513c8
Add "_UNTRACKED" option for _VCS to change colors - default yellow
2016-01-27 22:52:48 +00:00
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
2016-01-23 01:45:39 +01:00
Dominik Ritter
cd78c66997
First try: Now joined segments are promoted to "full" segments, if their
...
predecessor was conditional and had no output.
2016-01-23 01:45:39 +01:00
Dominik Ritter
930ae170a4
Made the VCS-hooks customizable.
2016-01-23 01:44:22 +01:00
Dominik Ritter
eba3a3ca95
Reworked the AWS Elastic Beanstalk segment.
2016-01-23 01:35:53 +01:00
James Bowman
af119c9406
Adding command prompt for AWS Elastic Beanstalk environment name.
2016-01-23 01:34:01 +01:00
Dominik Ritter
6aadf76397
Split up ram segment into ram and swap.
2016-01-23 01:27:05 +01:00
Dominik Ritter
c379cf2657
Syntax fix.
2016-01-22 19:52:00 +01:00
v1rgul
29b346930b
fix wc glitch on OSX
2016-01-22 01:56:43 +01:00
v1rgul
11d00ce713
background_jobs: show number if verbose
2016-01-18 05:11:05 +01:00
