1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-24 06:40:07 +00:00
Commit graph

74 commits

Author SHA1 Message Date
Kilobyte22
3c307e8479 Fixed an artifact from merge and some bugs in agnoster theme
For some reason i forgot to save the file in my editor, leading to the code not working. Luckily i looked through the changed files on github again and i found this. This is what happens if you don't care to actually test your code for once
Due to some more lack of testing i totall missed that my earlier fix did not work. This is now really fixed. (i should not write code when tired.)
2024-06-13 19:22:22 -05:00
Kilobyte22
61af29b967 Agnoster theme now properly handles bare git repos
Up until now the agnoster theme with enabled inline git branch display did not work properly for bare repos.
This was caused by `git rev-parse --show-toplevel` returning empty string for bare repos. In that case it now uses the git directory as root.
Your bare repo should be displayed properly (although you usually won't really navigate through a bare git repo, this is nice to have.
2024-06-13 19:21:53 -05:00
Kilobyte22
1ff9752c26 Fixed git background not showing correctly 2024-06-13 19:21:53 -05:00
Kilobyte
f2eb7138bc Fixed a few colors that were incorrectly set 2024-06-13 19:21:53 -05:00
Kilobyte22
461a18abf6 Changed Agnoster theme for more modularity
The agnoster theme now supports:

* Setting color for all kinds of elements, by setting an appropiate config variable to the color name in your zshrc
  Example: AGNOSTER_GIT_DIRTY_BG=red # Set the git prompt background color to red for dirty repos
* Allowing to separate the git root and the relative path in your prompt by setting AGNOSTER_GIT_INLINE to 'true'
  You will then have a segment for the git root (ie. ~/.oh-my-zsh) followed by the existing git branch segment (ie. master) and
  finally the relative directory path (ie. themes)
* By setting AGNOSTER_STATUS_RETVAL_NUMERIC to 'true', The return value in the status prompt will become a number instead of a cross.
2024-06-13 19:21:39 -05:00
Carlo Sala
c77a01dbe2
Revert "feat(agnoster): add anaconda env information (#12434)"
This reverts commit 309129f651.
2024-05-22 09:15:11 +02:00
robinverduijn
bbfb985359
chore(agnoster): typo (#12437) 2024-05-22 07:39:12 +02:00
Daniel Ochoja
309129f651
feat(agnoster): add anaconda env information (#12434) 2024-05-21 20:36:07 +02:00
Marc Cornellà
7ef3f49f97
fix(agnoster): prevent accidental alias use 2024-04-16 20:04:25 +02:00
vladislav doster
1d09c6bb0a
style: remove trailing whitespace (#12303) 2024-03-26 09:55:16 +01:00
jabunovoty
4188b22aea
feat(agnoster): add git tag to prompt (#8417)
Co-authored-by: Jakub Novotny <jakub.novotny@deutsche-boerse.com>
2023-07-25 10:31:24 +02:00
Dan Wallis
c189e8b40c
feat(agnoster): add remote-tracking status to prompt (#7209) 2022-12-09 19:10:04 +01:00
Marc Cornellà
9836aebe67
fix(agnoster): quote % in prompt functions 2022-01-03 13:50:52 +01:00
Marc Cornellà
02d07f3e3d
fix: use $USERNAME guaranteed to always be defined in zsh
Fixes #9701
2021-03-25 12:08:00 +01:00
Sreekanth S
c66d8a841d
agnoster: fix icon for unstaged git status (#9164) 2020-10-10 21:39:21 +02:00
Marc Cornellà
d14bddf6d7 agnoster: allow disabling AWS prompt with SHOW_AWS_PROMPT=false
Fixes #8040
2020-09-26 12:25:30 +02:00
Kyle Laker
d24a9dbccc
agnoster: fix git working tree check (#9072)
`git rev-parse --is-inside-work-tree` does not have a different exit
code when not within a work tree; the difference is in the output,
either "true" when in a work tree, or "false" when not.

The if was modified similarly to the check for the hide-status config,
which also parses command output rather than exit code.

Co-authored-by: Kyle Laker <klaker@easydynamics.com>
2020-07-01 19:05:53 +02:00
Marc Cornellà
c1b798aff3
agnoster: fix bzr prompt with breezy installed (#8646)
* Change indentation to 2 spaces in prompt_bzr function
* Check if in a bzr repository and optimize bzr calls in prompt_bzr
2020-02-19 00:16:54 +01:00
Marc Cornellà
89366be43f
Revert "agnoster: fix VIRTUAL_ENV_DISABLE_PROMPT logic (#8050)" (#8061)
This reverts commit 59c1ec80aa.
2019-08-06 18:01:32 +02:00
Rocky
59c1ec80aa agnoster: fix VIRTUAL_ENV_DISABLE_PROMPT logic (#8050)
Fixes #7985
2019-07-31 09:23:50 +02:00
David Dejori
8db0f352e8 agnoster: remove empty line (#7775) 2019-04-18 18:27:20 +02:00
Rob Lugton
83d1139432 agnoster: show AWS_PROFILE in prompt (#6621) 2019-03-23 19:20:28 +01:00
Marc Cornellà
2fce9a4d44
agnoster: use %n instead of $USER to fix quoting
Fixes #7268

With `$USER`, we'd need to quote it in case special characters like `\` are present in
the $USER value, like if the user is part of an AD domain.

With `%n` the quoting is done automatically by zsh.
See http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Login-information
2018-10-17 20:53:07 +02:00
Marc Cornellà
e107b85e3a
agnoster: fix prompt_status error (#6450)
This commit fixes the runtime error that says:

  prompt_status:2: symbols: attempt to assign array value to non-array

It trips over a local array which is not properly declared.
2018-09-26 17:23:31 +02:00
Marc Cornellà
a3d13eb76a
fix invalid syntax in old zsh versions 2018-09-26 17:19:59 +02:00
Carlo Dapor
afa8dc46ec Fix agnoster initial diagnostic error
This PR fixes the runtime error that displays this:

```log
prompt_status:2: symbols: attempt to assign array value to non-array
```.

It trips over a local array which is not properly declared.
2018-09-25 21:46:27 +02:00
Marten Seemann
150a3c9c83 agnoster: respect git config oh-my-zsh.hide-status (#6362) 2018-09-24 14:11:57 +02:00
Frederic Crozat
e4d2d27af4 Agnoster: solarized light variant (#4680)
* agnoster: do not hardcode black foreground.

This would allow easy customization when using light color schemes, like
solarized-light

* agnoster: implement light theme variant

Use same variable as in blinks theme, to detect if solarized theme used
is a light or dark one.
2018-08-19 22:28:37 +02:00
Janosch Schwalm
19b925e741 use https everywhere (#6574)
* use https everywhere

* use https links on the files that are left

Also, removed some broken links and updated redirections.
2018-08-07 20:42:01 +02:00
Marc Cornellà
8f3737f45b Revert fbcda4d
The PROMPT building method clashes with other themes and
plugins that modify the PROMPT variable.

Also reverted the $jobstates trick due to it not working
inside $PROMPT.
2018-05-23 11:33:34 +02:00
Andrew Baumann
fbcda4d5a9 agnoster: cut down on fork/execs improve performance when not in a repo (#6210)
* agnoster: improve perf with use of $jobstates (zsh/parameter module)

This saves multiple fork/execs (for the subshell and wc) each
time the prompt is rendered

* agnoster: compute git repo_path only when in a git repo

this avoids needlessly invoking git twice every time we render the prompt

* agnoster: avoid subshell when rendering prompt

Rather than forking a subshell to print the prompt, construct it
incrementally by appending to $PROMPT.

v2: fix incorrect CURRENT_BG
v3: fix bzr and hg prompting

Thanks @mcornella for the help.
2018-05-17 14:46:27 +02:00
Dawnflash Lightstring
7e5483d672 Add check for git and bzr to agnoster theme
Plugin command-not-found on Arch Linux returns 0 if git or bzr is found in repos, hence outputting unwanted pkgfile output.
Checking if the commands exist first fixes all such issues.
2016-09-21 12:20:08 +02:00
grindhold
d1ce70f685 added support for bazaar in agnoster theme (#5016)
the agnoster theme is now able to render basic information
if the user is currently residing inside a bazaar folder.
if so, it will render a green promt segment with "bzr" and
the current revision number in it. if there are untracked
files, the bar will be rendered in yellow. if there are
changes to already tracked files, a + character will be
printed.
2016-09-19 20:00:42 -07:00
Anton
a7e30b26ba Fix hg call when missing on archlinux with command-not-found (#5218) 2016-07-22 15:04:35 +02:00
Marc Cornellà
8d6fccef81 Merge pull request #4589 from apjanke/agnoster-powerline-char-stronger-warning
agnoster theme: stronger warning about changing SEGMENT_SEPARATOR character
2015-12-15 02:08:45 +01:00
Justin LeFebvre
76c423862f I noticed that for certain projects with unstaged changed I would get a 'U' character instead of the '●' character. This should fix that. 2015-11-07 20:05:30 -05:00
Andrew Janke
cc116f65d6 agnoster: stronger warning about changing SEGMENT_SEPARATOR character 2015-11-06 19:44:26 -05:00
Robby Russell
51677da85f Merge pull request #4091 from apjanke/agnoster-clarify-powerline
agnoster: Use current Powerline chars everywhere, and clarify behavior
2015-09-19 09:05:57 -07:00
Brian Degenhardt
b875df8970 agnoster: speed up git prompt
Problem

On detached-refs, the git prompt is very slow because it uses a command
to output all refs, which takes 32s on the twitter internal git repo.

Solution

Use git-rev-parse instead of git-show-ref to only output the head ref.
Runtime drops to 0.03 seconds.

Note

Interestingly, git-rev-parse isn't slow without the --head arguement so
I'll probably be cooking up a patch for the git team to speed this up
eventually, but it's still pointless to sigpipe git as it walks the
filesystem.
2015-07-27 14:19:23 -07:00
Andrew Janke
c82deedc97 agnoster: Protect Unicode esape sequences with local LC_* settings 2015-07-03 01:46:34 -04:00
Andrew Janke
4cd281ba1b agnoster: Define Powerline chars with escape sequence, and use same character on
all platforms. Add clarifying comments. This makes everything consistent
with the current Powerline-patched fonts definitions.
2015-06-25 20:13:59 -04:00
Robby Russell
3d2bf227ea Merge pull request #4001 from ivanfoo/fixOddCharsOnMac
Fixed odd chars on mac for agnoster theme
2015-06-14 22:01:07 -07:00
ivanfoo
c6460ef3e7 Fixed odd chars on mac for agnoster theme 2015-06-15 00:25:22 +02:00
Mark Mendoza
a98501d2ce Grep bug in Agnoster 2015-06-10 14:36:52 +02:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Marc Cornellà
74177c5320 Change all whoami calls for $USER variable
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
2014-11-06 18:33:56 +01:00
tcasparro
53323abdb1 Added git mode support for merging, rebasing, and bisecting
<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
2014-03-26 10:37:56 -07:00
mrbfrank
685ea4a361 theme agnoster: remove trailing space
re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759
2014-01-29 13:35:21 -06:00
mrbfrank
7daaa188da corrected branch character
changed ± to 
2014-01-28 21:54:00 -06:00
mrbfrank
78ffa71cb6 updated url to latest powerline-patched fonts
clearing up some confusion in issue#1906
2014-01-28 18:02:40 -06:00