1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-25 21:40:08 +00:00
Commit graph

885 commits

Author SHA1 Message Date
Richard Tippl
c4a1d91118 Added a default value for DIR_SHOW_WRITABLE.
Variable POWERLEVEL9K_DIR_SHOW_WRITABLE is now default set to false.
2017-08-10 17:49:42 +02:00
Richard Tippl
b567ab22c2 Implemented functionality from dir_writable to dir
When variable POWERLEVEL9K_DIR_SHOW_WRITABLE is set to true, dir prompt
will have new state NOT_WRITABLE.

This state will be set when user doesn't have permission to write in
current working directory as in prompt dir_writable.

When mode that allows icons is set, LOCK_ICON is used.
2017-08-10 17:14:13 +02:00
Ben Hilburn
93a1c4d2e8 Merge pull request #581 from docwhat/pr/show-signals
status: show signal name
2017-08-03 15:59:08 -04:00
Ben Hilburn
df9b99c2da Merge pull request #580 from sei40kr/master
Fixed Vi mode indicator issue
2017-08-02 11:56:10 -04:00
Seong Yong-ju
0b298e7df4 Fixed an issue of indicator of Vi mode
Fixed an issue that the indicator of Vi mode won't appear correctly at
first.
2017-07-29 13:45:11 +09:00
Christian Höltje
f93ad073b7 status: show signal name
This makes signal exit status easy to understand.  Instead of just
showing exit code "137", you now see "KILL(-9)".

