Commit Graph
100 Commits
Author SHA1 Message Date
Ben Hilburn c5909e71ea Merge pull request #369 from rjorgenson/context_host_depth
Context host depth
2017-01-03 17:23:09 -05:00
Ben Hilburn c86b4009ce Merge pull request #366 from rjorgenson/next
migrated battery segment to use pmset on OSX over ioreg
2016-12-30 14:17:04 -05:00
Ben Hilburn 3a3238444d Merge pull request #360 from davidmpaz/icon_by_repo
Display different icons depending on remote type in VCS segment.
2016-12-21 10:22:13 -05:00
Ben Hilburn 5ea003bf5e Merge branch 'master' into next 2016-12-20 17:58:17 -05:00
Ben Hilburn 55b43d819d Merge pull request #348 from DeanF/master
Fixed an issue where full battery registers as disconnected
2016-12-20 17:51:59 -05:00
Ben Hilburn 52d95f9038 Merge pull request #362 from shibumi/detect-virt-next
Added segment for virtualization detection.
2016-12-20 17:51:02 -05:00
Ben Hilburn 7a49c9704d Merge pull request #347 from thomaspaulmann/swift
Add prompt for current installed swift version
2016-12-05 18:32:55 -05:00
Ben Hilburn ffade7bb6d Merge pull request #346 from dritter/configurable_path_separators
Configurable path separators
2016-12-05 18:30:47 -05:00
Ben Hilburn 1ff9da64d9 Merge pull request #343 from rouzbeh84/master
fixing some typos in the comments
2016-11-28 18:37:40 -05:00
Ben Hilburn afa256f5b3 Merge pull request #341 from rjorgenson/next
Fix #339
2016-11-28 18:36:20 -05:00
Ben Hilburn 352ad4d608 Merge branch 'master' into next 2016-10-27 11:00:18 -04:00
Ben Hilburn fd9c998f02 Merge pull request #333 from eviltak/dir-truncate-right-with-delim-len
Consider delimiter length while right truncating directories
2016-10-27 10:59:55 -04:00
Ben Hilburn b54abe48dc Merge pull request #332 from eviltak/show-ok-in-non-verbose-status
Show OK in non verbose status prompt
2016-10-27 10:57:12 -04:00
Ben Hilburn 11fcb5684b Merge branch 'master' into next 2016-10-26 11:17:47 -04:00
Ben Hilburn 3c92cf9748 Merge pull request #321 from Jack-Q/master
Fix load and ram indicator support for BSD
2016-10-26 11:17:31 -04:00
Ben Hilburn 3326353b10 Merge branch 'master' into next 2016-10-26 11:08:53 -04:00
Ben Hilburn 790230e1c7 Merge pull request #326 from mtraynham/fix_svn_detect_changes
Fix '+vi-svn-detect-changes:local:1: not valid in this context'
2016-10-26 09:49:33 -04:00
Ben Hilburn cdb2302359 Merge pull request #324 from bsidhipong/unicode-escape-fix
Changed \u and \U to properly reflect number of hex digits to follow.
2016-10-26 09:46:02 -04:00
Ben Hilburn 3f1f11a1f1 bugfix: typo in "POWERLEVEL9K" broke the VCS tag display 2016-09-26 13:54:43 -04:00
Ben Hilburn c4fdc8f708 Improved speed of prompt_vcs by 50%-66%. 2016-08-31 10:35:05 -04:00
Ben Hilburn 520eed1248 Removing zle-* overrides, appear fixed in new ZSH. 2016-08-30 21:19:14 -04:00
Ben Hilburn 02cc43ff09 Merge pull request #309 from krischer/conda-prompt-changes
Conda prompt speedup and configuration
2016-08-30 20:57:46 -04:00
Ben Hilburn 683ca10e36 vcs: adding detection of unstaged / staged for svn repos 2016-08-30 20:44:07 -04:00
Ben Hilburn 55f061c04d Enabling subversion support for the vcs segment. 2016-08-30 20:41:51 -04:00
Ben Hilburn 02820a9f3f Merge pull request #300 from andjscott/prompt_dir_shortening
Handle spaces in path when shortening
2016-08-30 17:40:31 -04:00
Ben Hilburn 9d172f58c2 Finally adding a license to powerlevel9k 2016-07-12 21:07:51 -04:00
Ben Hilburn 96731951be Merge branch 'noverbose-battery' of https://github.com/dnmiller/powerlevel9k into nonverbose-battery 2016-07-12 20:44:30 -04:00
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