Commit Graph

929 Commits (8f2fae5a38d6c43b8e18867c1732ffe3b0f1ef02)

Author SHA1 Message Date
romkatv 968e1a618c add caching to speed up prompt generation 6 years ago
Dominik Ritter dcd7718c62
Merge pull request #1149 from dritter/HaoZeke-fix-RVM
Fix RVM
6 years ago
Dominik Ritter 06151eeba9 Merge remote-tracking branch 'ben/master' into HEAD 6 years ago
Dominik Ritter 40e04e053c Parse IPs properly
This is done if we want to show a public IP, internal IP, or a VPN.
In the VPN case, what we actually want is to display an indicator
that a VPN is active, instead of the VPN IP itself. We parse the
IP here anyway, because we want to save some specific code there.
6 years ago
Dominik Ritter 22f6495005
Merge pull request #1151 from Wuestengecko/bugfix-1150
[Bugfix] Only abbreviate $HOME at the beginning of cwd
6 years ago
Dominik Ritter 08798d12ad
Merge pull request #1147 from dritter/fix_newlines_in_zsh57
Fix newlines in ZSH 5.7
6 years ago
Wuestengecko 8f60309386
Only abbreviate $HOME at the beginning of cwd
Fixes #1150
6 years ago
Dominik Ritter 5c7d1009de
Merge pull request #1148 from dritter/remove_nodeenv_disable_prompt
Remove checking for NODEENV_DISABLE_PROMPT
6 years ago
Dominik Ritter bd340d4a88
Merge pull request #966 from ytang/fix-rprompt-icons-cut-off
[Bugfix] Fix icons cut off in RPROMPT segments
6 years ago
Dominik Ritter 2f05bbbb47 Remove checking for NODEENV_DISABLE_PROMPT
This variable is none of our buisness.
6 years ago
Dominik Ritter 020287dd75 Fix Segment endings if followed by newline 6 years ago
Ythildir 1a1572669c Fix white arrow on newline 6 years ago
HaoZeke 58f70e57e6 rvm: Use @natemccurdy review suggestions 6 years ago
HaoZeke a41f2e81ae rvm: Only show version and patchset 6 years ago
HaoZeke 1da5fd2ed7 Revert "Huge performance improvement if you use `rvm` segment."
This reverts commit 643555a30c.

This does allow rvm to be detected even without using the depreciated
gemset settings.
6 years ago
Dominik Ritter 081000c49e Replace call to basename with ZSH internals #1128 6 years ago
Dominik Ritter 747b94b1b6 Match VPN interface fuzzy on Linux 6 years ago
Dominik Ritter bde4337992 Match VPN Interface fuzzy 6 years ago
Dominik Ritter 54a985cb11 Simplify code that checks if a VPN is running 6 years ago
Dominik Ritter 480ade162b Improve tests 6 years ago
Dominik Ritter da50151d24 Fix regular expression 6 years ago
Dominik Ritter 9b73c8bd9c Add tests 6 years ago
Ymage ee7416962d Remove $VIRTUAL_ENV_DISABLE_PROMPT testing 6 years ago
Ymage 12e9724860 Merge with @dritter proposal 6 years ago
Ymage a8db401808 [Bugfix] virtualenv prompt displaying
Fix #1127
6 years ago
Shini31 a8fa0332d2 Use ip command for VPN segment - fix #1125 6 years ago
Josselin Auguste 5c412b4d42 Update VIRTUAL_ENV_DISABLE_PROMPT value
Following prezto update
6 years ago
Dominik Ritter 5abac53698
Merge pull request #1037 from dritter/fix_vpn_ip_segment
Fix vpn_ip segment
6 years ago
Dominik Ritter 993de7aef9 Fix vpn_ip segment 6 years ago
Dominik Ritter dc731f10e6 Make truncate with package name work without setting shorten length 6 years ago
Yang Tang a98fa7ff54
Merge branch 'master' into fix-rprompt-icons-cut-off 6 years ago
Ben Hilburn 572b7a1299 Removing `rbenv` from default LPROMPT list. 6 years ago
Yang Tang 877ef61773 Fix icons cut off in RPROMPT segments 6 years ago
Dominik Ritter 2700cb46f5 Merge remote-tracking branch 'docwhat/pr/sudo-check' into prepare_066 6 years ago
Christian Höltje 3fb0383956 Use SUDO_COMMAND to check for sudo
`sudo -n true` only checks that we _could_ use `sudo`, not if we are in
a sudo session.

