1485 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ben Hilburn	790f7e724d	Merge branch 'master' into next	2015-09-05 14:45:41 -07:00
Ben Hilburn	1390fbdea5	Merge pull request #88 from dritter/vcs_merge_whitespace_fix ... vcs segment: fix extra whitespace in actionformat, remove redundant color setting	2015-09-05 14:44:43 -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 2eea3ae and 1a1cb8f.	2015-09-03 12:12:36 -07:00
Ben Hilburn	60d92135cc	Merge pull request #82 from labianchin/patch-1 ... Fix VCS string print format for git-* (e.g., git-svn)	2015-09-03 12:10:36 -07:00
Ben Hilburn	797a953e12	Merge branch 'jkoelndorfer-undef-var' into next ... Implement defined, set_default utility functions	2015-09-03 12:08:40 -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	815582ffe0	Merge remote-tracking branch 'ben/next' into dritter/system_stats ... Conflicts: powerlevel9k.zsh-theme	2015-08-29 17:37:13 +02:00
Dominik Ritter	602acf3afa	Added documentation for the ip segment.	2015-08-29 17:03:44 +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
Ben Hilburn	bf9ef6acf1	Merge 'dritter/improve_shorten_dir_length' into next	2015-08-28 07:08:13 -07: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
Ben Hilburn	fbac091e27	Merge branch 'dritter-icon-custom' into next	2015-08-26 19:57:49 -07:00
Ben Hilburn	1a1cb8fdd2	Merge pull request #77 from jkoelndorfer/left-prompt-retval ... Set RETVAL for left prompt also.	2015-08-26 19:51:40 -07: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	653ad3d565	Added Documentation.	2015-08-26 17:38:15 +02: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
Ben Hilburn	96a830d2a1	Merge @dritter's icon customization work.	2015-08-19 12:14:21 -07:00
Ben Hilburn	857527083d	Merge pull request #75 from dritter/dritter/utf8_codepoints_fix ... Issue #74: Changed escape sequences for UTF-8 characters to lowercase	2015-08-19 11:41:24 -07:00