3693a3bfa7
Merge branch 'dritter-dritter/system_stats' into next
2015-09-05 15:01:44 -07:00
8fffb04dcd
Merging @dritter's new system stats segments.
2015-09-05 15:01:06 -07:00
65c44d6141
Merge pull request #89 from dritter/php_version_segment
...
Added `php_version` segment.
2015-09-05 14:52:48 -07:00
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
8ce144423b
Resolving conflicts from PR #86
2015-09-05 14:48:18 -07:00
7df9254c9f
Merge pull request #86 from dritter/color_warning
...
Display a warning if the terminal supports less than 256 colors.
2015-09-05 14:47:00 -07:00
790f7e724d
Merge branch 'master' into next
2015-09-05 14:45:41 -07:00
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
26a41f14b8
Added a segment that shows the PHP version.
2015-09-05 18:03:06 +02:00
88abe431ec
Merge remote-tracking branch 'ben/next' into dritter/icon_customization_documentation
2015-09-04 19:55:26 +02:00
adbf9947b2
Removed pointless changing of foreground color.
2015-09-04 19:26:05 +02:00
9a814720db
Removed unnecessary whitespace in git actionformats.
...
This fixes #78
2015-09-04 19:24:07 +02:00
5a8a6c8012
The foreground color of the `longstatus` segment should be white.
2015-09-04 18:32:44 +02:00
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
c72cfb155a
Display a warning message, if the terminal supports less than 256 colors.
2015-09-04 17:20:00 +02:00
f7a05fcd2c
Display of free RAM is now configurable.
2015-09-04 17:04:39 +02:00
b8b82eee21
Use the new `defined` function to test if a network interface was specified.
2015-09-04 16:39:28 +02:00
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
0f30504362
Merge remote-tracking branch 'ben/next' into dritter/system_stats
2015-09-04 00:24:45 +02:00
227958cb04
Merge remote-tracking branch 'ben/master' into dritter/system_stats
2015-09-04 00:19:37 +02:00
6e4d24f50d
Theme code: Cleanup of comments
2015-09-03 12:33:18 -07:00
a6f7d573ed
Merge branch 'master' into next
...
Resolved conflicts from 2eea3ae1a1cb8f
2015-09-03 12:12:36 -07:00
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
797a953e12
Merge branch 'jkoelndorfer-undef-var' into next
...
Implement defined, set_default utility functions
2015-09-03 12:08:40 -07:00
378b910af6
Use defined to check if ICON_USER_VARIABLE is defined.
2015-09-01 18:55:14 -05:00
893bfe243d
Use defined to set right, left prompt elements.
2015-09-01 18:50:18 -05:00
b19de85c16
Use set_default to set VCS foreground and dark foreground.
2015-09-01 18:49:41 -05:00
f42242d34c
Implement defined, set_default functions.
2015-09-01 18:40:11 -05:00
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
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
815582ffe0
Merge remote-tracking branch 'ben/next' into dritter/system_stats
...
Conflicts:
powerlevel9k.zsh-theme
2015-08-29 17:37:13 +02:00
602acf3afa
Added documentation for the ip segment.
2015-08-29 17:03:44 +02:00
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
d8c55a2592
Added documentation and a little helper function for icon customization.
2015-08-29 14:36:33 +02:00
bf9ef6acf1
Merge 'dritter/improve_shorten_dir_length' into next
2015-08-28 07:08:13 -07:00
7535f62746
Added a new Icon to the dir-segment.
2015-08-27 18:45:02 +02:00
b443c9be4a
Moved `print_icon` to top in its own section "utility functions".
2015-08-27 18:44:06 +02:00
dd745634e8
Merge remote-tracking branch 'ben/next' into dritter/improve_shorten_dir_length
2015-08-27 18:43:56 +02:00
3e0547a9cb
Merge branch 'next' into dritter/improve_shorten_dir_length
2015-08-27 18:31:10 +02:00
69fc4d295c
Bugfix: load segment changes the color reliably and is customizable.
2015-08-27 18:24:27 +02:00
fbac091e27
Merge branch 'dritter-icon-custom' into next
2015-08-26 19:57:49 -07:00
1a1cb8fdd2
Merge pull request #77 from jkoelndorfer/left-prompt-retval
...
Set RETVAL for left prompt also.
2015-08-26 19:51:40 -07:00
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
730697893e
Grep statement simplified.
2015-08-26 18:26:53 +02:00
fccc3d5e64
Better descriptions for Stats and Network segements.
2015-08-26 18:08:38 +02:00
2eea3aec56
Set RETVAL for left prompt also.
2015-08-26 10:59:57 -05:00
653ad3d565
Added Documentation.
2015-08-26 17:38:15 +02:00
b73366f039
Added a segment that displays the current IP address.
2015-08-26 17:36:04 +02:00
2bc5a60c7a
Added a new Icon to the dir-segment.
2015-08-26 17:35:25 +02:00
f3d2a0755e
Added a segment that displays the 5 min load average and the free RAM.
2015-08-26 17:34:09 +02:00
Ben Hilburn
Dominik Ritter
Ben Hilburn
John Koelndorfer
Luís Bianchin