Based on #580 by @sei40kr (thanks!)
2017-07-27 22:36:11 -04:00
Christian Höltje
be6c032025 rvm: handle -head, etc. more gracefully.
Closes #575
2017-07-26 23:39:49 -04:00
Ben Hilburn
0bcef50e29 Merge pull request #573 from AdrienHorgnies/feature/status-cross-ok-option-set
Update `status` segment to provide additional configuration option, streamline settings flags.
2017-07-26 21:17:02 -04:00
Ben Hilburn
c7cd2d54cf Merge pull request #541 from golgoth31/next
vpn prompt: change "ip" to "ifconfig" to be used on OSX
2017-07-17 13:33:30 -04:00
AdrienHorgnies
a4f1ce990b change status segment option set 2017-07-15 21:28:27 +02:00
Ben Hilburn
c69d45cdcc Merge pull request #569 from docwhat/pr/home-folder-abbr-test
Added tests and replaced a sed call
2017-07-13 11:33:21 -04:00
Christian Höltje
8626d07d60 Merge remote-tracking branch 'origin/master' into pr/merge-master 2017-07-13 00:42:15 -04:00
Ben Hilburn
c88cea7f3f Merge pull request #562 from docwhat/pr/cleanup-directory-detection
Cleaned up installation directory detection
2017-07-12 10:13:01 -04:00
Christian Höltje
aca0f31eb0 Replaced a sed call with pure ZSH 2017-07-12 01:02:46 -04:00
Christian Höltje
3bf0f18e26 Cleaned up installation directory detection
- Used ZSH built-in magic to get the installation directory.
- Works with symlinks.
- No longer calls out to external program 'dirname'.
- Fixed issue with spaces in the path.
- No longer leak the variables 'filename' and 'script_location'.
2017-07-11 20:29:01 -04:00
Derek Bassett
3dddcf519d Resolves issue #553 where prompt hangs on kubectl version. 2017-06-26 13:51:41 -06:00
Pavel Peganov
65c770606b Fixed RVM segment for usernames with dashes
Having a username with a dash, such as mine, `d-side`, currently results in RVM segment displaying the wrong thing, e. g. `side/.rvm/rubies/ruby`. This fixes the issue.
2017-06-11 04:09:00 +03:00
David Sabatie
9a3d2e4ca1 vpn prompt: change "ip" to "ifconfig" to be used on OSX 2017-06-03 20:11:24 +02:00
Ben Hilburn
e09d4ae926 Merge branch 'next' into next 2017-06-02 12:09:35 -04:00
David Sabatie
5eec2e28d0 add vpn ip to prompt 2017-05-31 17:32:42 +02:00
Jason Hutchinson
6f0c809a7d empty namespace value is 'default' 2017-05-26 13:35:29 -05:00
Jason Hutchinson
932e4edeaf fix variable name typo 2017-05-26 13:29:06 -05:00
Jason Hutchinson
c11c3a55de use p9k print_icon for kubecontext segment 2017-05-26 13:27:17 -05:00
Jordan Taylor
d8d6c752fd added the current context prompt for your kubectl config 2017-05-26 09:02:14 -04:00
Jason Hutchinson
99c9ba9367 add Gopher icon to go_version segment 2017-05-25 16:38:14 -05:00
Ben Hilburn
92264124a9 Merge branch 'master' into next 2017-05-25 16:01:08 -04:00
Ben Hilburn
d9014c67a3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-25 15:47:51 -04:00
Christo Kotze
cf806f097b updated render check logic 2017-05-23 19:14:52 +04:00
Ben Hilburn
b63bf00113 Merge pull request #473 from zikes/patch-1
Only show go_version segment if inside GOPATH
2017-05-22 21:55:49 -04:00
Ben Hilburn
44764285c3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-22 21:46:17 -04:00
Ben Hilburn
643e8372db Merge branch 'next' of github.com:bhilburn/powerlevel9k into next 2017-05-22 21:45:17 -04:00
Ben Hilburn
5beb77bdf4 Merge branch 'master' into next 2017-05-22 21:39:44 -04:00
Ben Hilburn
65f5f7a90f Merge pull request #531 from shibumi/next
swapped colors for virtualization detection
2017-05-22 21:34:42 -04:00
Ben Hilburn
6f7e88474d Merge pull request #526 from docwhat/pr/nvm-current
nvm: improve default detection
2017-05-22 21:32:41 -04:00
Ben Hilburn
a7409272ac Fixing typo in #525 to teardown RPROMPT 2017-05-22 21:20:56 -04:00
Ben Hilburn
c04c51bc8b Merge branch 'pr/teardown' of https://github.com/docwhat/powerlevel9k into docwhat-pr/teardown 2017-05-22 21:17:10 -04:00
Ben Hilburn
e844fc4c72 Incorporating @dritter's feedback from #524. 2017-05-22 21:12:59 -04:00
Ben Hilburn
6486e62f14 Merge branch 'pr/newline' of https://github.com/docwhat/powerlevel9k into docwhat-pr/newline 2017-05-22 21:07:23 -04:00
Christian Rebischke
e0a6246ecc
swapped colors for virtualization detection, black on yellow was pain for the eyes 2017-05-21 15:04:24 +02:00
Martin Moxon
1cc8c49137 Make Anaconda environment status match Virtualenv format 2017-05-17 20:49:27 +01:00
Christian Höltje
382c821539 teardown: reset PROMPT and RPROMPT 2017-05-12 22:15:26 -04:00
Christian Höltje
feb942d453 add function to disable powerlevel9k
Sometimes you have to disable your prompt. :-(
2017-05-12 22:15:26 -04:00
Christian Höltje
38d5f4d056 nvm: improve default detection
This is also (marginally) faster than before.
2017-05-12 22:14:44 -04:00
Christian Höltje
e9e3e9dc53 newline: support PROMPT_ON_NEWLINE
The newline segment will now show ├─ when using
`POWERLEVEL9K_PROMPT_ON_NEWLINE`

Note: This can be overridden via `POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX`
2017-05-12 22:14:01 -04:00
Christian Höltje
161c995625 newline: can't work with right side 2017-05-12 22:14:01 -04:00
Christian Höltje
1619c74ad8 newline: add new segment 2017-05-12 22:14:01 -04:00
Christian Höltje
25a6c3a4a8 pipestatus: default to true (on) 2017-05-12 22:13:37 -04:00
Christian Höltje
543bd2f844 status: add option for support pipes
Added new option (POWERLEVEL9K_STATUS_SHOW_PIPESTATUS) that shows
the status for all piped commands, not just the right-most.

Closes #514
2017-05-12 21:51:36 -04:00
Ben Hilburn
a0abc44ec7 Merge pull request #521 from guixxx/devel
Icons for Windows/Cygwin + Refixes 32-bit support
2017-05-09 21:55:54 -04:00
guixxx
e6c37b6bc5 Icons for Windows/Cygwin + Refixes 32-bit support 2017-05-07 10:34:54 -03:00
Ben Hilburn
d9969f6546 Merge branch 'master' into next 2017-05-03 15:38:03 -04:00
Kaleb Elwert
39eea0479d Make sure prompt_cr is set
Fixes #511
2017-05-03 11:58:18 -07:00
Ben Hilburn
98a00d31a8 Merge branch 'battery' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-battery 2017-05-01 21:28:22 -04:00
Christo Kotze
94ff40d2d1 Removed POWERLEVEL9K_ALWAYS_SHOW_CONTEXT 2017-04-27 22:16:20 +04:00
Christian Rebischke
dc2b5a833f
[detect-virt] quickfix for unnecessary information in prompt 2017-04-23 15:39:57 +02:00
Ben Hilburn
1dbaf43b98 Merge branch 'master' into next 2017-04-21 11:14:59 -04:00
Christo Kotze
59e64c9051 host and user segments 2017-04-21 00:06:28 +04:00
Kaleb Elwert
efac911431 Stop setting options in prompt setup which are thrown away 2017-04-20 00:03:44 -07:00
Kaleb Elwert
f46c1bc11b Add prompt_opts to prompt setup function 2017-04-19 17:40:41 -07:00
Kaleb Elwert
6f4c09ab99 Use method built in to zsh to read symlinks 2017-04-19 11:18:28 -07:00
Ben Hilburn
99e59bc83a Revert "Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit"
This reverts commit ae259ff594, reversing
changes made to 01a5c6a3a1.
2017-04-19 10:14:11 -04:00
Kaleb Elwert
769d82ce63 Fix double expansion of prompt variables 2017-04-18 19:30:54 -04:00
Ben Hilburn
ae259ff594 Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit 2017-04-18 19:26:08 -04:00
Kaleb Elwert
2817b45f05 Fix double expansion of prompt variables 2017-04-18 16:04:13 -07:00
Ben Hilburn
ddc425a840 Merge pull request #484 from shibumi/svn-debugging
[SVN] removed %b identifier to fix color encoding
2017-04-18 18:14:12 -04:00
Ben Hilburn
c70bb0d4ee Merge branch 'master' into next 2017-04-18 18:08:44 -04:00
Ben Hilburn
54a444535a Converting timer start time to hex 2017-04-18 18:02:37 -04:00
guixxx
ea2d02d08f Adds useful comment 2017-04-18 18:02:37 -04:00
guixxx
c403ad6cd7 Adds Android icon/battery plugin support
Plus fixes bhilburn/powerlevel9k#479, which was causing integer overflow on 32-bit CPUs
2017-04-18 18:02:37 -04:00
Christian Rebischke
2a8259e128
[SVN] removed %b identifier to fix color encoding 2017-04-16 16:53:48 +02:00
Henry Chang
18fc317cf7
Set tick to color name green instead of color code
So the tick will not be too bright in light background color scheme such
as Solarized Light.
2017-04-15 23:04:33 -07:00
Jason Hutchinson
21d8fc6378 Redirect stderr for GOPATH check to /dev/null
Accounts for instances where `go` binary is not installed.
2017-04-12 17:09:23 -05:00
Jason Hutchinson
f140104e4a only show go_version segment if inside GOPATH
As of Go v1.8 GOPATH need not be set, as it will default to $HOME/go. By using `go env GOPATH` to retrieve the value first, this technique will work regardless of whether GOPATH is currently set by the user.
2017-04-06 23:17:32 -05:00
Julien Falque
708705599d
Make home abbreviation configurable for dir prompt 2017-04-04 08:17:18 +02:00
Ben Liblit
9444e4c0c6 Gracefully handle echotc Co failure
In Emacs, `M-x shell` creates a shell buffer with very rudimentary
terminal capabilities.  `$TERM` is set to `dumb`, and `echotc Co`
fails after printing `echotc: no such capability: Co` to standard
error.  If our goal was to determine whether the terminal supports 256
colors, we really have no information to go on.  I recommend that we
trust the user and hope for the best.  That means we should (1)
discard any `echotc Co` error output, and (2) forego the warning
message about having fewer than 256 colors if `echotc Co` failed.
2017-03-31 23:23:27 -05:00
Raphaël Cohen
8be5fb62e4 Display available ram on BSD systems 2017-03-12 16:03:32 +01:00
Raphaël Cohen
3fe12dfe62 Improves ram prompt
For OS X display the sum of Pages free and Pages inactive
For Non BSD use MemAvailable instead of MemFree
2017-03-12 12:09:12 +01:00
Ben Hilburn
622c04eee3 Merge branch 'next' into truncate_composer_json 2017-03-08 15:01:53 -05:00
Dominik Ritter
17671d3ee3 Fix parsing package name from complex package.json files
when using `truncate_with_package_name` strategy.
2017-03-08 14:57:24 -05:00
Dominik Ritter
ec044c028a Add functionality to truncate via composer.json 2017-02-24 01:24:16 +01:00
Dominik Ritter
a0aa5ccbfc Fix parsing package name from complex package.json files
when using `truncate_with_package_name` strategy.
2017-02-23 23:30:55 +01:00
Felicia Hummel
554f8ed8ee Added support for customizable context segment 2017-02-18 22:25:33 -05:00
Ben Hilburn
95344af327 Setting new newline flag to false as default. 2017-02-18 22:15:22 -05:00
Johnny@Ash
ceba4bb7bf Adding option POWERLEVEL9K_PROMPT_ADD_NEWLINE to create a blank line before each prompt 2017-02-18 22:09:52 -05:00
Johnny@Ash
177474a489 Adding a \n before prompt 2017-02-18 22:09:52 -05:00
Dominik Ritter
875dec5dae Merge branch 'next' into execution_time 2017-02-14 21:42:41 +01:00
Dominik Ritter
674ae068b6 Use GMT as timezone for command_execution_time segment 2017-02-14 21:38:39 +01:00
Dominik Ritter
a202537dd7 Refactor command_execution_time segment
- Change internal precision to nanoseconds
- Let the user decide about desired precision
- Add tests
2017-02-14 21:32:41 +01:00
Ben Hilburn
c65e3217b5 context: fixing conditionals in for always showing $USER 2017-02-14 08:58:40 -05:00
Ben Hilburn
6512796afe Trying to enable always showing user, not working 2017-02-13 22:29:58 -05:00
Ben Hilburn
3de352b296 Adding ssh segment back with some minor changes. 2017-02-13 22:07:23 -05:00
Ben Hilburn
f68e055f3b Merging the ssh detection into context segment, resolving conflicts. 2017-02-13 21:50:37 -05:00
Ben Hilburn
5957aef79a Merge branch 'next' into shibumi-next 2017-02-13 21:07:10 -05:00
Ben Hilburn
36d74f34c2 Merge branch 'next' into dir_first_character 2017-02-13 20:21:33 -05:00
Dominik Ritter
0461b56f2a Fix wrong variable name 2017-02-14 01:24:32 +01:00
Dominik Ritter
e105118f39 Format command execution time human readable 2017-02-14 00:57:10 +01:00
Dominik Ritter
04e75a683d Reworked command_execution_time segment
- Add a visual identifier
- Fix a bug that the time was not reset
- Make calculation independent of segment (thx @rjorgenson)
2017-02-13 23:17:04 +01:00
Dominik Ritter
7e5bef14d7 Add command_execution_time segment 2017-02-13 00:56:32 +01:00
Dominik Ritter
f6c65e3cf7 Get rid of unreadable BSU-pattern
Now the current folder in `truncate_with_folder_marker` strategy is
truncated by cutting off the found folder from the beginning of $PWD.
2017-02-13 00:22:22 +01:00
Dominik Ritter
a4cb875615 Add documentation about mysterious 'BSUbfksu' pattern 2017-02-12 23:27:16 +01:00
Dominik Ritter
610fd4fbfd Merge branch 'next' into benoits_dir_segment 2017-02-12 18:59:21 +01:00
Ben Hilburn
1de14df11f Merge pull request #395 from dritter/benoits_dir_writable_segment
Benoits dir writable segment
2017-02-11 10:22:49 -05:00
Ben Hilburn
2397d02acc Merge pull request #391 from dritter/simplify_public_ip
Simplify `public_ip` segment
2017-02-11 10:18:53 -05:00
Ben Hilburn
da75345275 Merge pull request #387 from dritter/fix_truncate_with_package_name
Fix error with truncating package name if repo is symlinked
2017-02-11 10:12:17 -05:00
Christian Rebischke
7e25fa1e93
Added additional ssh identifier for the right statusbar. 2017-02-10 17:12:05 +01:00
Christian Rebischke
15cbe8dbc9
[SSH]: resolved merge conflict and merged with current next 2017-02-10 16:53:49 +01:00
Dominik Ritter
a8af89eeb7 Fix default dir truncation strategy 2017-02-04 08:51:52 +01:00
Dominik Ritter
268c3247c9 Do path expansion at first 2017-02-03 20:21:53 +01:00
Dominik Ritter
eb865664e4 Add comments to the dir segment 2017-02-02 00:31:04 +01:00
Dominik Ritter
052eba9c74 Rename dir_permissions segment to dir_writable
Additionally:
- Add changelog entry
- Add documentation
2017-01-31 23:57:59 +01:00
Benoit Averty
6927b0ca94 Add directory permission prompt segment 2017-01-31 23:54:03 +01:00
Benoit Averty
9f4772f993 More possibilities with truncate folder marker 2017-01-31 23:49:46 +01:00
Benoit Averty
5cc2d51b58 Fix bug when truncate root was set to direct subfolder of home or root 2017-01-31 23:49:13 +01:00
Benoit Averty
ebf808c533 Add dir_truncate_root option 2017-01-31 23:47:49 +01:00
Dominik Ritter
b379f03f14 Add ability to omit the first character in dir path 2017-01-30 21:10:09 +01:00
Dominik Ritter
06cb9bb43f Change order of public ip methods as it was before 2017-01-28 13:21:40 +01:00
Dominik Ritter
6c352c8d5c Simplify public_ip segment 2017-01-28 02:47:59 +01:00
Dominik Ritter
a576a15759 Fix error with truncating package name if repo is symlinked 2017-01-25 23:48:40 +01:00
Dominik Ritter
bcb0fed873 Avoid error if CLOBBER is not set
If the tempfile already exists and CLOBBER is not set, a file exists error occurrs. This commit avoids this problem.
2017-01-24 20:34:11 +01:00
Ben Hilburn
a58e8bdc8c Merge pull request #379 from dritter/fix_swift_segment
Fix swift segment
2017-01-24 10:11:02 -05:00
Ben Hilburn
7bd2585371 incorportaing feedback from review on hdd_usage segment 2017-01-21 21:34:55 -05:00
Dominik Ritter
b8e18d7108 Fix swift segment
The regex for the swift segment matches too much. Here I simplified it
to match the first number as this is probably the "main" version number.
2017-01-22 01:47:58 +01:00
Ben Hilburn
59b20b8f27 changing hdd_usage to actually show usage 2017-01-20 22:05:57 -05:00
Mikhaylov Anton
7f3677d22a Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
ea74c45d4f Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
92cb8d14d1 Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
934186df6d Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
cf8a94de01 Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
32708784b2 Fix 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
41588e0d24 Change colors 2017-01-20 22:05:32 -05:00
Mikhaylov Anton
46ef589b63 Add anion155's HDD segment 2017-01-20 22:05:32 -05:00
Owen McGill
e2b2e8e173 Change powerlevel9k_init to prompt_powerlevel_setup
Changed init/setup function name to be compatible with zsh promptinit, zsh prompt function only lists themes with prompt_*_setup init/setup functions
2017-01-20 20:44:24 -05:00
Ben Hilburn
e9af4aab4f Merge pull request #376 from jshort/next
Fix MacOS specific battery segment logic.
2017-01-20 20:36:19 -05:00
James Short
22540e04b8 Fix MacOS specific battery segment logic.
The case statement was causing it to never display that it was charging
and some of the awk statements had an off-by-one bug to grab the correct
values.
2017-01-18 16:05:38 -08:00
rjorgenson
108335f18f fixed typo
fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
2017-01-09 15:25:02 -07:00
rjorgenson
2cc6e661b4 reverted testing value to default value 2017-01-09 15:14:05 -07:00
rjorgenson
f11ca0664c fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real 2017-01-09 15:00:20 -07:00
rjorgenson
f33f843e92 fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty 2017-01-09 14:56:22 -07:00
rjorgenson
ceb5c4ec32 Merge branch 'public_ip_segment' of github.com:rjorgenson/powerlevel9k into public_ip_segment 2017-01-09 14:42:29 -07:00
rjorgenson
20a5556642 added the ability to specify and only attempt a particular method 2017-01-09 14:41:46 -07:00
rjorgenson
1b838241fb added configurable string when there is no IP 2017-01-03 17:07:52 -07:00
rjorgenson
6c46410a2f updated some comments
changed some offline behavior
2017-01-03 16:55:33 -07:00
rjorgenson
f9bb7a2e94 Merge branch 'public_ip_segment' of github.com:rjorgenson/powerlevel9k into public_ip_segment 2017-01-03 16:07:54 -07:00
rjorgenson
fa51798ce7 fixed some comments and handled an edge case 2017-01-03 16:05:15 -07:00
rjorgenson
5cf78c5a13 fixed boolean values 2017-01-03 15:54:52 -07:00
rjorgenson
a6c8c5c2dd fixed colors to defaults 2017-01-03 15:54:52 -07:00
rjorgenson
5fdfd63e46 added public IP segment for review/discussion 2017-01-03 15:54:52 -07:00
rjorgenson
cf88f861fa fixed boolean values 2017-01-01 23:47:01 -07:00
rjorgenson
80ee16c16d added custom host depth to context segment 2016-12-30 20:07:26 -07:00
rjorgenson
2ddf2a2f20 fixed colors to defaults 2016-12-30 14:09:43 -07:00
rjorgenson
29233c1963 added public IP segment for review/discussion 2016-12-30 14:04:18 -07:00
Ben Hilburn
c86b4009ce Merge pull request #366 from rjorgenson/next
migrated battery segment to use pmset on OSX over ioreg
2016-12-30 14:17:04 -05:00
Ben Hilburn
5ea003bf5e Merge branch 'master' into next 2016-12-20 17:58:17 -05:00
Ben Hilburn
52d95f9038 Merge pull request #362 from shibumi/detect-virt-next
Added segment for virtualization detection.
2016-12-20 17:51:02 -05:00
Christian Rebischke
c42a77ae60
Merge branch 'detect-virt' into detect-virt-next 2016-12-20 19:48:16 +01:00
rjorgenson
4568c3490d added a comment 2016-12-19 16:34:08 -07:00
rjorgenson
16283fc8ee migrated battery segment to use pmset on OSX over ioreg 2016-12-19 15:34:04 -07:00
Christian Rebischke
30076080a7
added ssh support and POWERLEVEL9K_HIDE_HOST feature
refactorized the sourcecode

added true/false switch
2016-12-18 21:08:43 +01:00
Christian Rebischke
881ce33263
added virtualization detection with systemd 2016-12-17 18:51:03 +01:00
Dean Fenster
b37090073c Supressed error message for invalid acpi date (happens when disconnecting the power cable) 2016-12-08 21:06:07 +02:00
Ben Hilburn
7a49c9704d Merge pull request #347 from thomaspaulmann/swift
Add prompt for current installed swift version
2016-12-05 18:32:55 -05:00
Dominik Ritter
202ab15007 Fix display of custom dir path separator on linux 2016-12-04 18:43:47 +01:00
Dean Fenster
a637321d58 Fixed syntax issue 2016-12-03 20:02:52 +02:00
Dean Fenster
4bee6dc93d Fixed an issue where full battery registers as disconnected 2016-12-03 19:46:25 +02:00
Thomas Paul Mann
21a5cbd988 Add prompt for current installed swift version 2016-12-01 21:21:05 +01:00
Dominik Ritter
a1b4d44755 Make path separator configurable for dir prompt
Now the path separator can be configured by setting
`POWERLEVEL9K_DIR_PATH_SEPARATOR`
2016-11-29 22:58:55 +01:00
Dominik Ritter
7a776dc68c Modify dir segment to use proper states 2016-11-29 22:35:50 +01:00
Rouzbeh Sarrafieh
72cfc35d3e helping with some spelling corrections in powerlevel9k.zsh-theme instructional sections 2016-11-23 07:23:08 -08:00
rjorgenson
6ed6ba876e Merge remote-tracking branch 'upstream/next' into next 2016-11-21 13:09:29 -07:00
rjorgenson
6d2681d36a fixed regex to determine time remaining on linux for battery segment 2016-11-21 09:51:27 -07:00
Ben Hilburn
b54abe48dc Merge pull request #332 from eviltak/show-ok-in-non-verbose-status
Show OK in non verbose status prompt
2016-10-27 10:57:12 -04:00
Arav Singhal
cde591ce2e Add toggle for showing OK in non verbose status
Adds the toggle POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE for more
customizability. If POWERLEVEL9K_STATUS_VERBOSE is false and
POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE is true, the status prompt will
show the OK visual identifier like in verbose mode. The prompt will show
the OK identifier even if POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE is false
in verbose mode.
2016-10-27 11:42:21 +05:30
Jack Q
894699351d fix load and ram indicator support for BSD 2016-10-05 09:08:32 +08:00
Arav Singhal
9b7fffe1a8 Make status prompt show OK in non-verbose mode
* The status prompt now shows the OK icon even in non-verbose mode.
 A toggle may be added to this effect in the future.
2016-09-30 21:32:22 +05:30
Ben Hilburn
c4fdc8f708 Improved speed of prompt_vcs by 50%-66%. 2016-08-31 10:35:05 -04:00
Ben Hilburn
520eed1248 Removing zle-* overrides, appear fixed in new ZSH. 2016-08-30 21:19:14 -04:00
Ben Hilburn
02cc43ff09 Merge pull request #309 from krischer/conda-prompt-changes
Conda prompt speedup and configuration
2016-08-30 20:57:46 -04:00
Ben Hilburn
683ca10e36 vcs: adding detection of unstaged / staged for svn repos 2016-08-30 20:44:07 -04:00
Christian Rebischke
31589a5097 added svn hooks.. hope this works 2016-08-30 20:41:51 -04:00
Ben Hilburn
55f061c04d Enabling subversion support for the vcs segment. 2016-08-30 20:41:51 -04:00
Lion Krischer
9bc55ab175
Using default way of setting icons and updating doc 2016-08-31 00:31:33 +02:00
Lion Krischer
35beead430
Using set_default function 2016-08-31 00:23:38 +02:00
Lion Krischer
50b978ddc8
Using default color setters 2016-08-31 00:21:01 +02:00
Lion Krischer
97e5684e52
Adapting to newer conda version 2016-08-31 00:08:01 +02:00
Lion Krischer
c382c538f0
Make the conda prompt fully configurable 2016-08-31 00:08:01 +02:00
Lion Krischer
8a62fceb7b
Much faster conda env detection - no more file I/O needed. 2016-08-31 00:08:01 +02:00
Andrew Scott
ec53035b13 Handle spaces in path when shortening 2016-08-11 21:28:31 +01:00
Ben Hilburn
96731951be Merge branch 'noverbose-battery' of https://github.com/dnmiller/powerlevel9k into nonverbose-battery 2016-07-12 20:44:30 -04:00
Ben Hilburn
4666bd49e6 Now printing a warning if $LANG is set incorrectly. 2016-07-07 13:51:26 -04:00
ruifeng.shan
d7c449be34 revise mac battery error when mac default date use linux's 2016-07-07 13:02:16 -04:00
Mateus "Doodad" Medeiros
20b4d2b43e Make prompt_custom not print the segment if empty
Currently you can't make a conditional custom segment. This changes the
prompt_custom function responsible for printing custom segments so that
it won't print the segment in case the content is empty.

With this it becomes possible to make conditional custom prompts simply
by making it not print anything when it's not supposed to be shown.
2016-07-07 13:02:16 -04:00
Dan Miller
19ccfa64eb Add option for non-verbose battery 2016-06-16 22:33:09 -07:00
Ben Hilburn
467742286f Merge pull request #275 from andjscott/prompt_dir_shortening
Handle shorting path when in the .git directory
2016-06-14 13:28:08 -04:00
Andrew Scott
d720b725e8 Use git's show-toplevel to get top level directory 2016-06-14 11:58:33 +01:00
Ben Hilburn
45ff1d1b51 Merge pull request #276 from andjscott/package_name
Only match first name in package.json
2016-06-13 22:12:55 -04:00
Andrew Scott
c3019d11ef Handle shorting path when in the .git directory
`git rev-parse --git-dir` returns just `.` when in the top level of
a`.git` directory. This would cause a problem when extracting the
package_path. Closes #271
2016-06-12 14:52:10 +01:00
Andrew Scott
19ceb08372 Only match first name in package.json
This ensures that the following package.json extract would just give the
prompt "foo" rather than "foo\nbar".

    {
      "name": "foo",
      "author":
      {
          "name": "bar",
      }
    }
2016-06-12 14:50:22 +01:00
Sudarshan Wadkar
99429ab268 Add new pyenv segment to show active python version
This commit provides a new segment `pyenv` to show current python environment.
This prompt can be used in place of `virtualenv` segment. However, it is
targeted at users of [pyenv](https://github.com/yyuu/pyenv) and not meant to
replace the `virtualenv` segment.

The prompt works by parsing output of `pyenv version` and displaying the first
word of the output as segment text. The design (color etc.) is same as the
`virtualenv` segment including the icon. The segment would need to be
revisited if `pyenv version` changes its output format.

Tested on my personal machines (Mac OSX 10.11.4 and Ubuntu 15.04).
2016-06-03 15:50:37 -04:00
Ben Hilburn
41888bf2a9 Merge pull request #260 from thuandt/python-icon
PYTHON ICON for virtualenv prompt
2016-05-27 11:53:02 -04:00
Mateus "Doodad" Medeiros
89fdfa0148 Make prompt_custom not print the segment if empty
Currently you can't make a conditional custom segment. This changes the
prompt_custom function responsible for printing custom segments so that
it won't print the segment in case the content is empty.

With this it becomes possible to make conditional custom prompts simply
by making it not print anything when it's not supposed to be shown.
2016-05-24 11:02:35 -03:00
Dominik Ritter
47879f4b7b Refactor location installation path code
Now it is possible to set the installation path by setting
POWERLEVEL9K_INSTALLATION_PATH. If set, this path will always be used.
If it was not set manually, we try to determine the path automatically.
2016-05-24 02:31:52 +02:00
Thuan (Duong Tien)
086cd1fdcf [ADD] python icon in virtualenv prompt 2016-05-04 21:48:46 +07:00
Ben Hilburn
0b57ee3669 Merge pull request #256 from cbourgeois/next
Fix incorrect background jobs number
2016-05-03 21:59:07 -04:00
David McKay
61a0cee4f5 Using logical CPUs, as it's a fairer reflection of CPU load 2016-05-02 15:35:43 +01:00
Clement Bourgeois
1c17acb758 Fix incorrect background jobs number 2016-04-29 14:20:19 +02:00
David McKay
d2728f0dd1 Consolidated if statements and fixed OSX cpu cores command 2016-04-25 07:08:36 +01:00
David McKay
78b4ab0414 Improvements to load prompt, now reporting warning and critical at 50% and 70% cpu core utilisation 2016-04-22 12:24:30 +01:00
Jan Laermann
391b3327ee Added anaconda segment.
The segment relies on a lookaround to determine the currently
active conda environment.
If available ack is preferred, otherwise grep will be used.
Recent versions of grep offer `-P` to support perl-regex.
Older ones (e.g. those shipped on OSX) will fail.
2016-04-19 21:49:57 +02:00
Ben Hilburn
511bbcf124 Merge pull request #247 from orhanbalci/next
rust icon added to rust segment
2016-04-19 15:23:43 -04:00
Dominik Ritter
7b2e995299 Fix truncation of changeset in detached tag mode 2016-04-17 18:03:31 +02:00
orhanbalci
72315fdc59 rust icon added 2016-04-16 23:46:32 +03:00
Ben Hilburn
0f4e3e7588 git-tagname: Now showing hash/branchname when sitting on a tag 2016-04-12 10:43:34 -04:00
Ben Hilburn
aec9d95295 Merge pull request #229 from alexlafroscia/add-package-name-shortening-strategy
Add shortening strategy based on package.json name
2016-04-11 15:16:37 -04:00
Dominik Ritter
104e774873 Fix configurability of actionformat color 2016-04-03 19:13:58 +02:00
Alex LaFroscia
4ca6938801 Apply max dir length to package name shortener 2016-03-22 13:14:10 -04:00
Ben Hilburn
2d3131fb8a Merge pull request #230 from sabricot/docker_machine
Add a new segment for current active docker machine
2016-03-22 12:11:45 -04:00
Sudarshan Wadkar
7fcac16c5f Combine two checks into one 2016-03-16 17:27:00 -04:00
Sudarshan Wadkar
f7b7ff21c9 Fix NVM prompt to return if not used
This commit changes nvm prompt setup to return immediately if no node
version is installed/available.
Currently, prompt complains for lack of global node version.
Specifically, if you install nvm (from brew or manually) and do not have
global node installed (or set), then the prompt should not set or show
anything. This commit ensures this by immediately returning if
`nvm current` returns "none".
2016-03-14 20:57:30 -04:00
sabricot
3c95feb0bd Add a docker machine segment 2016-03-06 18:25:17 +01:00
Alex LaFroscia
daa7255e85 Add shortening strategy based on package.json name 2016-03-05 22:12:44 -05:00
Sudarshan Wadkar
415194941c [WIP] Rebase to origin:next branch 2016-03-04 15:44:58 -05:00
Ben Hilburn
9d8041fc76 Fixed actionformat color coding 2016-03-03 13:58:42 -08:00
Ben Hilburn
cd5c2e7dcd trying to debug color code that won't deref in vcs_states 2016-03-03 13:30:58 -08:00
Ben Hilburn
b3fae48893 Merge pull request #220 from dritter/rename_vcs_default_state
Rename vcs default state
2016-02-26 09:53:59 -05:00
Ben Hilburn
5d31763a8e Merge pull request #219 from rmad17/nodeenv-support
Adding `nodeenv` segment.
2016-02-26 09:37:34 -05:00
Dominik Ritter
9ac79bd3aa Rename VCS default state to clean 2016-02-26 15:33:04 +01:00
Ben Hilburn
2260b83c98 Merge pull request #214 from dritter/fix_vcs_foreground_color
Allowing VCS Foreground Color to be over-rideable.
2016-02-26 08:01:29 -05:00
Dominik Ritter
e9953710f7 Clean up states in VCS segment 2016-02-26 13:51:39 +01:00
rmad17
8d0f4c9e1d Fixed name issue 2016-02-26 18:02:05 +05:30
rmad17
06dd26a0bd Added nodeenv support 2016-02-26 16:33:19 +05:30
rmad17
e0603314d5 Nodeenv work 2016-02-26 15:32:22 +05:30
Ben Hilburn
e93d053035 Merge pull request #216 from natemccurdy/issues/215
Improve the rbenv prompt by using `version-name`
2016-02-20 15:28:44 -08:00
Nate McCurdy
01bdee42a2 Improve the rbenv prompt by using version-name
Prior to this, the rbenv prompt only showed something if the
$RBENV_VERSION environment variable was set. This was not a complete
solution because rbenv can be configured locally, per directory, with
dotfiles. When using dotfiles, the $RBENV_VERSION variables is not set.

This fixes the issue by taking the output of the `rbenv version-name`
command which shows the real rbenv version being used based on any of
the 4 ways to change rbenv as shown here:

https://github.com/rbenv/rbenv#choosing-the-ruby-version

If the current version of Ruby being used is the same as the global
Ruby, nothing is shown.

This commit also adds documentation to the README that describes the
prompt.

Fixes issue #215
2016-02-19 14:56:09 -08:00
Dominik Ritter
a1ef6548d5 Fix dynamic coloring of VCS segment
The VCS segment had a lot of own color definitions. Now they are all
gone, so that the only color definitions are when the segment gets
printed.
2016-02-18 18:27:32 +01:00
Dominik Ritter
7efc6e4187 Fix go test
If no GO is available, there should be no output.
2016-02-17 18:41:46 +01:00
Ben Hilburn
4bbff138fb Merging @theminor's changes from PR #204 2016-02-05 10:59:33 -08:00
Ben Hilburn
4897c795fa Merge branch 'master' into next 2016-02-05 10:57:56 -08:00
Ben Hilburn
dfd7ae1f1d Merge pull request #205 from dritter/dir_delimiter
Change default dir truncation delimitor to ellipsis
2016-02-05 10:49:09 -05:00
Ben Hilburn
4f4a15de82 Merge pull request #198 from dritter/vcs_customizable
VCS-hooks customizable
2016-02-05 10:40:20 -05:00
Ben Hilburn
25bf6d60a0 Merge pull request #181 from dritter/split_up_ram_segment
Split up `ram` segment into `ram` and `swap`.
2016-02-05 10:37:28 -05:00
Dominik Ritter
54254600d1 Change default dir truncation delimitor to ellipsis 2016-02-03 22:35:14 +01:00
John Minor
d7c26513c8 Add "_UNTRACKED" option for _VCS to change colors - default yellow 2016-01-27 22:52:48 +00:00
Dominik Ritter
15665a4f95 Joining conditional segments now work as expected. If between the last
printed segment is a full but conditional segment, the joined one gets
promoted.
This fixes #186
2016-01-23 01:45:39 +01:00
Dominik Ritter
cd78c66997 First try: Now joined segments are promoted to "full" segments, if their
predecessor was conditional and had no output.
2016-01-23 01:45:39 +01:00
Dominik Ritter
930ae170a4 Made the VCS-hooks customizable. 2016-01-23 01:44:22 +01:00
Dominik Ritter
eba3a3ca95 Reworked the AWS Elastic Beanstalk segment. 2016-01-23 01:35:53 +01:00
James Bowman
af119c9406 Adding command prompt for AWS Elastic Beanstalk environment name. 2016-01-23 01:34:01 +01:00
Dominik Ritter
6aadf76397 Split up ram segment into ram and swap. 2016-01-23 01:27:05 +01:00
Dominik Ritter
c379cf2657 Syntax fix. 2016-01-22 19:52:00 +01:00
v1rgul
29b346930b fix wc glitch on OSX 2016-01-22 01:56:43 +01:00
v1rgul
11d00ce713 background_jobs: show number if verbose 2016-01-18 05:11:05 +01:00
Dominik Ritter
01e4e8d324 Added "visual identifier" concept to icons_test segment. 2016-01-17 01:02:03 +01:00
rjorgenson
3767397711 fixing segment call for new state implementation in prompt_load 2016-01-15 21:52:08 -07:00
Ben Hilburn
817cdf98a1 Merge pull request #191 from rjorgenson/next
added check for nvm command before running
2016-01-15 18:53:42 -08:00
Kayant
cf921fb90c Add sub folder icon when in home subdirectories
Big thanks to @dritter for guidance, @rjorgenson for great explanation.
And @bhilburn for further guidance and encouragement.
See http://i.imgur.com/2Vncypo.png for a presentation of how it looks.
2016-01-16 01:08:52 +00:00
Robert Jorgenson
6f2f78b21f fixed conditional statement 2016-01-14 16:19:12 -07:00
Robert Jorgenson
446f46473b reworked nvm check
Now the prompt segment just returns without doing anything if nvm is not present.
2016-01-14 16:16:27 -07:00
Ben Hilburn
88ed3c2378 Merge branch 'symlink_resolving_improvement' of https://github.com/dritter/powerlevel9k into dritter-symlink_resolving_improvement 2016-01-14 13:13:30 -08:00
Robert Jorgenson
2fa7b1d08f don't output segment if node_version was not populated 2016-01-14 14:09:39 -07:00
rjorgenson
e29b3545bd fixed called to ioreg on OS X machines 2016-01-14 11:07:11 -07:00
rjorgenson
9aeff8d43b added check for nvm command before running 2016-01-14 11:05:26 -07:00
Dominik Ritter
989a9b3b4b Improved symlink dereferencing on OSX by calling a perl script. 2016-01-09 16:25:15 +01:00
Dominik Ritter
0b27bdc6f5 Comment cleanup. 2016-01-08 20:44:35 +01:00
Dominik Ritter
cdf08734db Cleanup of the load segment. 2016-01-08 20:42:06 +01:00
Dominik Ritter
d0a76d721c Sorted segments alphabetically. 2016-01-08 20:34:45 +01:00
Dominik Ritter
bbaa4a57f9 The foreground and background instructions are spaceless by default. No
need to make them spaceless explicitly.
2016-01-07 22:09:11 +01:00
Ben Hilburn
8dfca40eaf Cleaning up comments. Also fixes #135. 2016-01-05 13:56:07 -08:00
Ben Hilburn
c39c8cbb99 Merge pull request #173 from dritter/consistent_visual_identifier
Better support for segments that are just icons.
2016-01-05 13:11:43 -08:00
Niklas Heer
3441f750bf used set_default-function instead 2015-12-31 19:04:26 +01:00
Niklas Heer
f472ba7341 added a new variable POWERLEVEL9K_SHORTEN_DELIMITER to specifiy the delimiter 2015-12-31 15:57:56 +01:00
Niklas Heer
2fdbd6158c added fishe-like shortening strategy 2015-12-30 15:49:23 +01:00
Dominik Ritter
e9ef0429e4 More consistent visual identifiers. Now even segments that just have an
icon as content print these icons as visual identifiers. Some of these
segments have a verbose mode. If this verbose mode is false, some print
just the icon (like the battery segment), which didn't work correctly
before this change.
2015-12-29 13:46:07 +01:00
Dominik Ritter
d5a8211aa1 Merge branch 'battery_visual_identifier' of github.com:dritter/powerlevel9k into battery_visual_identifier 2015-12-18 01:07:22 +01:00
Dominik Ritter
2a519ee2d7 Merge branch 'status_color_fix' into battery_visual_identifier 2015-12-18 00:59:04 +01:00
Dominik Ritter
ac4502ca1f Added the "visual identifier" concept to the vcs segment. 2015-12-18 00:47:37 +01:00
Dominik Ritter
5cfd800585 Added the "visual identifier" concept to the symfony2_version segment. 2015-12-17 18:24:35 +01:00
Dominik Ritter
045f451e4e Added the "visual identifier" concept to the symfony2_tests and
`rspec_stats` segments.
2015-12-17 18:22:34 +01:00
Dominik Ritter
b738ba900c Added the "visual identifiers" concept to the ram segment. 2015-12-17 18:17:06 +01:00
Dominik Ritter
7ed0abebd6 Little VCS segment cleanup. 2015-12-17 10:51:52 +01:00
Dominik Ritter
0cb1c0ffda Changed the order of default segments. 2015-12-17 10:48:11 +01:00
Dominik Ritter
ad2e4f0bcc Added ability to join segments together. You always join a segment
with the previous one. Just add "_joined" to the segment name in
your `POWERLEVEL9K_LEFT_PROMPT_ELEMENTS`-array.

Developers: Be aware that the order of parameters given to
left/right_prompt_segment has changed!
2015-12-16 19:26:27 +01:00
Dominik Ritter
cd5b4d0deb Added the "state" concept to the dir segment. 2015-12-15 03:21:24 +01:00
Dominik Ritter
056d4ff29a Only check for a user defined variable if we really have an visual
identifier.
2015-12-15 02:43:42 +01:00
Dominik Ritter
409303f45d Added the "visual identifier" concept to the rbenv segment. 2015-12-15 02:36:57 +01:00
Dominik Ritter
4fc59fd57c Added the "visual identifier" concept to the node_version segment. 2015-12-15 02:36:02 +01:00
Dominik Ritter
1d0f47fb97 Bugfix: the default should be a pure color, not a full ZSH color
modifier.
2015-12-15 02:20:11 +01:00
Dominik Ritter
78d22ba309 Interesting: We don't need to swap the whitespaces if the visual
identifier should be rendered on the right side, because the terminal
gets printed from left to right and the double width characters need
their "print me right"-whitespaces on the right side anyways.
2015-12-15 02:08:59 +01:00
Dominik Ritter
6f7d6f7259 For left aligned segments start the foreground color after the visual
identifier has been printed.
2015-12-15 02:08:59 +01:00
Dominik Ritter
c5726bc548 Added the "visual identifier" concept to the todo segment. 2015-12-15 02:08:59 +01:00
Dominik Ritter
d514b077d0 Added the "visual identifier" concept to the rvm segment. 2015-12-15 02:08:59 +01:00
Dominik Ritter
fd0fcba5e9 Added the "visual identifier" concept to the node_version segment. 2015-12-15 02:08:59 +01:00
Dominik Ritter
35b1cb5b8d Added the "visual identifier" concept to the load segment. 2015-12-15 02:02:14 +01:00
Dominik Ritter
bb5cca9af7 Added the "visual identifier" concept to the ip segment. 2015-12-15 02:02:14 +01:00
Dominik Ritter
d5d5acb490 Added the "visual identifier" concept to the dir segment. 2015-12-15 02:02:14 +01:00
Dominik Ritter
e505c0698e Added the "visual identifier" concept to the aws segment. 2015-12-15 01:59:46 +01:00
Dominik Ritter
1194826ef4 Used the new "visual identifier" concept for the battery segment. 2015-12-15 01:59:46 +01:00
Dominik Ritter
0c528461fb Allow users to overwrite the color for the visual identifier only. 2015-12-15 01:59:46 +01:00
Dominik Ritter
036433dd53 Segments now can have "visual identifiers" which are basically just
special icons.
2015-12-15 01:59:46 +01:00
Dominik Ritter
21f80e4da7 Removed trailing whitespaces. 2015-12-15 01:59:46 +01:00
Dominik Ritter
5a4de1d274 Split up the status segment into a background_jobs, root_indicator and status segment.
This fixes #163
2015-12-13 12:43:40 +01:00