Commit graph

1083 commits

Author SHA1 Message Date
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
2bc3b09963 Implemented different ways to truncate the directory path. 2015-07-25 01:34:11 +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
Ben Hilburn
5592c90041 Removing the VCS_BRAND_INDICATOR by default 2015-06-08 13:42:03 -07:00
Dominik Ritter
0993e7ce88 New prompt segment os_icon. 2015-06-07 03:08:24 +02:00
Dominik Ritter
891f5567fd Limit to whole folders, not just characters. 2015-06-07 01:48:02 +02:00
Dominik Ritter
291bcddd10 Shorten dir path, if POWERLEVEL9K_SHORTEN_PWD_LENGTH is set. 2015-06-07 01:06:26 +02:00
Dominik Ritter
5bd4f439e4 Added NodeJS icon. 2015-06-06 23:05:31 +02:00
Dominik Ritter
945412480e Reordering code. 2015-06-06 19:38:20 +02:00
Dominik Ritter
02531ff582 Merge remote-tracking branch 'ben/dritter/font_mode' into dritter/font_mode 2015-06-06 18:20:38 +02:00
Dominik Ritter
86db273188 Cleaned up whitespaces: Now the whitespaces are controlled by the functions that draw the segments (except vcs). This makes it more flexible, and you don't get unwanted whitespaces, when flipping segments from one side to another. 2015-06-06 18:18:35 +02:00
Ben Hilburn
9a507fbdae Minor changes to docs in README and theme file. 2015-06-05 17:26:00 -07:00
Dominik Ritter
d65aea3a64 Added more Icons, that work in compatible mode. 2015-06-05 19:23:32 +02:00
Dominik Ritter
2798a9d38e Merge branch 'master' into dritter/font_mode 2015-06-05 19:18:07 +02:00
Dominik Ritter
3e41f29223 Formatting. 2015-06-05 19:02:07 +02:00
Dominik Ritter
7bf7ab94b6 Fix for Issue #33. Now the RPROMPT is on the first line. 2015-06-05 18:56:11 +02:00
Dominik Ritter
d8d9e6cfda Added variable for completeness. 2015-06-05 09:00:32 +02:00
Dominik Ritter
abed8905f4 Mercurial-Bookmarks should also appear in the current foreground color. 2015-06-04 04:46:49 +02:00
Dominik Ritter
3dc5084e40 Added a little "Developers Guide" 2015-06-04 03:58:27 +02:00
Dominik Ritter
bff8bbdb80 Merge remote-tracking branch 'ben/master' into dritter/font_mode 2015-06-04 02:27:48 +02:00
Ben Hilburn
77cbe9a6f0 simplifying user-defined color logic for VCS segment 2015-06-03 17:09:14 -07:00
Dominik Ritter
10c4bdaab2 Merge branch 'master' into dritter/flexible_colors 2015-06-04 00:48:26 +02:00
Dominik Ritter
41013ebd72 Merge remote-tracking branch 'ben/master' into dritter/font_mode 2015-06-03 12:01:55 +02:00
Dominik Ritter
46260ffc89 A bit more whitespace. 2015-06-03 11:51:09 +02:00
Dominik Ritter
a0d48b5c2e Better Icons for incoming/outgoing. 2015-06-03 11:48:55 +02:00
Dominik Ritter
84cfc66c33 Accidentally removed git-untracked hook. 2015-06-03 11:46:39 +02:00
Dominik Ritter
ac048b2951 Modified Theme to support awesome-powerline-fonts as well as non-powerline-fonts. 2015-06-03 00:22:41 +02:00
Dominik Ritter
10c5b28859 We don't need tr, as we strip whitespace directly with zsh. 2015-05-31 03:15:16 +02:00
Dominik Ritter
eb5b9f7c1b Better compatibility with prezto. 2015-05-30 00:00:05 +02:00
Dominik Ritter
6f22892fb7 Variable scoping. 2015-05-29 23:56:31 +02:00
Dominik Ritter
d01d718bd6 Modified code to work with prezto. 2015-05-27 22:40:13 +02:00
Dominik Ritter
166dec2c76 More debugging hints added. 2015-05-27 21:56:06 +02:00
Dominik Ritter
ddef3a6584 Added the node version. 2015-05-26 21:51:01 +02:00
Dominik Ritter
16856268b3 Cleaned indentation. 2015-05-23 22:23:38 +02:00
Dominik Ritter
6cca2c339e Code documentation. 2015-05-23 00:15:25 +02:00
Dominik Ritter
3aba9e20e5 VCS-Info should be affected by foreground color settings of the user. 2015-05-23 00:09:30 +02:00
Dominik Ritter
cb8549aed9 A bit more documentation. 2015-05-22 21:58:46 +02:00
Dominik Ritter
e7e86d9a72 Added some flexibility regarding colors: Now you can specify the foreground and background colors for every segment by setting variables like POWERLEVEL9K_TIME_FOREGROUND="green". 2015-05-22 21:10:03 +02:00
Ben Hilburn
f7af54cdf2 Merge pull request #28 from dritter/trim_whitespace
Trim unwanted whitespaces.
2015-05-20 10:06:32 -07:00
Dominik Ritter
f9f3294d3b Trim unwanted whitespaces. 2015-05-20 16:11:04 +02:00
Dominik Ritter
d62999fbeb Typo corrected. 2015-04-10 23:59:29 +02:00
Dominik Ritter
49b8024947 Show active mercurial bookmark. 2015-04-04 23:24:36 +02:00
Ben Hilburn
13273fccd6 Adding time format string doc to theme file. Making segments alphabetical. 2015-04-03 09:15:16 -07:00
Dominik Ritter
2058e56be5 Always add a whitespace to the end of the time segment for better look. 2015-04-03 16:46:42 +02:00
Dominik Ritter
4d99982e7c Merge branch 'master' into dritter/date_configurable 2015-04-03 15:21:17 +02:00
Ben Hilburn
cfd8484ce5 Few additions to the README 2015-04-02 10:49:47 -07:00
Ben Hilburn
b25c0adc4d Adding settings var docs to the theme file for people without README 2015-04-02 10:45:53 -07:00
Dominik Ritter
4ad84c0936 Improved correction factor, so that the ratio is a nice percentage. 2015-04-02 09:54:40 +02:00
Dominik Ritter
94af6aae43 Better implementation of counting Classes and Tests for RSpec. 2015-04-02 09:49:26 +02:00
Dominik Ritter
30aee63f22 Time format is now configurable. 2015-04-02 02:19:08 +02:00
Dominik Ritter
a06c53902d Whitespace. 2015-04-02 02:17:25 +02:00
Dominik Ritter
a9fcd466a3 Merge branch 'master' into dritter/test-ratio 2015-04-02 02:03:11 +02:00
Dominik Ritter
085610cccf Display a tests vs code ratio (RSpec and Symfony2-PHPUnit-tests). 2015-04-02 01:56:40 +02:00
Dominik Ritter
0175b25395 Git: Show stashed changes. 2015-04-02 01:14:16 +02:00
Dominik Ritter
e23a3c47c4 Show at maximum the configured amount of characters. If the changeset id
exeeds that limit, just show the full changeset id.
2015-04-01 08:53:28 +02:00
Dominik Ritter
32e6ebc88d Merge branch 'master' into dritter/changeset_hash_length 2015-04-01 04:03:50 +02:00
Dominik Ritter
c27513149a Correct interpretation of boolean variables. 2015-03-31 19:52:58 +02:00
Dominik Ritter
3de82cfa67 Length of changeset-hash is now configurable by setting POWERLEVEL9K_CHANGESET_HASH_LENGTH. 2015-03-31 00:57:01 +02:00
Ben Hilburn
86be908bd2 Merging dritter's light color configuration.
Resolved some minor conflicts, and changed README.
2015-03-29 19:05:16 -07:00
Ben Hilburn
c5613777e9 Merge dritter's double-lined prompt feature.
Resolved Conflicts:
	README.md
