1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-26 22:10:06 +00:00
Commit graph

227 commits

Author SHA1 Message Date
Dominik Ritter
40e04e053c Parse IPs properly
This is done if we want to show a public IP, internal IP, or a VPN.
In the VPN case, what we actually want is to display an indicator
that a VPN is active, instead of the VPN IP itself. We parse the
IP here anyway, because we want to save some specific code there.
2019-02-03 19:20:14 +01:00
Matthew Judy
574ee6dc1c Port #1071 to master (fatal errors emitted by untracked file check in vcs.zsh) 2018-11-17 17:13:25 -05:00
Dominik Ritter
724781e896
Merge pull request #1065 from dritter/protect_locale
Protect locale
2018-11-17 01:39:38 +01:00
Dominik Ritter
fd660f4b92 Fix checking for untracked files
Now the untracked files are always checked from
the root folder of the repo.
2018-11-12 00:24:29 +01:00
Dominik Ritter
a6e60def4b Fix stashes display
Changing directories while checking for untracked files broke
the display of git stashes. The hook was not called any more.
This is why we disabled checking for untracked files within a
.git folder.
2018-11-12 00:15:52 +01:00
Dominik Ritter
645b974677 Fix error if user cds into a .git directory
In this case is was previously not possible to get the untracked
status. Now we temporarily change the directory to the repo root
folder and then get the list of untracked files.
2018-11-12 00:13:35 +01:00
Dominik Ritter
a90258a9ee Avoid warning when inside of .git dir
We cannot detect untracked files when we are inside of
a .git directory.
2018-11-11 23:17:33 +01:00
Dominik Ritter
3256258ebf Count stashes via ZSH 2018-11-11 23:16:44 +01:00
Dominik Ritter
2038e2650c Avoid aliases 2018-11-06 01:12:19 +01:00
Dominik Ritter
48f0cc11ef Get rid of externals when truncating branch name 2018-11-06 01:11:31 +01:00
Dominik Ritter
3d960a5169 Protect users locale 2018-11-05 02:19:06 +01:00
Dominik Ritter
c3f9d04354 When checking for untracked or modified files, take submodules into account 2018-11-03 03:23:23 +01:00
Dominik Ritter
44b4b66925 Speedup VCS segment
Now the untracked files are detected via `git ls-files`, which is
much faster than `git status`. Additionally, we flipped the default
for checking submodules. They are now NOT checked by default, as most
users probably do not use git submodules.
2018-11-03 03:21:47 +01:00
Dominik Ritter
d07507c1eb Make use of git dir determined by VCS_INFO subsystem
instead of determine the git dir manually.
2018-11-03 03:11:51 +01:00
Dominik Ritter
9a67ca5bc3 Get branch name from VCS_INFO subsystem when collecting remote branch 2018-11-03 03:10:53 +01:00
Dominik Ritter
fea5f616d1 Get branch name from VCS_INFO subsystem when collecting ahead/behind info 2018-11-03 03:08:32 +01:00
Dominik Ritter
cd0ad84b01 Get rid of wc dependency when showing ahead/behind info 2018-11-03 03:06:49 +01:00
Dominik Ritter
8e966e3636 Change bright colors to old color codes
Before this, there was no difference in that colors, as we always used
the bright color codes.
2018-08-17 18:52:23 +02:00
Dominik Ritter
6e78f7e793 Merge remote-tracking branch 'eloo/master' into prepare_066 2018-08-12 00:02:23 +02:00
Joseph Weigl
34bf8edc89
Add fallback icon for linux distros 2018-08-11 16:18:23 +02:00
Dominik Ritter
c7e543ff23 Merge branch 'fix_colors' into prepare_066 2018-08-08 02:03:03 +02:00
Dominik Ritter
424d41761d Write comparison with double quotes 2018-08-08 01:11:44 +02:00
Dominik Ritter
39fe5217c6 Pad colors with zeroes 2018-08-08 01:00:43 +02:00
Dominik Ritter
19235b2359 Always use color codes instead of named colors
This Code was to check if the color is supported by the Terminal
Emulator. This is not necessary, if we always use the numerical code.
This makes the code much clearer.
2018-08-08 00:40:41 +02:00
Dominik Ritter
beacb0ad35 Fix bright colors
Remove old code that set bright colors equal to normal colors. This code
was ancient and led to bright colors being unusable. The code originates
from 0e37d8ef86.
2018-08-08 00:40:05 +02:00
Dominik Ritter
0acede2fdc Make colors a global array
That way it must not be defined in every function call.
2018-08-07 21:36:49 +02:00
Dominik Ritter
eadbd09368 Write comparisons with double equals 2018-08-07 21:35:29 +02:00
Dominik Ritter
9cf76f99a5 Fix bright colors
Remove old code that set bright colors equal to normal colors. This code
was ancient and led to bright colors being unusable. The code originates
from 0e37d8ef86.
2018-08-07 21:33:09 +02:00
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
e35f7a0c48 Merge branch 'fix_colors' into prepare_066 2018-08-06 00:56:29 +02:00
Dominik Ritter
345cf87b8f Add missing colors to fix color comparison
Added magenta and cyan that were only present with their alternative
names (fuchsia and aqua). See https://en.wikipedia.org/wiki/X11_color_names#Clashes_between_web_and_X11_colors_in_the_CSS_color_scheme
2018-07-24 00:51:37 +02:00
Ythildir
5ce384fb31 Test more readable 2018-07-22 00:21:59 +02:00
Ythildir
e39e024e74 Resolve #918 Transparent background
Now function getColorCode consider value 'none' like a good value.
When it's use to set background the segment become transparent
2018-07-21 22:52:08 +02:00
Ben Klein
45b0d68ec4
Replace typeset check with shellvar flag
More performance without changing functionality.
2018-07-12 15:37:33 -04:00
blackb1rd
592e765a95 Fix os detection for MSYS2 2018-06-30 22:20:02 +07:00
Dominik Ritter
595bdb4fa3 Use cog glyph on all modes 2018-06-17 22:57:13 +02:00
Dominik Ritter
a2d8cccd09 Add a Laravel version segment 2018-06-07 01:54:32 +02:00
Dominik Ritter
5eedb2586b Merge remote-tracking branch 'Maxattax97/next' into staging_065 2018-06-07 01:31:16 +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
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