Commit Graph

306 Commits

Author SHA1 Message Date
Dominik Ritter 3bb8cd4593 Merge remote-tracking branch 'ben/next' into vcs_cleanup 2015-10-16 19:47:30 +02:00
Alex LaFroscia 7e6339ec27 Add NVM prompt segment
Prints out the Node version that is currently active if it is different than the default version specified by NVM
2015-10-13 19:08:36 -04:00
Dominik Ritter f7e1f64b4c Added handling for bright colors. 2015-10-13 23:42:46 +02:00
Dominik Ritter 6bf2869a1c Cleanup of VCS-segment. Now `vcs_info` is only invoked, if the user configured to show the `vcs` segment. 2015-10-11 19:41:52 +02:00
Dominik Ritter 20447a22c9 Removed unnecessary literal escape sequences. 2015-10-11 16:22:01 +02:00
Dominik Ritter 0e37d8ef86 Added a new function `isSameColor` to handle color comparisons. It is now possible to compare ANSI colors (e.g. "black" or "bg-red") with ZSH-style colors (e.g. "001"). This way the subsegments work much better, as users can define color codes the way they like. 2015-10-11 16:18:27 +02:00
John Koelndorfer 66b4194daf Quote value of IS_BSD_SED.
If this isn't quoted, in can bleed through to stdout in certain
circumstances.
2015-10-06 10:30:14 -05:00
Dominik Ritter d436c60f24 Merge branch 'ram_prompt' of github.com:dritter/powerlevel9k into ram_prompt 2015-10-01 00:38:02 +02:00
Dominik Ritter be8bb63fc3 Merge branch 'next' into go_prompt 2015-09-30 19:36:50 +02:00
Dominik Ritter e8a53c253b Merge branch 'next' into ram_prompt 2015-09-30 19:36:23 +02:00
v1rgul 7394608d56 Font Awesome fontconfig new icons (fixed errors) 2015-09-29 01:35:17 +02:00
v1rgul 60fc0cae70 Font Awesome fontconfig new icons 2015-09-29 00:43:06 +02:00
Ben Hilburn 5c09cf3e27 Minor comment addition for system load prompt segment. 2015-09-28 11:42:20 -07:00
Ben Hilburn 6a0eb2fb11 Cleaning up comments around font icon settings. 2015-09-28 11:37:43 -07:00
Ben Hilburn b96c5a18c1 Merge pull request #106 from V1rgul/master
Added awesome-fontconfig support
2015-09-28 10:46:13 -07:00
Ben Hilburn f18c92d766 Merge pull request #104 from dritter/vi_mode_cleanup
VI-mode cleanup
2015-09-28 10:43:30 -07:00
Ben Hilburn 163a373847 Merge pull request #103 from dritter/status_segment_cleanup
status vs longstatus cleanup
2015-09-28 10:42:59 -07:00
v1rgul 4fa3228900 Added awesome fontconfig support 2015-09-27 12:17:27 +02:00
Dominik Ritter 6d24f93760 Alphabetical order. 2015-09-26 12:51:08 +02:00
Dominik Ritter f52a7f2570 Corrected calculation of used swap under linux. 2015-09-26 12:33:14 +02:00
Dominik Ritter c760d3a505 Better compatibility with shellcheck.net. 2015-09-23 18:29:42 +02:00
Dominik Ritter ffc0d9e162 KEYMAP may be "main" or "viins" in VI-Mode. 2015-09-23 18:26:27 +02:00
Dominik Ritter fc59f06f39 code more readable. 2015-09-22 18:35:42 +02:00
Dominik Ritter b31d0ff395 Made VI-Mode plugin working again. 2015-09-22 18:30:59 +02:00
Dominik Ritter 2e7d0f14d2 Shellcheck-support for vi_mode segment & alphabetical order of prompts. 2015-09-21 18:34:43 +02:00
Dominik Ritter 1a5edebae7 Added a segment that shows the current GO version number. 2015-09-21 18:27:03 +02:00
Dominik Ritter 58d5f9a078 Added subsegments in flat-mode. 2015-09-20 21:28:22 +02:00
Dominik Ritter 4602e948c9 There is now no difference between longstatus and status any more. Just use status, and if you just want to display it conditionally set POWERLEVEL9K_STATUS_VERBOSE=false.
Also here I unified the use of named color codes to make the subsegment-display work.
2015-09-20 21:24:37 +02:00
Dominik Ritter 43a6079d83 Ram as own prompt. 2015-09-20 20:34:43 +02:00
Dominik Ritter 2809000f9c printHumanReadableSize should be able to process floats. 2015-09-20 20:33:50 +02:00
Ben Hilburn 6deb3fe094 Merge pull request #98 from christian-schulze/vi-mode-segment
Add vi-mode segment
2015-09-19 16:30:37 -07:00
Gilad Goldberg 958b11b77e Make docs reflect difference between status and longstatus 2015-09-19 21:39:03 +03:00
Christian Schulze 665ed59e6a $0 suffixes for color customization 2015-09-19 13:48:23 +10:00
Christian Schulze c08a209e20 add vi-mode segment 2015-09-19 13:35:11 +10:00
Ben Hilburn bc1b5a4c0b Reverting merge of PR #91 2015-09-17 10:42:49 -07:00
Ben Hilburn 692e6a7130 Revert "Merge pull request #91 from tusharsrivastava/master"
This reverts commit 2a2dfdfa29, reversing
changes made to 1390fbdea5.
2015-09-17 10:24:52 -07:00
Dominik Ritter 87fab65609 Corrected ZSH option names. 2015-09-16 00:52:16 +02:00
Dominik Ritter 689b6d8f8c Shellcheck.net: Quote variables. 2015-09-16 00:46:46 +02:00
Dominik Ritter 2384b6aaba Merge remote-tracking branch 'ben/next' into shellcheck_fixes 2015-09-16 00:42:15 +02:00
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 2eea3ae and 1a1cb8f.
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