Commit graph

1862 commits

Author SHA1 Message Date
Dominik Ritter
f7d0293d8b
Merge pull request #1157 from 88maomao/fix-git-operation-not-permitted
Hide stderr from git ls-files
2019-02-07 00:06:22 +01:00
🐈
d1fbc1b889
Hide errors from git ls-files 2019-02-06 11:51:41 +02:00
Dominik Ritter
9f9bc62dc9 Avoid loopback interfaces and parse IPv4 on OSX 2019-02-06 08:53:46 +01:00
Dominik Ritter
a00cb84da4 Fix regular expression and test 2019-02-04 15:40:31 +01:00
Dominik Ritter
06151eeba9 Merge remote-tracking branch 'ben/master' into HEAD 2019-02-03 19:52:29 +01:00
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.
2019-02-03 19:20:14 +01:00
Dominik Ritter
0b2990b885
Merge pull request #1154 from dritter/fix_font_debugging_konsole
Fix issues with debug/fonts script in Konsole
2019-02-03 11:28:21 +01:00
Dominik Ritter
0334f4c265 Merge from upstream 2019-02-03 08:58:46 +01:00
Dominik Ritter
2fbdb8c982 Mute errors when detecting font 2019-02-03 08:51:03 +01:00
Dominik Ritter
cdf3fa51f2 Make variables optional 2019-02-03 08:50:38 +01:00
Dominik Ritter
0207182eb9 Add missing function 2019-02-03 08:49:57 +01:00
Dominik Ritter
d83aacfb3f Fix font-debugging script for alacritty 2019-02-03 08:48:33 +01:00
Dominik Ritter
933e95d31c Use Konsole/Yakuake detection from upstream 2019-02-03 08:41:32 +01:00
Dominik Ritter
0081152c28 Fix parsing font for Kitty 2019-02-03 08:35:46 +01:00
Dominik Ritter
4b9ccc33bf Fix issues with debug/fonts script in Konsole 2019-02-03 01:36:22 +01:00
Dominik Ritter
22f6495005
Merge pull request #1151 from Wuestengecko/bugfix-1150
[Bugfix] Only abbreviate $HOME at the beginning of cwd
2019-02-02 00:48:54 +01:00
Dominik Ritter
08798d12ad
Merge pull request #1147 from dritter/fix_newlines_in_zsh57
Fix newlines in ZSH 5.7
2019-02-01 23:52:56 +01:00
Dominik Ritter
8bb86908d7 Add tests 2019-02-01 23:48:39 +01:00
Wuestengecko
8f60309386
Only abbreviate $HOME at the beginning of cwd
Fixes #1150
2019-02-01 17:43:52 +01:00
Dominik Ritter
5c7d1009de
Merge pull request #1148 from dritter/remove_nodeenv_disable_prompt
Remove checking for NODEENV_DISABLE_PROMPT
2019-02-01 17:06:10 +01:00
Dominik Ritter
f42214e44b Add tests for newline segment 2019-02-01 14:37:17 +01:00
Dominik Ritter
bd340d4a88
Merge pull request #966 from ytang/fix-rprompt-icons-cut-off
[Bugfix] Fix icons cut off in RPROMPT segments
2019-02-01 14:19:02 +01:00
Dominik Ritter
c56cbb800a Add documentation 2019-02-01 14:13:02 +01:00
Dominik Ritter
2f05bbbb47 Remove checking for NODEENV_DISABLE_PROMPT
This variable is none of our buisness.
2019-02-01 11:09:42 +01:00
Dominik Ritter
020287dd75 Fix Segment endings if followed by newline 2019-02-01 11:01:59 +01:00
Ythildir
1a1572669c Fix white arrow on newline 2019-02-01 10:34:11 +01:00
HaoZeke
58f70e57e6 rvm: Use @natemccurdy review suggestions 2019-01-25 08:36:12 +01:00
HaoZeke
a41f2e81ae rvm: Only show version and patchset 2019-01-25 08:21:10 +01:00
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.
2019-01-25 08:18:20 +01:00
Dominik Ritter
6ccdfdf37e
Merge pull request #981 from pgierz/os_release_fix
[Bugfix] Fix for #974
2019-01-23 23:52:37 +01:00
Dominik Ritter
938b0d49a1 Avoid externals when parsing the os release on linux 2019-01-23 23:11:01 +01:00
Dominik Ritter
081000c49e Replace call to basename with ZSH internals #1128 2019-01-23 22:47:10 +01:00
Dominik Ritter
8b4bed99df Add documentation about VIRTUAL_ENV_DISABLE_PROMPT #1128 2019-01-23 22:37:45 +01:00
Dominik Ritter
e028513bb9
Merge pull request #1128 from ymage/fix_virtualenv_prompt
[Bugfix] virtualenv prompt displaying
2019-01-23 22:25:05 +01:00
Dominik Ritter
747b94b1b6 Match VPN interface fuzzy on Linux 2019-01-23 19:10:46 +01:00
Dominik Ritter
bde4337992 Match VPN Interface fuzzy 2019-01-23 18:56:07 +01:00
Dominik Ritter
54a985cb11 Simplify code that checks if a VPN is running 2019-01-23 01:02:42 +01:00
Dominik Ritter
480ade162b Improve tests 2019-01-23 01:01:49 +01:00
Dominik Ritter
32d3216bde Fix tests 2019-01-22 19:18:09 +01:00
Dominik Ritter
da50151d24 Fix regular expression 2019-01-21 19:48:28 +01:00
Dominik Ritter
9b73c8bd9c Add tests 2019-01-21 19:46:53 +01:00
Ymage
ee7416962d Remove $VIRTUAL_ENV_DISABLE_PROMPT testing 2019-01-09 17:00:05 +01:00
Ymage
12e9724860 Merge with @dritter proposal 2019-01-07 09:18:34 +01:00
Ymage
a8db401808 [Bugfix] virtualenv prompt displaying
Fix #1127
2019-01-03 12:07:27 +01:00
Shini31
a8fa0332d2 Use ip command for VPN segment - fix #1125 2018-12-30 11:26:04 +01:00
Ben Hilburn
2f4b15041f
Merge pull request #1079 from josselinauguste/master
[Bugfix] Update VIRTUAL_ENV_DISABLE_PROMPT value
2018-11-19 11:04:26 -05:00
Josselin Auguste
5c412b4d42 Update VIRTUAL_ENV_DISABLE_PROMPT value
Following prezto update
2018-11-18 19:54:03 +01:00
Dominik Ritter
d1e4c4c988
Merge pull request #1080 from macserv/port/vcs-segment-untracked-file-check
[Bugfix] Port #1071 to `master` (Fix fatal errors emitted by untracked file check in vcs.zsh)
2018-11-18 09:26:26 +01:00
Matthew Judy
6df2ba0ae0 Port git submodule test from next. 2018-11-17 17:41:55 -05:00
Matthew Judy
574ee6dc1c Port #1071 to master (fatal errors emitted by untracked file check in vcs.zsh) 2018-11-17 17:13:25 -05:00