Ben Hilburn
6b45e84b2e
Merge branch 'master' into next
...
Fixed conflict caused by PR #91 .
2015-09-15 15:39:00 -07:00
Dominik Ritter
d7e3cb31b8
Merge remote-tracking branch 'ben/next' into icon_protection2
2015-09-14 18:23:45 +02:00
Dominik Ritter
43dc8f853d
Merge remote-tracking branch 'ben/next' into shellcheck_fixes
2015-09-14 09:27:07 +02:00
Ben Hilburn
32398beab8
Merge pull request #87 from dritter/improve_same_color_segments
...
Add a color separater between segments of the same color.
2015-09-13 13:57:23 -07:00
Dominik Ritter
08c3649c6a
Obey shellcheck.net: Quote the rhs of != in [[ ]] to prevent glob matching
2015-09-13 00:18:02 +02:00
Dominik Ritter
dfe4c109bd
Double quote to prevent globbing and word splitting in git-aheadbehind.
2015-09-13 00:01:06 +02:00
Dominik Ritter
1c91430aa4
Explicit setopt
2015-09-12 23:58:56 +02:00
Dominik Ritter
22c29b1253
Moved the icon definitions to the top, for better structure.
2015-09-12 23:52:20 +02:00
Dominik Ritter
c8e41ad4ee
Simplified the way the build-prompt-functions are called. Before it was quite obscure how and when ZSH called the right functions. It was a matter of a complex quote syntax. Now, by adding a new precmd-hook, the use of the quotes in the PROMPT and RPROMPT-variables is much simpler.
2015-09-12 23:46:46 +02:00
Dominik Ritter
d133680704
Changed code to comply with www.shellcheck.net.
2015-09-12 22:50:52 +02:00
Tushar Srivastava
a21c5615ec
updated some icons
2015-09-12 18:12:39 +05:30
Tushar Srivastava
7e6616f590
Updated with new Icons
2015-09-12 17:49:18 +05:30
Dominik Ritter
1eec2257fb
The longstatus-Segment should deactivate the foreground color after it is finished printing the content.
2015-09-08 00:27:07 +02:00
Dominik Ritter
ef72eca288
Better structure: The right prompt should deactivate the foreground color, after it is finished printing the content.
2015-09-08 00:18:02 +02:00
Dominik Ritter
3da637cfd6
Added documentation.
2015-09-08 00:13:57 +02:00
Dominik Ritter
4e29538306
Character protection if the user set LANG=C.
2015-09-08 00:09:33 +02:00
Ben Hilburn
fd191a5894
Merge pull request #80 from dritter/dritter/icon_customization_documentation
...
Added documentation and a little helper function for icon customization.
2015-09-05 15:04:20 -07:00
Ben Hilburn
a3b61e92fb
Merge branch 'next' of github.com:bhilburn/powerlevel9k into next
2015-09-05 15:02:03 -07:00
Ben Hilburn
8fffb04dcd
Merging @dritter's new system stats segments.
2015-09-05 15:01:06 -07:00
Ben Hilburn
65c44d6141
Merge pull request #89 from dritter/php_version_segment
...
Added `php_version` segment.
2015-09-05 14:52:48 -07:00
Ben Hilburn
f0e8b992dc
Merge pull request #85 from dritter/home_icon_whitespace_quickfix
...
Fix extra whitespace in `dir` segment.
2015-09-05 14:50:31 -07:00
Ben Hilburn
8ce144423b
Resolving conflicts from PR #86
2015-09-05 14:48:18 -07:00
Ben Hilburn
790f7e724d
Merge branch 'master' into next
2015-09-05 14:45:41 -07:00
Dominik Ritter
26a41f14b8
Added a segment that shows the PHP version.
2015-09-05 18:03:06 +02:00
Dominik Ritter
88abe431ec
Merge remote-tracking branch 'ben/next' into dritter/icon_customization_documentation
2015-09-04 19:55:26 +02: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
Dominik Ritter
5a8a6c8012
The foreground color of the longstatus segment should be white.
2015-09-04 18:32:44 +02:00
Dominik Ritter
9191d29c96
In case that two subsequent segments have the same background color, now a small separator is displayed. Before this commit, no segment separator was shown and the two segments looked like one.
2015-09-04 18:30:04 +02:00
Dominik Ritter
c72cfb155a
Display a warning message, if the terminal supports less than 256 colors.
2015-09-04 17:20:00 +02:00
Dominik Ritter
f7a05fcd2c
Display of free RAM is now configurable.
2015-09-04 17:04:39 +02:00
Dominik Ritter
b8b82eee21
Use the new defined function to test if a network interface was specified.
2015-09-04 16:39:28 +02:00
Dominik Ritter
b5e5ac98f9
Whitespaces should belong to the Icon as they form an entity. Therefore the home-icon in the awesome-patched mode should define its whitespace, so that in normal mode no extra whitespace is shown.
2015-09-04 11:31:34 +02:00
Dominik Ritter
0f30504362
Merge remote-tracking branch 'ben/next' into dritter/system_stats
2015-09-04 00:24:45 +02:00
Dominik Ritter
227958cb04
Merge remote-tracking branch 'ben/master' into dritter/system_stats
2015-09-04 00:19:37 +02:00
Ben Hilburn
6e4d24f50d
Theme code: Cleanup of comments
2015-09-03 12:33:18 -07:00
Ben Hilburn
a6f7d573ed
Merge branch 'master' into next
...
Resolved conflicts from 2eea3ae1a1cb8f
2015-09-03 12:12:36 -07:00
John Koelndorfer
378b910af6
Use defined to check if ICON_USER_VARIABLE is defined.
2015-09-01 18:55:14 -05:00
John Koelndorfer
893bfe243d
Use defined to set right, left prompt elements.
2015-09-01 18:50:18 -05:00
John Koelndorfer
b19de85c16
Use set_default to set VCS foreground and dark foreground.
2015-09-01 18:49:41 -05:00
John Koelndorfer
f42242d34c
Implement defined, set_default functions.
2015-09-01 18:40:11 -05: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
Dominik Ritter
ae77fc17d8
Under OSX the output of sysctl vm.loadavg may be localized. With german locale it will print an comma as separator..
2015-08-31 18:13:28 +02:00
Dominik Ritter
dca00112ad
Reworked the IP segment. It now tries to get a IP address from all up network interfaces.
2015-08-29 16:55:31 +02:00
Dominik Ritter
d8c55a2592
Added documentation and a little helper function for icon customization.
2015-08-29 14:36:33 +02:00
Dominik Ritter
7535f62746
Added a new Icon to the dir-segment.
2015-08-27 18:45:02 +02:00
Dominik Ritter
b443c9be4a
Moved print_icon to top in its own section "utility functions".
2015-08-27 18:44:06 +02:00
Dominik Ritter
dd745634e8
Merge remote-tracking branch 'ben/next' into dritter/improve_shorten_dir_length
2015-08-27 18:43:56 +02:00
Dominik Ritter
3e0547a9cb
Merge branch 'next' into dritter/improve_shorten_dir_length
2015-08-27 18:31:10 +02:00
Dominik Ritter
69fc4d295c
Bugfix: load segment changes the color reliably and is customizable.
2015-08-27 18:24:27 +02:00
Dominik Ritter
61daa647f1
IP is now customizable. By default we try to get the ip of en1 (on OSX) and eth0 on all other systems.
2015-08-26 19:56:49 +02:00
Dominik Ritter
730697893e
Grep statement simplified.
2015-08-26 18:26:53 +02:00
Dominik Ritter
fccc3d5e64
Better descriptions for Stats and Network segements.
2015-08-26 18:08:38 +02:00
John Koelndorfer
2eea3aec56
Set RETVAL for left prompt also.
2015-08-26 10:59:57 -05:00
Dominik Ritter
b73366f039
Added a segment that displays the current IP address.
2015-08-26 17:36:04 +02:00
Dominik Ritter
2bc5a60c7a
Added a new Icon to the dir-segment.
2015-08-26 17:35:25 +02:00
Dominik Ritter
f3d2a0755e
Added a segment that displays the 5 min load average and the free RAM.
2015-08-26 17:34:09 +02:00
Dominik Ritter
66877efade
Moved print_icon to top in its own section "utility functions".
2015-08-26 17:24:23 +02:00
Dominik Ritter
1005a7c6fb
Better Icons for Apple and Linux.
2015-08-26 17:22:42 +02:00
Dominik Ritter
0d62451f57
Merge branch 'dritter/improve_shorten_dir_length' into dritter/system_stats
2015-08-26 13:33:15 +02:00
Dominik Ritter
823c52b3ec
All Unicode-escape-characters should begin with an lowercase \u in the default-icons.
...
The outgoing/incoming changes should use the `print_icon` function.
Renamed VCS-Incoming/Outgoing icon variables.
2015-08-19 23:55:32 +02:00
Dominik Ritter
5795442dbc
Set icon-Array as global variable, so that it is visible in later functions. This is important to make the icon-override mechanism work in antigen.
2015-08-18 23:44:21 +02:00
Dominik Ritter
0831fa1041
Issue #74 : Changed escape sequences for UTF-8 characters to lowercase for compatible and default mode.
2015-08-15 16:09:31 +02:00
Dominik Ritter
44db352e35
Issue #64 : Now the theme detects on OSX which sed is to use.
2015-08-15 15:49:22 +02:00
Dominik Ritter
329f60f19f
Node icon should be customizable too.
2015-08-07 18:59:49 +02:00
Dominik Ritter
754b648f37
Changed the default behaviour to truncate whole directories.
2015-08-05 00:21:09 +02:00
Dominik Ritter
9efe519dc5
Merge branch 'dritter/improve_shorten_dir_length' of github.com:dritter/powerlevel9k into dritter/improve_shorten_dir_length
2015-08-05 00:06:06 +02:00
Dominik Ritter
33dba0f19f
Define multiline icons as escape sequence.
2015-08-05 00:00:29 +02:00
Dominik Ritter
b1dba08c93
Multiline-Icons should be treated as icons as well.
2015-08-04 23:53:36 +02:00
Dominik Ritter
5777b7bb54
Code cleanup. We don't need to define all icons for every mode any more.
2015-08-04 18:47:44 +02:00
Dominik Ritter
2257026f9c
Reworked icons to a zsh array. That way we can easily print out all icons for debugging purposes. Also it opens up some clean up possibilities.
2015-08-04 18:25:03 +02: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
99504d4ad4
Add an indicator that directories were truncated.
2015-07-29 23:46:06 +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
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
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