2015-03-29 18:45:49 -07:00
Ben Hilburn
49d503f2e6 Segments now alphabetical in README. Broke out aws docs. 2015-03-29 18:32:30 -07:00
Ben Hilburn
576f1c0309 Merge remotebranch 'dritter/dritter/aws_segment' 2015-03-29 18:26:08 -07:00
Ben Hilburn
aed16e54b4 Merge pull request #9 from dritter/dritter/virtualenv_link_correction
Updated the link to the virtualenv-documentation.
2015-03-29 18:23:48 -07:00
Dominik Ritter
f5ae48138a Variable-Scoping. 2015-03-30 03:01:55 +02:00
Dominik Ritter
9b27f683d8 Added a "light" color scheme.
Improved colors slightly.
2015-03-30 02:41:03 +02:00
Dominik Ritter
0cc85457ff Updated comment. 2015-03-30 01:36:42 +02:00
Dominik Ritter
f2b6c8d62c Added option POWERLEVEL9K_PROMPT_ON_NEWLINE, which shows the prompt on a new line. 2015-03-30 00:49:25 +02:00
Dominik Ritter
66732bdbf9 Updated the link to the virtualenv-documentation. 2015-03-30 00:38:45 +02:00
Dominik Ritter
aef952ec21 Added AWS segment 2015-03-30 00:26:08 +02:00
Ben Hilburn
dcc18581ae Fixing boolean check for POWERLEVEL9K_SHOW_CHANGESET
Also, random other cleanup.
2015-03-29 14:19:12 -07:00
Dominik Ritter
205d71a647 Removed unnecessary whitespace. 2015-03-29 23:00:27 +02:00
Dominik Ritter
12170c915d Added a bit documentation. 2015-03-29 21:55:03 +02:00
Dominik Ritter
731f43e22b Show revision-Changeset, if POWERLEVEL9K_SHOW_CHANGESET is enabled. 2015-03-29 21:42:28 +02:00
Ben Hilburn
4020b25a43 Enabling rbenv by default. Improving the README. 2015-03-29 11:08:01 -07:00
Ben Hilburn
71ebcb6642 Cleaning up newly improved VCS_INFO settings. 2015-03-29 10:41:02 -07:00
Ben Hilburn
07e4508706 Merge branch '/dritter/mercurial_support' into staging branch. 2015-03-29 10:29:45 -07:00
Dominik Ritter
1f3c8e4d77 Bugfix: we have to reset the dirty-state once we visited a dirty working copy.
And a bit of formatting.
2015-03-29 18:26:02 +02:00
Dominik Ritter
f1518de92f Debugging comment added. 2015-03-29 18:09:27 +02:00
Dominik Ritter
dbcf3f7479 A better approach to detect the dirty status of our working copy. 2015-03-29 18:06:57 +02:00
NateMcCurdy
04e6172db1 Remove the leading whitespace from the left prompt. 2015-03-26 15:42:56 -07:00
NateMcCurdy
443c1dbc8f Add a prompt for rbenv ruby version 2015-03-26 15:39:27 -07:00
Dominik Ritter
ba2ab6ec4a Added mercurial support. 2015-03-22 22:45:55 +01:00
Dominik Ritter
3b6402d9b1 Merge branch 'master' into dritter/mercurial_support 2015-03-22 21:00:17 +01:00
Ben Hilburn
4a9886c25b Minor cleanup of whitespace and README 2015-03-22 12:55:27 -07:00
Dominik Ritter
db9b607b0e rvm-prompt is now customizable too.. 2015-03-22 20:15:33 +01:00
Dominik Ritter
d3125e8b6f All elements can now be on each side.
For better customization, you can add an array of elements in your zshrc:
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS
2015-03-22 20:10:09 +01:00
Dominik Ritter
59ef2a6106 First part: added Mercurial support. 2015-03-22 17:36:54 +01:00
Ben Hilburn
acb2afdf40 Cleaning up comments at the top of the theme file 2015-02-01 15:33:21 -08:00
Ben Hilburn
d768c05d1c powerlevel9k: removing the commented-out hg prompt 2015-01-28 20:59:23 -08:00
Ben Hilburn
d71b1a2c21 powerlevel-9k: ocd swap out of ' to " 2015-01-28 20:59:23 -08:00
Ben Hilburn
ad10bff2ec powerlevel-9k: more spacing fixes 2015-01-28 20:59:23 -08:00
Ben Hilburn
d86013365f powerlevel-9k: getting rid of the totally fake hg vcs_info 2015-01-28 20:59:23 -08:00
Ben Hilburn
cfa8d2558e powerlevel-9k: fixing the spacing in the vcs segment 2015-01-28 20:59:23 -08:00
Ben Hilburn
416129dfe4 powerlevel-9k: slightly tweaking colors 2015-01-28 20:59:23 -08:00
Ben Hilburn
16621f2ce5 powerlevel-9k zsh theme: incorporting tupton's vcs_info suggestions 2015-01-28 20:59:23 -08:00
Ben Hilburn
5943ef20ad powerlevel9k: I never actually use Hg 2015-01-28 20:59:23 -08:00
Ben Hilburn
72fd478359 powerlevel9k: updating comments 2015-01-28 20:59:23 -08:00
Ben Hilburn
b3aaabe578 powerlevel9k: I think it's done! 2015-01-28 20:59:23 -08:00
Ben Hilburn
88d8803a7c powerlevel9k: things looking good! simple comment change 2015-01-28 20:59:22 -08:00
Ben Hilburn
595d7a55c6 theme seems to be working except for some annoying spacing issues 2015-01-28 20:59:22 -08:00
Ben Hilburn
d9bfce94f4 working on return status 2015-01-28 20:59:22 -08:00
Ben Hilburn
d78373cdbd first semblance of working code for right segments working 2015-01-28 20:59:22 -08:00