Commit graph

430 commits

Author SHA1 Message Date
Dominik Ritter
e94394bc67 Merge branch 'next' into go_prompt 2015-10-19 17:39:43 +02:00
Ben Hilburn
d46634a0a7 Merge branch 'master' into next 2015-10-17 21:46:09 -07:00
Ben Hilburn
38bccd1340 README: Updating second image to use @natemccurdy awesome gif. 2015-10-17 21:45:00 -07:00
Ben Hilburn
ce1ea04c13 Merge pull request #118 from dritter/whitespace_customization
Made whitespaces between segment separators customizable
2015-10-17 20:33:16 -07:00
Ben Hilburn
ee8c59806e README: Updating the docs about vi_mode segment. 2015-10-17 20:29:07 -07:00
Ben Hilburn
34add8aedf Merge pull request #117 from dritter/vi_customizations
Make the vi_mode segement more customizable.
2015-10-17 20:19:53 -07:00
Ben Hilburn
c6f8184585 Merge branch 'dritter-vcs_cleanup' into next 2015-10-17 20:17:42 -07:00
Ben Hilburn
01b158c020 Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into dritter-vcs_cleanup 2015-10-17 20:16:02 -07:00
Ben Hilburn
d459ec0983 Merge pull request #114 from alexlafroscia/add-nvm-prompt-segment
Add nvm prompt segment
2015-10-17 20:12:38 -07:00
Ben Hilburn
9f92995f61 Merge pull request #120 from partp/fix-virtualenv
Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition
2015-10-17 20:11:08 -07:00
Ben Hilburn
95d8b62e65 README: changing name of todo.txt segment to todo 2015-10-17 20:08:22 -07:00
rjorgenson
2a6be9dc40 reverting unnoticed white space change 2015-10-17 11:32:59 -07:00
rjorgenson
5add0daad0 added prompt segment for todo.txt task number 2015-10-17 11:30:55 -07:00
Parth Panchal
ae035e537a Fixes VIRTUAL_ENV_DISABLE_PROMPT condition 2015-10-17 23:17:40 +05:30
Dominik Ritter
b04fae9173 Made whitespaces between segment separators customizable. 2015-10-16 20:42:21 +02:00
Dominik Ritter
86b460f06b vi_mode segement more customizable. 2015-10-16 20:16:31 +02:00
Dominik Ritter
ab3577a795 Merge remote-tracking branch 'ben/next' into go_prompt 2015-10-16 19:55:44 +02:00
Dominik Ritter
3bb8cd4593 Merge remote-tracking branch 'ben/next' into vcs_cleanup 2015-10-16 19:47:30 +02:00
Alex LaFroscia
d5ffa502e2 Add note about NVM to the readme 2015-10-13 19:17:08 -04: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
Ben Hilburn
62dee9824b Merge branch 'readme-v2' into next 2015-10-12 15:01:52 -07:00
Ben Hilburn
941379d71c README: one more wiki link to ToC 2015-10-12 15:00:17 -07:00
Ben Hilburn
9d8ab6f667 README: Add link to Wiki at end of README 2015-10-12 14:58:51 -07:00
Ben Hilburn
0b6b6de8e1 README: Cleaning up ToC 2015-10-12 14:57:18 -07:00
Ben Hilburn
5714581e13 README: Final cleanup 2015-10-12 14:53:17 -07:00
Ben Hilburn
625b584ddd README: Moving styling to the wiki 2015-10-12 14:49:12 -07:00
Ben Hilburn
b6d1cd109e README: I'm good at markdown 2015-10-12 14:35:22 -07:00
Ben Hilburn
d592e047d3 README: Adding ToC 2015-10-12 14:34:44 -07:00
Ben Hilburn
49427538d7 README: Fixing install instruction bullets 2015-10-12 14:31:14 -07:00
Ben Hilburn
b3c7fdf410 README: cleanup 2015-10-12 14:28:53 -07:00
Ben Hilburn
cdaa2c830b README: Fixing some segment links 2015-10-12 14:26:04 -07:00
Ben Hilburn
a4096b4c06 README: Creating links for each segment section 2015-10-12 14:22:05 -07:00
Ben Hilburn
2a1718d927 README: moving lots of information to the Wiki 2015-10-12 14:17:47 -07:00
Ben Hilburn
19caa39333 Merge pull request #109 from jkoelndorfer/next
Fixing issue where BSD detection can bleed info to stdout.
2015-10-12 12:45:17 -07: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
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
be8bb63fc3 Merge branch 'next' into go_prompt 2015-09-30 19:36:50 +02:00
Ben Hilburn
3e7caf5ca6 Merge pull request #108 from V1rgul/next
Added awesome fontconfig for next icons
2015-09-28 16:39:54 -07: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
Ben Hilburn
0733bb380c Merge pull request #102 from dritter/flat_subsegments
Added subsegments in flat-mode.
2015-09-28 10:42:37 -07:00
v1rgul
4fa3228900 Added awesome fontconfig support 2015-09-27 12:17:27 +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
0b37ca2869 Added documentation. 2015-09-22 18:43:06 +02:00