closes #852
6 years ago
Dominik Ritter 6daef84c60 Merge branch 'fix_colors' into prepare_066 6 years ago
Dominik Ritter 52ce9930bb Fix foreground colors in right prompt segments 6 years ago
Dominik Ritter e0630d7573 Merge branch 'fix_colors' into prepare_066 6 years ago
Dominik Ritter 27fe2c6571 Make use of helper function in left_end_segment 6 years ago
Dominik Ritter 6f5827009f Fix colors for visual identifiers
Make the visual identifier color use numerical color codes as well. This
way colors like "purple3" work as visual identifier color.
6 years ago
Dominik Ritter c7e543ff23 Merge branch 'fix_colors' into prepare_066 6 years ago
Dominik Ritter 93324c0600 Improve naming of variables
As a side effect this should improve the performance slightly, as we get
the fore- and background color codes as early as possible, and store the
result, so that we don't have to recalculate the color code all over.
6 years ago
Dominik Ritter 02506893a9 Remove duplicate variable 6 years ago
Dominik Ritter bf9082bea9 Fix bug so that the segment separator of left middle has the right color
In short: the current background color was the unfiltered color and is
used to print the next segment separator. If the user set a color like
"purple3" that would result in a white segment separator as Terminal
Emulators do not understand the color "purple3".
6 years ago
Dominik Ritter ebbdb3c1c0 Make purpose clear of backgroundColor and foregroundColor functions
The functions just start the colors, they do not end them. It seems
too much to have a function that terminates a color.
6 years ago
Dominik Ritter 3b8f0abdb2 Merge remote-tracking branch 'docwhat/pr/sudo-check' into prepare_066 6 years ago
Dominik Ritter aca20ae463 Merge branch 'add_tests' into prepare_066 6 years ago
Christian Höltje 7f6ac8dbac Use SUDO_COMMAND to check for sudo
`sudo -n true` only checks that we _could_ use `sudo`, not if we are in
a sudo session.

closes #852
7 years ago
Ben Hilburn 571a859413
Merge pull request #912 from brandon14/laravel_pormpt_fix
[Bugfix] Fix error in laravel_version when artisan is not present
7 years ago
Brandon Clothier 9739c68894
Missed a parenthesis here. 7 years ago
Ben Hilburn e70ce43809
Merge pull request #915 from onaforeignshore/fix_truncate_to_unique
[Bugfix] Fix for "truncate_to_unique" strategy
7 years ago
Dominik Ritter 7a7b4ee13a Merge remote-tracking branch 'ben/master' into add_tests 7 years ago
Dominik Ritter 671f826a40 Set background color of vi_mode segment to white in insert mode 7 years ago
Dominik Ritter 7a3aa9d3d1 Change swap segment to take an optional root prefix for testability 7 years ago
Dominik Ritter e99c7549fb Change ram segment to take an optional root prefix for testability 7 years ago
Dominik Ritter 04168cc5c0 Change load segment to accept an optional root prefix for testability 7 years ago
Dominik Ritter 43272410c9 Change ip segment so that the tests can be executed on OSX as well
Change regular expressions to a more compatible format.
7 years ago
Dominik Ritter b61d021abd Simplify detect_virt segment 7 years ago
Dominik Ritter 629d52a7d5 Add visual identifier to custom segments 7 years ago
Christo Kotze dd25b5db12 truncate_to_unique - simplified the code 7 years ago
Brandon Clothier ef1f29a5cb
Drop grep usage in favor of zsh regex test 7 years ago
Christo Kotze 38c8519f10 Changed getUniqueHomeFolder to use $HOME
It is a Posix specification that $HOME be set, so we can use that.
See http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
7 years ago
Alexara Wu cff11d2e82
Fix `pyenv` segment 7 years ago
Christo Kotze 29c85be8d9 Fix for "truncate_to_unique" strategy 7 years ago
Dominik Ritter 802af322ff Add tests for battery segment
Additionally
- Add a fourth parameter to prompt_battery for better testability. This
  parameter is the root prefix, so we can use our own test batteries.
