Commit Graph
100 Commits
Author SHA1 Message Date
Ben Hilburn 3291b4d476 Merging ability to hide tags from VCS segment. 2016-07-12 20:28:01 -04:00
Ben Hilburn b893d66a46 Merge branch 'next' of https://github.com/Xetius/powerlevel9k into xetius-vcs-hide-tags 2016-07-12 20:17:25 -04:00
Ben Hilburn 4666bd49e6 Now printing a warning if $LANG is set incorrectly. 2016-07-07 13:51:26 -04:00
Ben Hilburn 1c9ec53d58 Merge branch 'master' into next 2016-07-07 13:04:13 -04:00
Ben Hilburn 81c55b4b74 Merge pull request #282 from Mrngilles/new_python_icon
Changed python icon to snake
2016-07-07 12:54:50 -04:00
Ben Hilburn 467742286f Merge pull request #275 from andjscott/prompt_dir_shortening
Handle shorting path when in the .git directory
2016-06-14 13:28:08 -04:00
Ben Hilburn 45ff1d1b51 Merge pull request #276 from andjscott/package_name
Only match first name in package.json
2016-06-13 22:12:55 -04:00
Ben Hilburn af825c7cf4 Merge pull request #261 from wadkar/pyenv
Add pyenv segment to show active non-system python version
2016-06-13 22:10:22 -04:00
Ben Hilburn cef8c65586 Merge pull request #268 from mateusmedeiros/hide-custom-segment-when-empty
Make prompt_custom not print the segment if empty
2016-05-27 11:55:04 -04:00
Ben Hilburn 41888bf2a9 Merge pull request #260 from thuandt/python-icon
PYTHON ICON for virtualenv prompt
2016-05-27 11:53:02 -04:00
Ben Hilburn 66ece86773 Merge pull request #266 from dritter/264_fix_script_location
Refactor location installation path code
2016-05-27 11:48:33 -04:00
Ben Hilburn 0b57ee3669 Merge pull request #256 from cbourgeois/next
Fix incorrect background jobs number
2016-05-03 21:59:07 -04:00
Ben Hilburn af7d952480 Merge pull request #252 from rawkode/feature/better-battery-core-improvements
Improvements to load prompt, now reporting warning and critical at 50…
2016-05-02 17:29:32 -04:00
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
Ben Hilburn 511bbcf124 Merge pull request #247 from orhanbalci/next
rust icon added to rust segment
2016-04-19 15:23:43 -04:00
Ben Hilburn fb1dae68e9 Merge branch 'vcs-tag-display' into next 2016-04-19 12:13:00 -04: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
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
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
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
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
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
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
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
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
Ben Hilburn 94c87a4d23 Reflect submodule status in VCS prompty by default. 2016-02-17 17:09:54 -08:00
Ben Hilburn 5af484bd6d README: Adding Travis-CI status to README 2016-02-17 15:51:17 -08:00
Ben Hilburn 64d81a2b36 Merge pull request #212 from dritter/unit_testing
Adding Unit Tests, supported  by Travis-CI
2016-02-17 15:39:55 -08:00
Ben Hilburn 2d196fa12f Merge pull request #211 from Falkor/feature/better_dirty_check
VCS dirty check even in subdirs
2016-02-09 10:18:03 -08:00
Ben Hilburn 1a05542901 Merge pull request #208 from dritter/fix_joining
Fix joining segments from #186
2016-02-06 11:52:55 -08:00
Ben Hilburn 9e191d4305 Pull PR #204 into next. Introduces new VCS state, untracked 2016-02-05 11:00:08 -08: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 d5ac1735da Merge pull request #207 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2016-02-05 13:56:29 -05: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
Ben Hilburn 65e9438210 Merge pull request #203 from dritter/beanstalk
Reworked the AWS-Beanstalk segment
2016-02-05 10:34:34 -05:00
Ben Hilburn 6072f1e56c Merge pull request #202 from dritter/join_conditional_segments
Allows the use of `_join` on conditional segments.
2016-02-05 10:33:12 -05:00
Ben Hilburn 472fb6f674 README: Arrghhhhh. Newlines in tables breaking things. 2016-01-22 16:12:20 -08:00
Ben Hilburn bd88fe9637 README: Documenting new background_jobs feature 2016-01-22 16:11:41 -08:00
Ben Hilburn f58da93481 README: Updating language about ZSH frameworks 2016-01-22 16:06:08 -08:00
Ben Hilburn 657a097ef0 Merge pull request #201 from Kayant/zsh-frameworks
Add more ZSH framework instructions
2016-01-21 19:02:01 -08:00
Ben Hilburn 8172425cd2 Merge pull request #200 from V1rgul/next
background_jobs segment : add number of jobs if >1
2016-01-21 18:59:37 -08:00
Ben Hilburn 67895cc5da README: Added a tl;dr 2016-01-17 10:04:27 -08:00
Ben Hilburn 24e7ee75fe Merge pull request #197 from dritter/changelog_additions
Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.
2016-01-17 10:01:15 -08:00
Ben Hilburn dc4871f1a0 README: Minor cleanups 2016-01-16 20:02:10 -08:00
Ben Hilburn 02cb0fd88f README: Turns out you can't linebreak in tables. 2016-01-16 19:59:39 -08:00
Ben Hilburn 8a3c16ae24 README: Trying out tables to describe variables. 2016-01-16 19:56:27 -08:00
Ben Hilburn 273bcaed55 Merge pull request #196 from rjorgenson/next
added space to end of RVM icon
2016-01-16 17:10:01 -08:00
Ben Hilburn bc1af0d733 Merge pull request #195 from dritter/minor_improvements
Minor improvements to README `dir` section
2016-01-16 16:52:14 -08:00
Ben Hilburn 76e020a81e Merge pull request #193 from rjorgenson/next
fixing segment call for new state implementation in prompt_load
2016-01-16 09:22:28 -08:00
Ben Hilburn 817cdf98a1 Merge pull request #191 from rjorgenson/next
added check for nvm command before running
2016-01-15 18:53:42 -08:00
Ben Hilburn 4d25fd5dc3 Merge pull request #192 from Kayant/next
Add sub folder icon when in home subdirectories
2016-01-15 18:50:36 -08:00
Ben Hilburn 94419f54a5 Merge branch 'dritter-symlink_resolving_improvement' into next 2016-01-14 13:13:44 -08:00
Ben Hilburn 88ed3c2378 Merge branch 'symlink_resolving_improvement' of https://github.com/dritter/powerlevel9k into dritter-symlink_resolving_improvement 2016-01-14 13:13:30 -08:00
Ben Hilburn 22ebb0f5f5 Merge branch 'thuandt-ruby-icon-patch' into next 2016-01-14 13:10:22 -08:00
Ben Hilburn 757002fd45 Merge branch 'ruby-icon-patch' of https://github.com/thuandt/powerlevel9k into thuandt-ruby-icon-patch 2016-01-14 13:10:12 -08:00
Ben Hilburn 0639e1132c Merge pull request #180 from dritter/3_0_changelog_additions
Missed changelog entries for v0.3.0
2016-01-11 15:37:57 -08:00
Ben Hilburn 642205a1a6 Merge pull request #177 from dritter/folder_icon_explanation
Added an explanation for the "home" and "folder" icons.
2016-01-07 13:51:36 -08:00
Ben Hilburn 52f221cb31 Merge pull request #179 from dritter/general_cleanup
Removed unnecessary spaceless codes from `fg` and `bg` vars.
2016-01-07 13:33:09 -08:00
Ben Hilburn c84da5e744 Merge pull request #178 from dritter/vcs_tag_whitespace
Removed whitespace before git tag
2016-01-07 13:28:00 -08:00
Ben Hilburn bb7fca653b README: Cleaning some things up. 2016-01-05 15:18:46 -08:00
Ben Hilburn 8dfca40eaf Cleaning up comments. Also fixes #135. 2016-01-05 13:56:07 -08:00
Ben Hilburn c39c8cbb99 Merge pull request #173 from dritter/consistent_visual_identifier
Better support for segments that are just icons.
2016-01-05 13:11:43 -08:00
Ben Hilburn 2945c93444 Merge pull request #174 from niklas-heer/shorten-fish_like
added fish-like shortening strategy
2016-01-05 13:07:01 -08:00
Ben Hilburn 4437e539e9 Merge pull request #165 from dritter/battery_visual_identifier
Adding ability for segments to be combined.
2015-12-22 12:40:53 -08:00
Ben Hilburn e8c477235c Merge pull request #164 from dritter/status_color_fix
Split up the `status` segment
2015-12-22 10:21:14 -08:00
Ben Hilburn 0059f9a066 Merge pull request #154 from dritter/hotfix/utility_function_loading
Try to fetch the utility function path automatically
2015-12-12 16:23:04 -08:00
Ben Hilburn df153db93b Merge pull request #157 from dritter/battery_rework
Performance improvement of battery segment
2015-12-12 16:21:14 -08:00
Ben Hilburn 424f47249d Merge pull request #160 from dritter/home_icon_fix
Adding Home / Folder icon for awesome font modes.
2015-12-01 13:27:42 -08:00
Ben Hilburn 3fea92369f Merge pull request #153 from Tritlo/custom_string
Adding a segment that can execute a custom command.
2015-11-24 15:27:07 -08:00
Ben Hilburn 08a3b49d73 Merge pull request #155 from dritter/hotfix/go_version_fix
Fix for the GO segment.
2015-11-24 15:23:03 -08:00
Ben Hilburn 91e9fb865c Merge pull request #156 from dritter/node_cleanup
Cleaning up the `node` segment.
2015-11-24 15:20:28 -08:00
Ben Hilburn 1eadf5ad76 Merge pull request #152 from Tritlo/battery_fix
Battery segment fix and enhancement.
2015-11-20 16:29:40 -08:00
Ben Hilburn 951a4956fc Merge pull request #150 from Tritlo/prompt_end
Add icon for end of left prompt.
2015-11-20 16:23:20 -08:00
Ben Hilburn e79a2ffff0 Merge pull request #149 from Tritlo/master
Now allowing the RPROMPT to be on a newline.
2015-11-18 10:54:21 -08:00
Ben Hilburn b83cfd7515 Merge pull request #143 from dritter/segment_deprecation_helpers
Added segment deprecation helper
2015-11-17 12:54:06 -08:00
Ben Hilburn 85fd338d36 Merge pull request #144 from dritter/changelog_additions
Added the new rust segment and the changes to the rvm-segment to changelog
2015-11-17 12:52:46 -08:00
Ben Hilburn 9b067ea29c Merge pull request #142 from dritter/rust_version
Added Rust version segment.
2015-11-16 09:10:58 -08:00
Ben Hilburn 77c31e17d1 Merge pull request #141 from dritter/improve_rvm_performance
Huge performance improvement if you use `rvm` segment.
2015-11-16 09:04:48 -08:00