Commit graph

1290 commits

Author SHA1 Message Date
Ben Hilburn
92edb26a78 Making anaconda list item a link to full description. 2016-04-20 11:43:57 -04:00
Ben Hilburn
08eef3d433 Merge pull request #249 from jaermanx9/anaconda-segment
Add anaconda segment.
2016-04-20 11:42:33 -04: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
orhanbalci
b8087ba7f9 Merge branch 'next' of https://github.com/orhanbalci/powerlevel9k into next 2016-04-19 22:09:07 +03:00
orhanbalci
67dce19024 whitespace fix 2016-04-19 22:08:11 +03:00
orhanbalci
0f7b525173 add rust icon information to README 2016-04-19 22:07:29 +03:00
Ben Hilburn
fb1dae68e9 Merge branch 'vcs-tag-display' into next 2016-04-19 12:13:00 -04:00
orhanbalci
c991553fb2 empty rust icon for patched mode 2016-04-17 21:51:34 +03: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
a09eda6774 Fixing comments in vi-git
-tagname
2016-04-12 10:54:10 -04: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
6fde7bf3fd git-tagname: reducing conditionals in logic 2016-04-12 10:42:34 -04:00
Ben Hilburn
f060a90c58 Merge branch 'nmaggioni-next' into vcs-tag-display 2016-04-12 08:53:51 -04:00
Ben Hilburn
3ee1f419c7 Merge branch 'next' of https://github.com/nmaggioni/powerlevel9k into nmaggioni-next 2016-04-12 08:53:25 -04:00
Niccolò Maggioni
14e213bd68
Weird conditions handling
Become a programmer, they said. It'll be fun, they said.
2016-04-11 23:02:58 +02:00
Niccolò Maggioni
ce16b087c6
Avoid tag/branch duplication if same value 2016-04-11 21:37:28 +02:00
Ben Hilburn
154181ffc2 Catching up CHANGELOG with new segments. 2016-04-11 15:30:09 -04:00
Ben Hilburn
164c6bd162 Update CHANGELOG about new package.json shortening strategy 2016-04-11 15:27:17 -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
Ben Hilburn
b6e8e20b65 Merge pull request #242 from dritter/fix_actionformat_color
Fix configurability of actionformat color
2016-04-11 15:10:17 -04:00
Dominik Ritter
104e774873 Fix configurability of actionformat color 2016-04-03 19:13:58 +02:00
Niccolò Maggioni
1ab41d9a6c
Better DETACHED_HEAD detection 2016-03-25 10:51:33 +01:00
Niccolò Maggioni
4fdf5df258
Documentation 2016-03-22 18:24:34 +01:00
Alex LaFroscia
4ca6938801 Apply max dir length to package name shortener 2016-03-22 13:14:10 -04:00
Niccolò Maggioni
89fefbdf6e
DETACHED_HEAD handling 2016-03-22 17:51:01 +01:00
Niccolò Maggioni
b46a96a7ce
Git tag not replacing branch 2016-03-22 17:29:34 +01: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
Ben Hilburn
81706dfe8d Merge pull request #233 from wadkar/nvm_return_if_none
Fix NVM prompt to return if not used
2016-03-22 12:10:33 -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
8feee5d4cc Fix typo about docker in README 2016-03-06 18:32:07 +01: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
Ben Hilburn
d0e9baf453 readme: more touchup to the segment list 2016-03-05 16:09:46 -05:00
Ben Hilburn
8e499946b2 readme: add horizontal bar 2016-03-05 16:08:14 -05:00
Ben Hilburn
b305b1ccd2 readme: code-as-links transition in segment list 2016-03-05 16:07:03 -05:00
Ben Hilburn
4e28720021 readme: testing code-as-link in MD code 2016-03-05 16:02:51 -05:00
Ben Hilburn
c30a13e467 readme: re-organizing the segment list 2016-03-05 15:48:44 -05:00
Ben Hilburn
38b4d52e90 Merge pull request #228 from wadkar/next_chruby_prompt
Add chruby prompt segment.
2016-03-05 15:36:57 -05:00
Sudarshan Wadkar
88fd11a865 Update README.md with chruby prompt info 2016-03-04 16:02:01 -05:00
Sudarshan Wadkar
415194941c [WIP] Rebase to origin:next branch 2016-03-04 15:44:58 -05:00
Ben Hilburn
4f0c3ffdf8 Fixing #217, also making the actionformats color configurable in VCS segment. 2016-03-03 13:59:11 -08: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
d6902db6ef Merge branch 'master' into next. Fixes Symfony typo in README. 2016-03-03 05:20:12 -08:00
Ben Hilburn
2630526df8 Merge pull request #223 from B-Galati/patch-1
Fix typo about Symfony2 in README
2016-03-02 15:25:29 -05:00
Benoit GALATI
ded682420b Fix typo about Symfony2 in README 2016-03-02 17:14:34 +01:00
Ben Hilburn
b81084100f Merge pull request #221 from dritter/fix_vcs_test
Fix VCS Travis Test for git version
2016-02-26 16:21:11 -05:00