7 years ago
Ben Hilburn 22a761208d
Merge pull request #900 from AlexaraWu/patch/pyenv
Fix `pyenv` segment
7 years ago
Brandon Clothier 48b264f564
Fix error in laravel_version when artisan is not present 7 years ago
Alexara Wu 45fe401dc2
Improve conditions in `rbenv` & `pyenv` 7 years ago
Alexara Wu 9f09547ad1
Improve `rbenv` as well 7 years ago
Alexara Wu 25e2064f0e
Improve command check 7 years ago
Ben Hilburn a7b3f310d3
Merge pull request #905 from robobenklein/robobenklein/defined-variable-performance-hotfix
[performance] Defined function 2-20 times speedup
7 years ago
Dominik Ritter 8cd39beaad FIx status segment 7 years ago
Ben Klein 002f7b81a1
Replace [[-v with `defined`
For zsh 5.1 compatibility.
7 years ago
Alexara Wu fc39d9d6b8
Fix `pyenv` segment 7 years ago
Dominik Ritter d031b3e035 Fix kubernetes segment 7 years ago
Ben Hilburn 579887d294 Merge branch 'master' into next 7 years ago
Kevin McBride 534ec66466
kubecontext: fix context, namespace comparison 7 years ago
Dominik Ritter bda3171237 Fix java_version segment 7 years ago
Dominik Ritter 08a3801c81 Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065 7 years ago
Dominik Ritter d09a46f9e0 Mute errors when asking for java version 7 years ago
Tim Smith 3989834bfe Hide one-space indent at right margin
ZSH displays the right prompt indented one space from the right
margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that
makes display problems very likely and I don't recommend it. But
all is not lost.

The %E prompt format does continue the current background color
through that last indent space. So it can *look* like our prompt
goes right up to the margin, if:
1) We remove the trailing space from the last segment, and
2) We add %E before clearing the background color
7 years ago
Dominik Ritter 51b53cd4b5
Fix `rbenv` segment after merge 7 years ago
Dominik Ritter dc21b97335 Fix travis build 7 years ago
Dominik Ritter a2d8cccd09 Add a Laravel version segment 7 years ago
Dominik Ritter d9d9fb9b6b Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065
Conflicts were:
- test/segments/command_execution_time.spec and
test/segments/go_version.spec: All conflicts come from renaming color
names on next (#703) and adding a whitespace to the Visual Identifier
(#854) on master.
7 years ago
Dominik Ritter 40219759bb Merge branch 'fix_rprompt_newline' into staging_065 7 years ago
Dominik Ritter 47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 7 years ago
Dominik Ritter db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065 7 years ago
Dominik Ritter 3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065 7 years ago
Dominik Ritter d3500625ca Merge remote-tracking branch 'TheDan64/master' into staging_065
Conflicts were:
- test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826
removes grep from parsing the rust version on next; #703 changes color
names.
7 years ago
Dominik Ritter e763fa14b0 Merge remote-tracking branch 'chhschou/master' into staging_065
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
7 years ago
Dominik Ritter 4c2f58bdbd Merge remote-tracking branch 'VanRoy/master' into staging_065
Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
7 years ago
Dominik Ritter 55473c450a Merge branch 'master' into staging_065
Conflicts were:
- README.md: Two commits targeted the brightness table. #781 from
14. April 2018 on master and #684 from 05. December 2017 on next.
- powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both
achieve the same thing: To show the Ruby version number always. #795 on
next from 14. April 2018 and #610 on master from 28. September 2017. I
went with #795 here as this - although being newer - is the one on
master, and that should be more stable.
7 years ago
Yang Tang 9c4203bdf8 Add comments about the whitespace and coloring 7 years ago
Yang Tang 2f95fd04d9 Fix icons cut off in some terminal emulators 7 years ago
Dominik Ritter 37cbc9a02d Fix RPROMPT placement
This fixes #841
7 years ago
Tim Otlik 557f5993ea
add cog symbol to dir segment if folder is /etc* 7 years ago
Dominik Ritter 27bd1cd65d Fix test for rust segment 7 years ago
Tim Otlik 7ab9cb150e
add comment line above battery-threshold condition 7 years ago
Daniel Kolsoi 9b0e0c786a Removed 'Rust' text from test; Silenced missing rustc warning 7 years ago