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

658 commits

Author SHA1 Message Date
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