Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #87 from dritter/improve_same_color_segments | Ben Hilburn | 2015-09-13 | 1 | -2/+29 |
|\ | | | | | Add a color separater between segments of the same color. | ||||
| * | The foreground color of the `longstatus` segment should be white. | Dominik Ritter | 2015-09-04 | 1 | -1/+1 |
| | | |||||
| * | In case that two subsequent segments have the same background color, now a ↵ | Dominik Ritter | 2015-09-04 | 1 | -1/+28 |
| | | | | | | | | small separator is displayed. Before this commit, no segment separator was shown and the two segments looked like one. | ||||
* | | Merge pull request #80 from dritter/dritter/icon_customization_documentation | Ben Hilburn | 2015-09-06 | 2 | -0/+9 |
|\ \ | | | | | | | Added documentation and a little helper function for icon customization. | ||||
| * | | Merge remote-tracking branch 'ben/next' into ↵ | Dominik Ritter | 2015-09-04 | 1 | -75/+69 |
| |\| | | | | | | | | | | dritter/icon_customization_documentation | ||||
| * | | Added documentation and a little helper function for icon customization. | Dominik Ritter | 2015-08-29 | 2 | -0/+9 |
| | | | |||||
* | | | Merge branch 'next' of github.com:bhilburn/powerlevel9k into next | Ben Hilburn | 2015-09-06 | 2 | -0/+11 |
|\ \ \ | |||||
| * \ \ | Merge pull request #89 from dritter/php_version_segment | Ben Hilburn | 2015-09-06 | 2 | -0/+11 |
| |\ \ \ | | | | | | | | | | | Added `php_version` segment. | ||||
| | * | | | Added a segment that shows the PHP version. | Dominik Ritter | 2015-09-05 | 2 | -0/+11 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'dritter-dritter/system_stats' into next | Ben Hilburn | 2015-09-06 | 2 | -11/+147 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merging @dritter's new system stats segments. | Ben Hilburn | 2015-09-06 | 2 | -11/+147 |
|/| | | | |||||
| * | | | Display of free RAM is now configurable. | Dominik Ritter | 2015-09-04 | 1 | -7/+16 |
| | | | | |||||
| * | | | Use the new `defined` function to test if a network interface was specified. | Dominik Ritter | 2015-09-04 | 1 | -8/+8 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'ben/next' into dritter/system_stats | Dominik Ritter | 2015-09-04 | 1 | -75/+67 |
| |\| | | |||||
| * | | | Merge remote-tracking branch 'ben/master' into dritter/system_stats | Dominik Ritter | 2015-09-04 | 1 | -2/+4 |
| |\ \ \ | |||||
| * | | | | Under OSX the output of `sysctl vm.loadavg` may be localized. With german ↵ | Dominik Ritter | 2015-08-31 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | locale it will print an comma as separator.. | ||||
| * | | | | Merge remote-tracking branch 'ben/next' into dritter/system_stats | Dominik Ritter | 2015-08-29 | 0 | -0/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: powerlevel9k.zsh-theme | ||||
| * | | | | Added documentation for the ip segment. | Dominik Ritter | 2015-08-29 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Reworked the IP segment. It now tries to get a IP address from all up ↵ | Dominik Ritter | 2015-08-29 | 1 | -6/+47 |
| | | | | | | | | | | | | | | | | | | | | network interfaces. | ||||
| * | | | | Bugfix: load segment changes the color reliably and is customizable. | Dominik Ritter | 2015-08-27 | 1 | -6/+9 |
| | | | | | |||||
| * | | | | IP is now customizable. By default we try to get the ip of `en1` (on OSX) ↵ | Dominik Ritter | 2015-08-26 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | and `eth0` on all other systems. | ||||
| * | | | | Grep statement simplified. | Dominik Ritter | 2015-08-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Better descriptions for Stats and Network segements. | Dominik Ritter | 2015-08-26 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Added Documentation. | Dominik Ritter | 2015-08-26 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Added a segment that displays the current IP address. | Dominik Ritter | 2015-08-26 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Added a new Icon to the dir-segment. | Dominik Ritter | 2015-08-26 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Added a segment that displays the 5 min load average and the free RAM. | Dominik Ritter | 2015-08-26 | 1 | -0/+53 |
| | | | | | |||||
| * | | | | Moved `print_icon` to top in its own section "utility functions". | Dominik Ritter | 2015-08-26 | 1 | -11/+15 |
| | | | | | |||||
| * | | | | Better Icons for Apple and Linux. | Dominik Ritter | 2015-08-26 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'dritter/improve_shorten_dir_length' into dritter/system_stats | Dominik Ritter | 2015-08-26 | 2 | -13/+66 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge pull request #85 from dritter/home_icon_whitespace_quickfix | Ben Hilburn | 2015-09-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix extra whitespace in `dir` segment. | ||||
| * | | | | | | Whitespaces should belong to the Icon as they form an entity. Therefore the ↵ | Dominik Ritter | 2015-09-04 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | home-icon in the awesome-patched mode should define its whitespace, so that in normal mode no extra whitespace is shown. | ||||
* | | | | | | Resolving conflicts from PR #86 | Ben Hilburn | 2015-09-06 | 2 | -235/+304 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #86 from dritter/color_warning | Ben Hilburn | 2015-09-06 | 1 | -0/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Display a warning if the terminal supports less than 256 colors. | ||||
| | * | | | | | Display a warning message, if the terminal supports less than 256 colors. | Dominik Ritter | 2015-09-04 | 1 | -0/+8 |
| |/ / / / / | |||||
| * | | | | | Theme code: Cleanup of comments | Ben Hilburn | 2015-09-03 | 1 | -44/+28 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into next | Ben Hilburn | 2015-09-03 | 1 | -2/+4 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | Resolved conflicts from 2eea3ae and 1a1cb8f. | ||||
| * | | | | | Merge branch 'jkoelndorfer-undef-var' into next | Ben Hilburn | 2015-09-03 | 1 | -32/+40 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | Implement defined, set_default utility functions | ||||
| | * | | | | Use defined to check if ICON_USER_VARIABLE is defined. | John Koelndorfer | 2015-09-02 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Use defined to set right, left prompt elements. | John Koelndorfer | 2015-09-02 | 1 | -6/+2 |
| | | | | | | |||||
| | * | | | | Use set_default to set VCS foreground and dark foreground. | John Koelndorfer | 2015-09-02 | 1 | -25/+17 |
| | | | | | | |||||
| | * | | | | Implement defined, set_default functions. | John Koelndorfer | 2015-09-02 | 1 | -0/+20 |
| |/ / / / | |||||
| * | | | | Merge 'dritter/improve_shorten_dir_length' into next | Ben Hilburn | 2015-08-28 | 2 | -21/+80 |
| |\ \ \ \ | |||||
| | * | | | | Added a new Icon to the dir-segment. | Dominik Ritter | 2015-08-27 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Moved `print_icon` to top in its own section "utility functions". | Dominik Ritter | 2015-08-27 | 1 | -11/+15 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'ben/next' into dritter/improve_shorten_dir_length | Dominik Ritter | 2015-08-27 | 2 | -169/+169 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'dritter-icon-custom' into next | Ben Hilburn | 2015-08-27 | 2 | -172/+172 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | All Unicode-escape-characters should begin with an lowercase `\u` in the ↵ | Dominik Ritter | 2015-08-20 | 1 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default-icons. The outgoing/incoming changes should use the `print_icon` function. Renamed VCS-Incoming/Outgoing icon variables. | ||||
| | * | | | | Merge @dritter's icon customization work. | Ben Hilburn | 2015-08-19 | 2 | -170/+170 |
| |/| | | | | |||||
| | * | | | | Set icon-Array as global variable, so that it is visible in later functions. ↵ | Dominik Ritter | 2015-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is important to make the icon-override mechanism work in antigen. |