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

238 commits

Author SHA1 Message Date
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
Max O'Cull
fcea56be5c Fix Linux distribution detection 2018-05-18 20:12:05 -04: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
Ben Hilburn
b87c3b85ac Updating Dropbox icon for non-awesome fonts 2017-10-06 20:41:51 -04:00
Chris Chou
5657fe6ac7 #632: Indicate Rust or (rust) for rust_version segment only if icon is unavailable 2017-10-06 09:47:37 +13:00
Simon Pettersson
36b833aae3 Corrected awesome-fontconfig lock icon 2017-10-05 21:57:08 +02:00
Timothy Earley
81cbd65142 Added dropbox segment 2017-10-01 17:53:07 +02:00
Ben Hilburn
50f0a94642 Slight tweaks to the awesome-mapped-fontconfig error message. 2017-08-27 12:41:25 -04:00
Ben Hilburn
47e32f913d Merge branch 'awesome-font-mapping' of https://github.com/pfrybar/powerlevel9k into pfrybar-awesome-font-mapping 2017-08-27 12:34:36 -04:00
Paul Frybarger
0f58a4950c similar to PR #472, fixing for awesome font mappings 2017-08-13 01:25:29 +02:00
Ben Hilburn
02332d5962 Merge branch 'master' into next 2017-08-12 13:46:08 -04:00
Giorgi Gzirishvili
1ded7c2c90 Update OK_ICON weight to march FAIL_ICON
Fixes #576.
2017-07-28 02:50:31 +04:00
Diego Rabatone Oliveira
e3530de3dc
Fix reference for python icon.
While using awesome-terminal-fonts it is recommended to use `\ue63c` to
reference python icon instead of `\U1F40D` (that wasn't even working).
Ref:
https://github.com/gabrielelana/awesome-terminal-fonts/issues/38#issuecomment-302939451
2017-07-22 12:51:39 -03:00
Christian Höltje
8626d07d60 Merge remote-tracking branch 'origin/master' into pr/merge-master 2017-07-13 00:42:15 -04:00
Dominik Ritter
a234636982 Fix empty delimiter
Even if the delimiter is empty, the min length should be 1.
This fixes #558
2017-07-12 03:29:31 +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
c11c3a55de use p9k print_icon for kubecontext segment 2017-05-26 13:27:17 -05:00
Jason Hutchinson
99c9ba9367 add Gopher icon to go_version segment 2017-05-25 16:38:14 -05:00
Ben Hilburn
e844fc4c72 Incorporating @dritter's feedback from #524. 2017-05-22 21:12:59 -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
guixxx
e6c37b6bc5 Icons for Windows/Cygwin + Refixes 32-bit support 2017-05-07 10:34:54 -03: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
421f506bf8 Improve logic 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
Ben Hilburn
67ef7892de Changing name of nerdfont option per #458 2017-04-03 20:50:23 -04:00
Ben Hilburn
0132c5dc35 Merge pull request #446 from dritter/fix_442
Protect special characters in various modes
2017-03-20 21:57:36 -04:00
Ben Hilburn
33b41ced80 Merge pull request #449 from dritter/ordered_icons_list
Sort the output of `get_icon_names` alphabetically
2017-03-20 18:52:52 -07:00
Ben Hilburn
dca0f7f917 nerdfont config: changing order, removing duplicates 2017-03-20 21:49:17 -04:00
Luca Corsini
be12385cce added missing icons 2017-03-20 09:28:43 +01:00
Dominik Ritter
f89104f68f Improve get_icon_names function
As this function gets more and more important, it now checks for
overrides the user has made and prints these icons instead. At least
unless the first parameter is not set to "original". Then it will print
the default icons.
2017-03-19 17:55:11 +01:00
Dominik Ritter
e42cb50052 Sort the output of get_icon_names alphabetically 2017-03-19 17:23:48 +01:00
Dominik Ritter
d9374412e6 Add default locale to protect the special characters 2017-03-18 17:09:51 +01:00
Ben Hilburn
e86ff4ccb7 Fixing AWS icon for nerdfonts, fixing branch icon space. 2017-03-08 13:25:06 -05:00
David Paz
b59d73c039 Hide error when no origin in git repo
Fix git ls-remote call to match as in sugessted code for redirect
error to null.
2017-02-24 10:12:35 +01:00
Riadh Habbachi
02df303651 Update awesome-fontconfig SERVER_ICON to  2017-02-23 12:36:54 -05:00
Ben Hilburn
864979ed27 nerdfont: updating name for nerdfont selection 2017-02-23 12:32:42 -05:00
Ben Hilburn
163b2f4583 Merge branch 'nerdfont' of https://github.com/kaymmm/powerlevel9k into kaymmm-nerdfont 2017-02-23 12:21:03 -05:00
Dominik Ritter
875dec5dae Merge branch 'next' into execution_time 2017-02-14 21:42:41 +01:00
Ben Hilburn
3de352b296 Adding ssh segment back with some minor changes. 2017-02-13 22:07:23 -05: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
610fd4fbfd Merge branch 'next' into benoits_dir_segment 2017-02-12 18:59:21 +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
ebf808c533 Add dir_truncate_root option 2017-01-31 23:47:49 +01:00
Keith Miyake
a115035d27 fix spacing on battery icon 2017-01-26 17:28:23 -05:00
Keith Miyake
60bb6ce0b3 Merge branch 'next' of https://github.com/bhilburn/powerlevel9k into nerdfont
* 'next' of https://github.com/bhilburn/powerlevel9k:
  CHANGELOG: Updating to reflect work on `next`
  README: fixing name of `detect-virt` to `detect_virt`
  README: default segment list was no longer accurate
  updating changelog for segment name change `disk_usage`
  incorportaing feedback from review on `hdd_usage` segment
  Fix swift segment
  Updating the readme wih `hdd_usage` details.
  changing `hdd_usage` to actually show usage
  Moving `HDD_ICON` definition to consistent spot.
  Fix
  Fix
  Fix
  Fix
  Fix
  Fix
  Change colors
  Add anion155's HDD segment
2017-01-26 13:02:42 -05:00
Ben Hilburn
92b1b6235a Merge pull request #378 from bhilburn/anion155-hdd-segment
Adding new disk_usage segment, based on Anion155's hdd_usage
2017-01-21 21:56:27 -05:00
Ben Hilburn
7bd2585371 incorportaing feedback from review on hdd_usage segment 2017-01-21 21:34:55 -05:00
Keith Miyake
f9d2f3a3a5 Merge remote-tracking branch 'upstream/next' into nerdfont
* upstream/next: (41 commits)
  vcs icons: fixing branch spacing and remote icon in fontawesome
  same deal for the "FAIL_ICON"!
  fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken
  Change powerlevel9k_init to prompt_powerlevel_setup
  Fix MacOS specific battery segment logic.
  Minor fix-up to the README.
  Adding license note about the new logo.
  more typos
  Adding the new logo to the README!
  fixed typo fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
  fixed typo
  reverted testing value to default value
  added link to segemnt documenation in README
  fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real
  fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty
  added README section for public_ip segment
  added the ability to specify and only attempt a particular method
  Add Changelog for v0.5.0
  added configurable string when there is no IP
  updated some comments changed some offline behavior
  ...
2017-01-21 13:40:51 -08:00
Ben Hilburn
9ead1c1548 Merge branch 'master' into next 2017-01-20 22:47:29 -05:00
Ben Hilburn
d2c0a62445 vcs icons: fixing branch spacing and remote icon in fontawesome 2017-01-20 22:45:35 -05:00