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

885 commits

Author SHA1 Message Date
Dominik Ritter
ebbdb3c1c0 Make purpose clear of backgroundColor and foregroundColor functions
The functions just start the colors, they do not end them. It seems
too much to have a function that terminates a color.
2018-08-07 21:21:15 +02:00
Dominik Ritter
3b8f0abdb2 Merge remote-tracking branch 'docwhat/pr/sudo-check' into prepare_066 2018-08-06 00:26:23 +02:00
Dominik Ritter
aca20ae463 Merge branch 'add_tests' into prepare_066 2018-08-06 00:17:23 +02:00
Christian Höltje
7f6ac8dbac Use SUDO_COMMAND to check for sudo
`sudo -n true` only checks that we _could_ use `sudo`, not if we are in
a sudo session.

closes #852
2018-07-31 16:22:26 -04:00
Ben Hilburn
571a859413
Merge pull request #912 from brandon14/laravel_pormpt_fix
[Bugfix] Fix error in laravel_version when artisan is not present
2018-07-23 14:34:00 -04:00
Brandon Clothier
9739c68894
Missed a parenthesis here. 2018-07-22 21:55:44 -04:00
Ben Hilburn
e70ce43809
Merge pull request #915 from onaforeignshore/fix_truncate_to_unique
[Bugfix] Fix for "truncate_to_unique" strategy
2018-07-19 08:46:27 -04:00
Dominik Ritter
7a7b4ee13a Merge remote-tracking branch 'ben/master' into add_tests 2018-07-19 07:44:16 +02:00
Dominik Ritter
671f826a40 Set background color of vi_mode segment to white in insert mode 2018-07-19 07:42:09 +02:00
Dominik Ritter
7a3aa9d3d1 Change swap segment to take an optional root prefix for testability 2018-07-18 22:26:08 +02:00
Dominik Ritter
e99c7549fb Change ram segment to take an optional root prefix for testability 2018-07-18 22:24:25 +02:00
Dominik Ritter
04168cc5c0 Change load segment to accept an optional root prefix for testability 2018-07-18 22:20:16 +02:00
Dominik Ritter
43272410c9 Change ip segment so that the tests can be executed on OSX as well
Change regular expressions to a more compatible format.
2018-07-18 22:17:54 +02:00
Dominik Ritter
b61d021abd Simplify detect_virt segment 2018-07-18 22:15:35 +02:00
Dominik Ritter
629d52a7d5 Add visual identifier to custom segments 2018-07-18 22:13:25 +02:00
Christo Kotze
dd25b5db12 truncate_to_unique - simplified the code 2018-07-18 19:46:31 +04:00
Brandon Clothier
ef1f29a5cb
Drop grep usage in favor of zsh regex test 2018-07-18 11:45:05 -04:00
Christo Kotze
38c8519f10 Changed getUniqueHomeFolder to use $HOME
It is a Posix specification that $HOME be set, so we can use that.
See http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
2018-07-18 19:26:15 +04:00
Alexara Wu
cff11d2e82
Fix pyenv segment 2018-07-18 04:14:34 +08:00
Christo Kotze
29c85be8d9 Fix for "truncate_to_unique" strategy 2018-07-17 12:17:21 +04:00
Dominik Ritter
802af322ff Add tests for battery segment
Additionally
- Add a fourth parameter to prompt_battery for better testability. This
  parameter is the root prefix, so we can use our own test batteries.
