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
154e923033
Merge remote-tracking branch 'floor114/next' into staging_065
2018-06-06 23:52:15 +02:00
Dominik Ritter
45ae153700
Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into staging_065
...
Conflicts were:
- functions/vcs.zsh: Two commits avoided wrapper behaviour. #685
in grep, #797 in git.
2018-06-06 23:48:11 +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
Daniel Kolsoi
4df61d923a
Merge pull request #1 from dritter/fix_rust_tests
...
Fix test for rust segment
2018-05-12 17:45:25 -04:00
Dominik Ritter
27bd1cd65d
Fix test for rust segment
2018-05-12 23:17:49 +02:00
Daniel Kolsoi
9b0e0c786a
Removed 'Rust' text from test; Silenced missing rustc warning
2018-05-09 23:37:32 -04:00
Daniel Kolsoi
5fd171c334
Fixed prompt_rust_version to avoid grep aliases
2018-05-05 13:25:29 -04: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
7234d52ebd
Merge pull request #791 from dritter/local_variables
...
Make variables local
2018-04-13 21:58:10 -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
Ben Hilburn
83e3267102
Merge pull request #789 from docwhat/pr/status-bug
...
workaround for ZSH status behavior
2018-04-13 21:50:49 -04:00
Ben Hilburn
3dc17fce96
Merge pull request #781 from nikeee/master
...
Fix Brightness Table in README
2018-04-13 21:49:51 -04:00
Ben Hilburn
356f05f0e5
Merge branch 'master' into master
2018-04-13 21:46:05 -04:00
Ben Hilburn
6e3ceb8882
Merge pull request #799 from noraj/patch-1
...
add rvm to README
2018-04-13 21:38:30 -04:00
Ben Hilburn
c6504ada34
Merge pull request #800 from lifehackett/patch-1
...
Fix table formatting in README
2018-04-13 21:33:37 -04:00
lifehackett
cfda084eb8
Another table formatting fix
2018-04-13 08:13:15 -06:00
lifehackett
02d4e76eb4
Fix table formatting in README
2018-04-13 08:07:43 -06:00
Alexandre ZANNI
2eddce2f62
add rvm
...
see those files and look for `rvm`
+ https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md
+ https://github.com/bhilburn/powerlevel9k/blob/master/powerlevel9k.zsh-theme
2018-04-12 22:54:34 +02:00
Taras Shpachenko
111d152d48
Add vcs branch name truncating.
2018-04-12 18:11:23 +03:00
Guilherme Cassolato
1aee125470
Fixes wrapper slowness in vcs segment
2018-04-11 17:21:33 +02:00
Ryan Davidson
e85fb6c93d
#777 update Readme with POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable description
2018-04-03 14:04:28 +01: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
Ben Hilburn
4c919f1a2b
Merge pull request #780 from sambadevi/next
...
update icons for nerd-fonts 2.0.0
2018-03-25 21:11:04 -04:00
Julien Roy
b260adbc1b
Added a segment that shows the Java version.
2018-03-24 11:04:16 +01:00
Niklas Mollenhauer
4de4e8d9d7
Fix POWERLEVEL9k_BATTERY_STAGES Table
2018-03-22 01:05:35 +01:00
Niklas Mollenhauer
70fa74f631
Fix Brightness Table
2018-03-21 16:28:23 +01:00
Conrad Haupt
d43f128c86
Merge branch 'dritter-fix_dir_home_issue' into fix_dir_nav
2018-03-21 10:26:15 +02:00
Dominik Ritter
83ad5b598e
Add test for wrong truncation if switching back to home folder
...
This happens if a user switches from a subdirectory of $HOME
back to the home folder and truncation strategy is "truncate
folders from left". Then the folder is displayed as .../~
PR: #773
2018-03-20 22:39:20 +01:00
Tim Otlik
213ed57f68
add compatible to the list of fontconfigs
2018-03-20 18:40:56 +01:00
Tim Otlik
a3025cbebc
fixed missing icons for other fontconfigs
2018-03-20 18:37:46 +01:00
Tim Otlik
7a8fcf98c1
update icons for nerd-fonts 2.0.0
2018-03-20 18:31:46 +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
8c055f39d8
Moving documentation about newlines to the wiki.
2018-03-06 21:31:59 -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
6529b4f2a7
Merge pull request #758 from sambadevi/next
...
Add icons for more distros in os_icon segment
2018-03-06 21:12:09 -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
db3ae5f053
Merge pull request #740 from ionsquare/master
...
Fix vi-mode and support hiding segment when in insert mode
2018-03-06 21:02:01 -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
Ben Hilburn
281a3aa3a4
Merge branch 'dir_strategies' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-dir_strategies
2018-03-06 20:52:36 -05:00
Christo Kotze
9b7f8babe7
Updated testing for folder icons
2018-02-23 10:25:56 +04:00
