Commit Graph

334 Commits

Author SHA1 Message Date
Mertcan Mermerkaya
4271bc6c5e Use "nvm current" to display node version
This way the user can differentiate between system and nvm node versions, similar to the virtualenv segment.
2015-11-21 19:20:50 +02:00
Viktor (Icon) VAD
bade13dfd3 fix test condition 2015-11-16 14:10:05 +00:00
Viktor (Icon) VAD
5cbe050452 adding env switch to turn hg on/off 2015-11-12 10:40:22 +00:00
Viktor (Icon) VAD
73325d22f1 Rbenv gemsets 2015-11-09 12:02:31 +00:00
Caio Gondim
765b735de4 Merge pull request #88 from dbkaplun/prompt-cleanup
DRY $PROMPT
2015-11-07 14:05:52 +01:00
Caio Gondim
933be00808 Merge pull request #89 from Killmax/patch-1
Forces time to respect $BULLETTRAIN_TIME_12HR flag regardless of localization
2015-11-02 07:36:30 -03:00
Maxime Bruguet
4e6b4e9b3f Update $BULLETTRAIN_TIME_12HR
change the "%X" in prompt_time() to "%T", because %X is based on local time so even if  $BULLETTRAIN_TIME_12HR is false, the time would be in 12hr format because of the local.
The %T forces it in 24hr format  whatever your zone is.
2015-10-29 14:56:43 +01:00
Dan Kaplun
fee3d173c6 DRY $PROMPT 2015-10-26 16:43:42 -04:00
Caio Gondim
4cddc84bee Merge pull request #85 from dbkaplun/patch-1
Move path before dev-specific segments; dev segments closer to git
2015-10-17 15:11:50 +02:00
Dan Kaplun
a0af64ea34 Move dev environment-specific segments after path 2015-10-16 15:46:34 -04:00
Caio Gondim
d790578181 Merge branch 'gregf-fix_whitespace'
* gregf-fix_whitespace:
  Add new BULLETTRAIN_PROMPT_ADD_NEWLINE as a option
  Stop printing a blank line before every prompt
2015-10-14 23:38:41 +02:00
Caio Gondim
20611a74d2 Updates contributors section on README 2015-10-13 00:00:02 +02:00
Caio Gondim
79d1cf73ed Merge branch 'vadviktor-vadviktor-patch-pyenv'
* vadviktor-vadviktor-patch-pyenv:
  Merge remote-tracking branch 'origin/master' into vadviktor-patch-pyenv
  Adding Pyenv support to Python virtualenv as "fallback"
