1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-17 18:20:07 +00:00
Commit graph

188 commits

Author SHA1 Message Date
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
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
Tim Otlik
557f5993ea
add cog symbol to dir segment if folder is /etc* 2018-05-17 13:05:36 +02:00
Ben Hilburn
7234d52ebd
Merge pull request #791 from dritter/local_variables
Make variables local
2018-04-13 21:58:10 -04: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
Dominik Ritter
9a895bc7e4 Make variables local 2018-03-27 01:33:21 +02:00
Julien Roy
b260adbc1b Added a segment that shows the Java version. 2018-03-24 11:04:16 +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
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
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
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
2bd3e0f67e Fixed silly coding error
Did `local 3=...` instead of `3=...`
2018-02-22 22:33:43 +04:00
Christo Kotze
ec0f7bdacb Update for Travis
While zsh accepts the following code:

```
  local paths=(${(s:/:)${1//"~\/"/}})
```

Travis fails unless it is

```
  local paths=$1
  paths=(${(s:/:)${paths//"~\/"/}})
```
2018-02-22 22:22:04 +04:00
Christo Kotze
2214124327 Updated truncatePath()
Added variable `delim_len` with test when delim=""
2018-02-22 22:17:26 +04:00
Christo Kotze
d31ac26caa Another Travis test 2018-02-20 01:14:06 +04:00
Christo Kotze
f10a7daab0 Another change to test Travis 2018-02-19 23:59:41 +04:00
Christo Kotze
04726d21ef Changed path splitting to test Travis 2018-02-19 23:52:07 +04:00
Christo Kotze
4996e955e0 Updated path splitting line
Works in the console, but Travis doesn't like it.
2018-02-19 22:18:59 +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
Tim Otlik
80176c263f
fix $OS variable for battery segment 2018-02-19 18:48:21 +01:00
Tim Otlik
ba0e940af3
arch icon was missing 2018-02-16 17:42:14 +01:00
Tim Otlik
da9ec721b7
add missing icons to compat set 2018-02-16 17:38:03 +01:00
Tim Otlik
bba8bb883e
add check of /etc/os-release for linux distros 2018-02-16 16:45:09 +01:00
Tim Otlik
845e74c5c3
added LINUX_*_ICON for several OS 2018-02-16 12:56:47 +01:00
Christian Höltje
cc4daa7698 Fix GIT and GITHUB nerdfont icon.
VCS_GIT_ICON and VCS_GIT_GITHUB_ICON were wrong.
2018-02-15 10:23:01 -05:00
Michael Louwrens
7fff5bd7a6 add new icons and add remote_sudo 2018-02-12 11:28:00 +02:00
Michael Louwrens
3893785873 try out sudo icon changes 2018-02-10 21:24:06 +02:00
Ben Hilburn
fd3d234354
Merge pull request #681 from Stazer/tcolor-warning
Added flag to ignore checking the term colors & lang settings
2018-01-30 16:44:27 -05:00
Ben Hilburn
8090d13962
Merge pull request #717 from onaforeignshore/date_segment
Added `prompt_date` and fixed segment comments
2018-01-24 14:21:01 -05:00
Christian Höltje
87988cea26 getColor() must always print result
This was causing colors specified as numbers to not be shown.
2018-01-19 22:06:01 -05:00
Justus Flerlage
3a605c7f62 renamed POWERLEVEL9K_CHECK_TERM_COLORS to POWERLEVEL9K_IGNORE_TERM_COLORS 2018-01-07 21:35:33 +01:00
Justus Flerlage
4db2eb0e16 Added flag for checking the term colors 2018-01-07 21:34:46 +01:00
Christo Kotze
2680eec848 Updates to functions/icons.zsh
Added date and time icons
2018-01-05 13:20:48 +04:00
Charles Peterson
0c943ac6d5 colors checking optimized and added tput for check the colors
moved to colors functions, because it makes sense.
2017-12-31 14:34:01 -06:00
Charles Peterson
4d18fdc6e9 fix for colors since the terminals so not always render named colors when using parameter expansion. 2017-12-15 15:42:35 -06:00
Ben Hilburn
ea05b4ebe6 Merge branch 'master' into next 2017-12-14 15:20:02 -05:00
Ben Hilburn
3fe9b83ebb
Merge pull request #688 from Stealthii/feature/stash-vcs
Add Stash naming support for Bitbucket Server
2017-12-04 20:09:58 -05:00
Ben Hilburn
3d79ca1adc
Merge pull request #684 from Artistan/color_names
Use color names, plus fixes
2017-12-04 19:33:57 -05:00
Daniel Porter
cbc7199dc4 Add Stash naming support for Bitbucket Server 2017-11-30 12:10:28 +00:00
Kentaro Hayashi
f154e75667 Disable alias of grep
If user defined alias of grep command with '-r' or '--recursive'
option, it causes a slow response of command line. It is not
unexpected behavior of vcs info.

This commit explicitly disables alias of grep to suppress side
effects.
2017-11-27 15:15:44 +09:00
Charles Peterson
264897a426 color names and fixes
- fix for packageName truncated by POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER
     - processing the pwd/HOME replacement ONCE.
     - fix tests for named colors
     - use color names by default to allow dark/light themes to adjust colors based on names
2017-11-25 12:46:45 -06:00
Ben Hilburn
2a7f3966c2 Merge branch 'master' into next 2017-10-06 21:43:43 -04:00
Ben Hilburn
01b554cda8 Adding a space after VCS_BRANCH_ICON by default 2017-10-06 21:43:25 -04:00