Ben Hilburn
790f7e724d
Merge branch 'master' into next
2015-09-05 14:45:41 -07:00
Dominik Ritter
adbf9947b2
Removed pointless changing of foreground color.
2015-09-04 19:26:05 +02:00
Dominik Ritter
9a814720db
Removed unnecessary whitespace in git actionformats.
...
This fixes #78
2015-09-04 19:24:07 +02:00
Luís Bianchin
e90e353b0a
Fix format for git-svn
...
When the repository backend is like git-svn or git-hg, there was a conflict with `zstyle` `formats` from `functions/VCS_INFO_formats`. Now it applies the format to all backends starting with `git` or `svn`.
2015-08-31 20:53:31 -07:00
John Koelndorfer
2eea3aec56
Set RETVAL for left prompt also.
2015-08-26 10:59:57 -05:00
Ben Hilburn
6925e35cb8
Merge branch 'dritter/dritter/minimize_dependencies' into next
2015-08-01 15:10:50 -07:00
Dominik Ritter
bb3fbb793c
test -n
seems to read the whole string. For performance issues we just analyze the first line by stripping the output of cat to the first line with sed q
.
2015-07-30 23:30:47 +02:00
Dominik Ritter
df7f853c8d
Less dependencies. If sed q | wc -l
is just for testing if the string is empty or not, we can do that with just ZSH. Trusting that the implentation of test -n
is intelligent enough to abort if a character is found.
2015-07-30 00:18:48 +02:00
Dominik Ritter
1edc606665
Added OpenBSD and DragonFly again.
2015-07-29 10:30:58 +02:00
Ben Hilburn
4ef5294d0b
os_icon: Combining OS detection and icon setting into one case statement
2015-07-28 19:56:46 -07:00
Dominik Ritter
8a6b9fe09d
Whitespace fix.
2015-07-28 19:50:53 +02:00
Dominik Ritter
e025a6cdd4
The VCS-Branch icon is broken, if we use Unicode-characters with uppercase \U.
2015-07-28 11:14:46 +02:00
Dominik Ritter
850702b115
Reworked OS-Icons to fit in our general scheme.
2015-07-28 11:09:55 +02:00
Dominik Ritter
1b7240ca2f
Merge branch 'master' into dritter/os_detection
2015-07-27 09:23:30 +02:00
Ben Hilburn
c37e4a8fa0
Merge remote-tracking branch 'dritter/dritter/disable_rprompt'
...
Allows disabling of the right prompt
Conflicts:
powerlevel9k.zsh-theme
2015-07-26 16:22:29 -07:00
Dominik Ritter
504a64996b
Uhm. It seems to make a difference, whether you print unicode characters with lowercase \u or uppercase \U. Some of them only work with uppercase \U. Therefore I changed all of them to the uppercase variant.
...
Try `echo $'\u1F427' $'\U1F427'`. Only the latter one should work. The first one prints some gibberish.
2015-07-27 00:35:39 +02:00
Dominik Ritter
c116ead6aa
Determine the right OS-Icon only once.
2015-07-27 00:20:40 +02:00
Dominik Ritter
5a6b6ef604
Merge branch 'master' into dritter/os_detection
2015-07-26 23:49:40 +02:00
Dominik Ritter
e8dc33bb07
Added possibility to disable the RPROMPT completly.
2015-07-25 11:22:24 +02:00
Dominik Ritter
9e1f0639cf
Whitespace fixes.
2015-07-25 10:59:25 +02:00
Dominik Ritter
84dfa02a89
Updated the os-icon prompt to newest coding guidelines.
2015-07-25 00:02:32 +02:00
Dominik Ritter
880a715b9c
Merge branch 'master' into dritter/os_detection
2015-07-25 00:00:01 +02:00
Dominik Ritter
30c4acd249
Strip the whitespace of OSX wc
with pure zsh. No need to install coreutils
.
2015-07-20 23:37:57 +02:00
Ben Hilburn
7f83bac947
Revert "We don't need tr
, as we strip whitespace directly with zsh."
...
This reverts commit 10c5b28859
.
Conflicts:
powerlevel9k.zsh-theme
2015-07-19 17:55:10 -07:00
Ben Hilburn
3927f055fe
Merge remote-tracking branch 'dritter/dritter/minimize_dependencies'
...
Using the `translate` program does not appear to be necessary.
2015-07-19 12:29:07 -07:00
Ben Hilburn
8e19cc05aa
Merge pull request #59 from dritter/dritter/multiline_improvements
...
Multiline icons are now customizable
2015-07-19 12:23:00 -07:00
Ben Hilburn
97cd46a347
Merge pull request #58 from dritter/dritter/customizable_context
...
Made the `context` segment customizable.
2015-07-19 12:15:26 -07:00
Ben Hilburn
1f69d67c2a
Merging dritter/remote_icon_space_names
...
Optimizing VCS icon spacing for different configurations.
2015-07-19 12:11:43 -07:00
Dominik Ritter
cb20e0e0d9
Made Multiline-Icons customizable.
2015-07-19 14:57:17 +02:00
Dominik Ritter
eed0c84273
Made the context
segment customizable.
2015-07-19 14:32:13 +02:00
Dominik Ritter
b82e19f073
Merge branch 'master' into dritter/minimize_dependencies
2015-07-19 14:11:55 +02:00
Ben Hilburn
20cb4a245e
Merging @dritter's work to allow shortened dir segment.
...
This is PR #54 .
Merge remote-tracking branch 'dritter/dritter/shorten_dir_path'
2015-07-12 18:07:59 -07:00
Dominik Ritter
50bca4bf25
Merge branch 'master' into dritter/shorten_dir_path
2015-07-12 11:01:13 +02:00
Dominik Ritter
505a55b61c
Updated node-prompt.
2015-07-11 14:29:48 +02:00
Dominik Ritter
bc7c01648f
Merge branch 'master' into dritter/nvm
2015-07-11 14:26:05 +02:00
Ben Hilburn
767d4c75b0
Merge branch 'dritter/developers_guide'
2015-07-10 20:39:56 -07:00
Ben Hilburn
c9e6cc6cd0
Merge pull request #52 from dritter/dritter/mercurial_dirty_fix
...
Must always resolve changeset to show Hg repository status.
Resolves bug #51 .
2015-07-10 20:29:31 -07:00
Ben Hilburn
48d4ebac10
Merge pull request #50 from dritter/dritter/vim_modelines_improvement
...
Add VIM default settings: "expandtab", encoding = "utf8"
2015-07-10 20:26:33 -07:00
Dominik Ritter
114470ea43
simple-mode deactivated. With that option on, vcs_info doesn't detect the repository state correctly.
2015-07-10 19:44:20 +02:00
Dominik Ritter
59cd8a71fa
When opening this file in VIM set "expanded tabs"-option and set encoding to "utf8".
2015-07-10 00:58:35 +02:00
Dominik Ritter
0226f871f6
Fix the branch icon and whitespaces in the vcs segment.
2015-07-10 00:43:10 +02:00
Dominik Ritter
008512cc79
Merge branch 'master' into dritter/developers_guide
2015-07-09 19:11:03 +02:00
Ben Hilburn
b455526ecc
Merge pull request #46 from dritter/dritter/branch_icon
...
Add flag to enable / disable branch icon in VCS prompt. Defaults to `off`.
2015-07-08 18:50:07 -07:00
Ben Hilburn
4bbbefd500
Merge pull request #45 from dritter/dritter/symfony2_version
...
Added a segment that shows the Symfony2 version number.
2015-07-08 18:46:10 -07:00
Martin Pelikan
5a9695dcd4
Correctly set VCS dirty status on first invocation.
...
The precmd hook seems to not get called on first invocation, and gets
called recursively for every subsequent invocation.
2015-07-07 19:53:11 -07:00
Dominik Ritter
2538e5579b
Make branch icon configurable.
2015-07-08 00:44:52 +02:00
Dominik Ritter
f1b5b783d3
Added a segment that shows the Symfony2 version number.
2015-07-07 20:34:46 +02:00
Dominik Ritter
fe5ef3cee8
All top-level usages of "local" removed. That variables need to be global for antigen and prezto to work correctly.
2015-06-13 00:27:27 +02:00
Dominik Ritter
966bf5fe74
Global variables need to be global, so that antigen and prezto see them..
2015-06-11 18:09:57 +02:00
Dominik Ritter
1e31869e13
Merge branch 'master' into dritter/prezto
2015-06-09 17:08:09 +02:00