2015-10-12 23:57:16 +02:00
Caio Gondim
3702714423 Merge pull request #81 from contradictioned/fixCompletionCharacterDuplication
Properly escape UTF-8 characters
2015-10-08 00:39:50 +02:00
Caio Gondim
cd224a0da7 Merge pull request #82 from einfallstoll/patch-1
Add instructions on README for custom folder on oh-my-zsh
2015-10-07 00:38:10 +02:00
Fabio Poloni
7007542885 oh-my-zsh installation: use custom folder 2015-10-05 07:34:44 +02:00
Manuel Hoffmann
268ce32d69 I took a look at this answer http://unix.stackexchange.com/a/90876
and thus added the %{%}-delimiters around the `prompt_line_sep` whitespace.
Works for me and fixes #80
2015-10-04 17:24:47 +02:00
Caio Gondim
fc426bad45 Updates go prefix on README 2015-09-30 00:28:31 +02:00
Caio Gondim
ccadea1dd4 Fix bug on getting version number on go segment
It is common for users to have grep aliased to `grep --colour='always`.
This fix sets grep on getting the go version to `never`.
2015-09-30 00:22:05 +02:00
Caio Gondim
e79f9ff10c Changes go segment prefix 2015-09-30 00:21:44 +02:00
Greg Fitzgerald
dc152b5471 Add detection for glide.yaml 2015-09-29 23:46:56 +02:00
Greg Fitzgerald
4a07c82824 Fix a couple issues with the go prompt 2015-09-29 23:46:56 +02:00
Greg Fitzgerald
a6c0510cc2 Add Go version to prompt, only displayed when in a go source tree 2015-09-29 23:46:56 +02:00
Caio Gondim
fd544cbb7a Adds space between bullettrain and $ if BULLETTRAIN_PROMPT_SEPARATE_LINE == false 2015-09-28 13:48:58 +02:00
Nicholas
7b677b4a4e Fix unmatched quote 2015-09-27 13:16:25 -04:00
Caio Gondim
ce55c1432d Fix BULLETTRAIN_PROMPT_SEPARATE_LINE name and puts a whitespace before $ 2015-09-25 11:52:31 +02:00
Greg Fitzgerald
c897e75414 Merge branch 'master' of github.com:caiogondim/bullet-train-oh-my-zsh-theme into fix_whitespace 2015-09-24 16:22:37 -04:00
Michael Cornell
1c4066bd6f Merge remote-tracking branch 'upstream/master' 2015-09-24 16:14:50 -04:00
Caio Gondim
c3a702363d Merge pull request #73 from gregf/fix_copyright
Update copyright year
2015-09-24 22:14:28 +02:00
Michael Cornell
161d21a27d update readme to pass travis CI, tacked on my name 2015-09-24 22:10:38 +02:00
Michael Cornell
6306de05bb line sep responds to changes after source 2015-09-24 11:43:29 -04:00
Greg Fitzgerald
9d622acc61 Fix copyright year 2015-09-24 10:18:37 -04:00
Greg Fitzgerald
14f58f279a Add new BULLETTRAIN_PROMPT_ADD_NEWLINE as a option 2015-09-24 10:06:45 -04:00
Viktor (Icon) VAD
fbbd93f8a3 Merge remote-tracking branch 'origin/master' into vadviktor-patch-pyenv 2015-09-24 10:06:55 +01:00
Greg Fitzgerald
3283a92bf9 Stop printing a blank line before every prompt 2015-09-23 17:46:54 -04:00
Caio Gondim
52b43504db Updates contributors section on README 2015-09-23 22:13:12 +02:00
Caio Gondim
86ce85b56b Renames BULLETTRAIN_PROMPT_SEP_LINE to BULLETTRAIN_PROMPT_SEPARATE_LINE 2015-09-23 22:11:05 +02:00
Caio Gondim
2c33e04196 Merge pull request #62 from gregf/sep_line
Add a new option to keep the prompt in two lines or one
2015-09-23 22:06:28 +02:00
Caio Gondim
3578fcd009 Merge pull request #61 from gregf/cmd
Use command -v instead of which
2015-09-22 14:16:15 +02:00
Caio Gondim
85805e52b8 Merge pull request #60 from gregf/chruby
Add chruby support
2015-09-22 14:15:59 +02:00
Caio Gondim
7f8753dac2 Merge pull request #64 from gregf/upgrade_travis
Upgrade to new travis-ci containers
2015-09-21 06:37:08 +02:00
Caio Gondim
bcca94c831 Merge pull request #67 from gregf/fixifs
Add missing semicolons in if statements
2015-09-21 06:31:53 +02:00
Greg Fitzgerald
a9f61184d0 Add missing semicolons in if statements 2015-09-20 18:03:15 -04:00
Viktor (Icon) VAD
3bfb593250 Adding Pyenv support to Python virtualenv as "fallback" 2015-09-20 10:39:33 +01:00
Greg Fitzgerald
63270ffc22 Upgrade to new travis-ci containers 2015-09-19 23:10:36 -04:00
Greg Fitzgerald
8b6c42d964 Update readme for BULLETTRAIN_PROMPT_SEP_LINE 2015-09-19 21:01:47 -04:00
Greg Fitzgerald
05f78e0384 Add a new option to keep the prompt in two lines or one 2015-09-19 20:58:23 -04:00
Greg Fitzgerald
3fbbce3bf8 Fixup documentation for chruby 2015-09-19 15:07:42 -04:00
Greg Fitzgerald
f057715a30 Use command -v instead of which.
https://unix.stackexchange.com/questions/85249/why-not-use-which-what-to-use-then
2015-09-19 15:03:44 -04:00
Greg Fitzgerald
65581ad4ea Add chruby support 2015-09-19 14:53:02 -04:00