2018-07-16 20:48:27 +02:00
Ben Hilburn
22a761208d
Merge pull request #900 from AlexaraWu/patch/pyenv
Fix `pyenv` segment
2018-07-16 11:01:00 -04:00
Brandon Clothier
48b264f564
Fix error in laravel_version when artisan is not present 2018-07-14 18:24:10 -04:00
Alexara Wu
45fe401dc2
Improve conditions in rbenv & pyenv 2018-07-14 20:41:15 +08:00
Alexara Wu
9f09547ad1
Improve rbenv as well 2018-07-14 17:09:56 +08:00
Alexara Wu
25e2064f0e
Improve command check 2018-07-14 06:32:07 +08:00
Ben Hilburn
a7b3f310d3
Merge pull request #905 from robobenklein/robobenklein/defined-variable-performance-hotfix
[performance] Defined function 2-20 times speedup
2018-07-13 13:25:45 -04:00
Dominik Ritter
8cd39beaad FIx status segment 2018-07-12 08:13:52 +02:00
Ben Klein
002f7b81a1
Replace [[-v with defined
For zsh 5.1 compatibility.
2018-07-11 16:54:12 -04:00
Alexara Wu
fc39d9d6b8
Fix pyenv segment 2018-07-11 20:55:27 +08:00
Dominik Ritter
d031b3e035 Fix kubernetes segment 2018-07-09 21:30:28 +02:00
Ben Hilburn
579887d294 Merge branch 'master' into next 2018-07-09 09:06:51 -04:00
Kevin McBride
534ec66466
kubecontext: fix context, namespace comparison 2018-07-02 13:33:23 -07:00
Dominik Ritter
bda3171237 Fix java_version segment 2018-06-20 22:55:14 +02:00
Dominik Ritter
08a3801c81 Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065 2018-06-20 21:23:38 +02:00
Dominik Ritter
d09a46f9e0 Mute errors when asking for java version 2018-06-17 22:47:43 +02:00
Tim Smith
3989834bfe Hide one-space indent at right margin
ZSH displays the right prompt indented one space from the right
margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that
makes display problems very likely and I don't recommend it. But
all is not lost.

The %E prompt format does continue the current background color
through that last indent space. So it can *look* like our prompt
goes right up to the margin, if:
1) We remove the trailing space from the last segment, and
2) We add %E before clearing the background color
2018-06-15 00:42:48 -06:00
Dominik Ritter
51b53cd4b5
Fix rbenv segment after merge 2018-06-09 14:37:56 +02:00
Dominik Ritter
dc21b97335 Fix travis build 2018-06-07 02:36:30 +02:00
Dominik Ritter
a2d8cccd09 Add a Laravel version segment 2018-06-07 01:54:32 +02:00
Dominik Ritter
d9d9fb9b6b Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065
Conflicts were:
- test/segments/command_execution_time.spec and
test/segments/go_version.spec: All conflicts come from renaming color
names on next (#703) and adding a whitespace to the Visual Identifier
(#854) on master.
2018-06-07 01:51:16 +02:00
Dominik Ritter
40219759bb Merge branch 'fix_rprompt_newline' into staging_065 2018-06-07 01:29:04 +02:00
Dominik Ritter
47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 2018-06-07 01:27:15 +02:00
Dominik Ritter
db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065 2018-06-07 01:25:24 +02:00
Dominik Ritter
3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065 2018-06-07 01:21:16 +02:00
Dominik Ritter
d3500625ca Merge remote-tracking branch 'TheDan64/master' into staging_065
Conflicts were:
- test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826
removes grep from parsing the rust version on next; #703 changes color
names.
2018-06-07 01:00:57 +02:00
Dominik Ritter
e763fa14b0 Merge remote-tracking branch 'chhschou/master' into staging_065
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
2018-06-07 00:44:47 +02:00
Dominik Ritter
4c2f58bdbd Merge remote-tracking branch 'VanRoy/master' into staging_065
Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
2018-06-07 00:11:15 +02:00
Dominik Ritter
55473c450a Merge branch 'master' into staging_065
Conflicts were:
- README.md: Two commits targeted the brightness table. #781 from
14. April 2018 on master and #684 from 05. December 2017 on next.
- powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both
achieve the same thing: To show the Ruby version number always. #795 on
next from 14. April 2018 and #610 on master from 28. September 2017. I
went with #795 here as this - although being newer - is the one on
master, and that should be more stable.
2018-06-06 23:40:37 +02:00
Yang Tang
9c4203bdf8 Add comments about the whitespace and coloring 2018-06-01 14:18:18 -04:00
Yang Tang
2f95fd04d9 Fix icons cut off in some terminal emulators 2018-06-01 11:49:23 -04:00
Dominik Ritter
37cbc9a02d Fix RPROMPT placement
This fixes #841
2018-05-26 00:27:36 +02:00
Tim Otlik
557f5993ea
add cog symbol to dir segment if folder is /etc* 2018-05-17 13:05:36 +02:00
Dominik Ritter
27bd1cd65d Fix test for rust segment 2018-05-12 23:17:49 +02:00
Tim Otlik
7ab9cb150e
add comment line above battery-threshold condition 2018-05-12 01:22:48 +02:00
Daniel Kolsoi
9b0e0c786a Removed 'Rust' text from test; Silenced missing rustc warning 2018-05-09 23:37:32 -04:00
Tim Otlik
238b231c3e
rename variable to POWERLEVEL9K_BATTERY_HIDE_ABOVE_THRESHOLD
Variable now holds an integer, if your battery status is greater or equal to this integer the
segment will be hidden
2018-05-09 10:21:13 +02:00
Tim Otlik
642034eef2
remove duplicate code in battery segment 2018-05-09 10:18:06 +02:00
Tim Otlik
3c27f14581
add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"
Hides the battery segment if percentage hits 100%
2018-05-08 10:50:04 +02:00
Daniel Kolsoi
5fd171c334 Fixed prompt_rust_version to avoid grep aliases 2018-05-05 13:25:29 -04:00
Dan
fbb85e77e3
Merge branch 'master' into chruby_options 2018-04-30 11:07:55 -07:00
Dan
05f44b94bf Add options for customizing chruby segment 2018-04-30 10:52:15 -07:00
Ben Hilburn
13b0e383a0
Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777
Rbenv prompt option always displays #777
2018-04-13 22:04:50 -04:00
Ben Hilburn
0d8bfb68f4
Merge pull request #773 from conradhaupt/fix_dir_nav
Fixed home abbreviation not being exclusive with circular navigation
2018-04-13 21:55:30 -04:00
Ryan Davidson
9f7b0b7404 #777 Add POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable to display prompt_rbenv if rbenv_version_name is the same as rbenv_global 2018-04-03 13:52:13 +01:00
Dominik Ritter
f066dc1cf7 Make _path variable local in anaconda segment 2018-03-28 17:37:50 +02:00
Dominik Ritter
9a895bc7e4 Make variables local 2018-03-27 01:33:21 +02:00
Christian Höltje
fe33c401ba workaround for ZSH status behavior
`$pipestatus` is returning all zeros when using `[[  ]]` expressions
that are false.

This works around it by using `$status` (A.K.A. `$?`) when `$pipestatus`
has only 1 items.

Fixes #749
2018-03-26 14:55:06 -04:00
Julien Roy
b260adbc1b Added a segment that shows the Java version. 2018-03-24 11:04:16 +01:00
Conrad Haupt
a761e3c28a Fixed home abbreviation not being exclusive with circular navigation 2018-03-12 14:28:17 +02:00
Ben Hilburn
99f142de36 **LARGE MERGE THAT TOUCHES LOTS OF THINGS.**
From this point until the next tagged release, `next` will be in a state
of heavy flux as we make some significant and invasive changes.
2018-03-06 22:07:06 -05:00
Ben Hilburn
203d0839f7
Merge branch 'next' into newline-count 2018-03-06 21:24:53 -05:00
Ben Hilburn
cfbbd213cb
Merge pull request #729 from Mikewl/usersudo
Added sudo state to prompt_user
2018-03-06 21:18:05 -05:00
Ben Hilburn
27e256e8af
Merge pull request #736 from dualscyther/segments/dir/absolute-truncation
Add absolute truncation option to dir segment
2018-03-06 21:07:08 -05:00
Ben Hilburn
242bc34027
Merge pull request #743 from onaforeignshore/iterm2_integration
Fix iTerm2 integration with PowerLevel9k
2018-03-06 21:04:24 -05:00
Ben Hilburn
f17a715610
Merge branch 'next' into master 2018-03-06 20:58:12 -05:00
Ben Hilburn
b8a68dd4a8 Merge branch 'master' into next 2018-03-06 20:56:11 -05:00
Christo Kotze
9b7f8babe7 Updated testing for folder icons 2018-02-23 10:25:56 +04:00
Christo Kotze
5cec4d652a Added POWERLEVEL9K_DIR_PATH_ABSOLUTE to README.md 2018-02-23 10:21:02 +04:00
Christo Kotze
ddcdad77a7 Added new variable POWERLEVEL9K_DIR_PATH_ABSOLUTE
If user sets POWERLEVEL9K_DIR_PATH_ABSOLUTE to true, uses absolute paths
instead of home folder abbreviation, e.g. /Users/chris/... instead of
~/...
2018-02-23 10:08:43 +04:00
Christo Kotze
b723800b80 Fixed typo - ~= instead of != 2018-02-23 09:56:42 +04:00
Christo Kotze
99e62532bb Added test for root based folder to first&last 2018-02-23 09:53:36 +04:00
Christo Kotze
08432bf70c Added truncate_to_first_and_last strategy
Truncate middle directories from the path. How many directories will be
untouched is controlled by POWERLEVEL9K_SHORTER_DIR_LENGTH.
2018-02-23 09:28:56 +04:00
Christo Kotze
5fb3033d58 Update to truncate_absolute 2018-02-23 00:41:36 +04:00
Christo Kotze
1e29203563 Removed final SEDs and more comments 2018-02-23 00:36:12 +04:00
Christo Kotze
441fb277d9 Comments, trunc_to_last, trunc_absolute
Added comments throughout the code
Added `truncate_to_last` - displays only the current folder
Added `truncate_absolute` - displays only the last
POWERLEVEL9K_SHORTER_DIR_LENGTH characters - see #736
2018-02-22 23:34:25 +04:00
Christo Kotze
9ef8a2f1f9 Missed one variable name change
There's always that one pesky variable name you forget to change...
2018-02-22 22:51:28 +04:00
Christo Kotze
9c02c6e4d8 All code should now be functional
*Fingers crossed*
2018-02-22 22:46:53 +04:00
Christo Kotze
90d0fb1c32 Updated test for trunc_to_unique
Instead of testing for number of folders, now only tests if string is
longer than 1 character.
2018-02-22 22:42:01 +04:00
Logan Brown
58377b2766 feature: add custom number of newlines after prompt 2018-02-19 17:22:14 -07:00
Christo Kotze
a699393d58 Fixed error in coding
Shouldn't code when tired lol.
2018-02-19 22:12:16 +04:00
Christo Kotze
115b656790 Forgot to update code when creating new func 2018-02-19 22:08:06 +04:00
Christo Kotze
21b7749075 Added truncatePath to utilities.zsh
Added `function truncatePath()` to utilities.zsh to take care of
truncation. This is pure zsh code, without calls to `sed`. Parameters
are:
   * $1 Path: string - the directory path to be truncated
   * $2 Length: integer - length to truncate to
   * $3 Delimiter: string - the delimiter to use
   * $4 From: string - "right" | "middle". If omited, assumes right.

Cleaned up code to use the new function instead.
2018-02-19 22:00:15 +04:00
Christo Kotze
58342612eb Improved truncation code 2018-02-19 16:05:58 +04:00
Christo Kotze
fb09d75391 Updated truncate_to_unique 2018-02-18 22:56:52 +04:00
Christo Kotze
3b182d2eb6 Updated code for testing 2018-02-18 22:35:20 +04:00
Christo Kotze
9f87bd5654 Added / for non-home folders 2018-02-18 19:05:37 +04:00
Christo Kotze
38d7e60ae3 Rewrote trunc middle/right to use for loop 2018-02-18 18:36:18 +04:00
Christo Kotze
0acdc4e032 Fixed another typo - shouldn't code when sick :p 2018-02-18 16:58:06 +04:00
Christo Kotze
97d4e2877d Fixed typo 2018-02-18 16:56:32 +04:00