Commit Graph

236 Commits

Author SHA1 Message Date
John Schank
753189f173 #114 Add asdf ruby version to ruby version prompt
Followed established pattern for chruby and rbenv, adding the ruby
version number from asdf to the ruby prompt, only when the local
ruby version differs from the system ruby.

Note that asdf tracks its versions in a dot file (.tool-versions) so
the concept of what is global/system vs what is local simply depends
upon what file asdf is using to determine the correct version.
Fortunately, asdf reports the .tool-versions file when querying for
the current version.

The downside to this is that correct behavior of this patch will
depend upon the format asdf uses for their provenance string.

See https://github.com/asdf-vm/asdf for details about asdf
2017-12-24 14:25:13 -05:00
Justin Hileman
ab7123e063 Better faster stronger vcs ignore path matching 2017-12-23 19:52:07 -08:00
Justin Hileman
89cda861ba Style change, for consistency. 2017-12-23 19:39:26 -08:00
Justin Hileman
c68498fc79 string trim appears to be a hair faster than regex. 2017-12-23 19:39:10 -08:00
Justin Hileman
61325754bb 3-5x faster basename and dirname. 2017-12-23 19:28:52 -08:00
Justin Hileman
3d3690eb40 200x faster "am i root?" check. 2017-12-23 18:27:01 -08:00
Justin Hileman
1562614484 20x faster "has background jobs" flag. 2017-12-23 18:26:48 -08:00
Justin Hileman
b49a821a81 Minor style fixes 2017-12-23 05:07:56 -08:00
Justin Hileman
a31e4cea30 Update color previews helper.
- Include glyphs for all the glyphy segments
 - Make segment display names consistent with variable names
 - Add virtualgo segment
 - Update user@hostname segment to match current style
2017-12-19 12:33:50 -08:00
Justin Hileman
40bd268210 virtualgo segment cleanup
- Use a virtualgo color variable, even though it's the same as virtualenv.
- Switch to a cleaner nerd fonts go glyph.
- Add a non-nerd fonts go glyph (empty for now, but TBD if this changes).
2017-12-19 12:30:52 -08:00
Justin Hileman
201309db80 Don't set -g color schemes. 2017-12-19 12:21:28 -08:00
Justin Hileman
5b632d1cca Housekeeping. 2017-12-19 08:58:13 -08:00
Jelte Fennema
6916339c0f Add virtualgo support 2017-12-19 11:33:21 -05:00
Justin Hileman
b67c0bd910 Cleaner user/hostname display logic:
- Show if `theme_display_user` / `theme_display_hostname` is set to `yes`.
- Show both user and hostname when using SSH.
- Show user if `$default_user` is set and it isn't the current user.
2017-12-19 08:08:05 -08:00
Justin Hileman
4985cf8a4d Use bold to distinguish between username and hostname. 2017-12-19 08:08:00 -08:00
Ben
444b9a4827 Add support for choosing to show user and/or hostname in prompt (#71)
Add support for choosing to show user and/or hostname in prompt
2017-12-19 10:38:15 -05:00
Justin Hileman
500fc527a7 Add theme_newline_cursor = clean to docs. 2017-12-19 07:10:48 -08:00
Dietrich Daroch
f8012eae84 Add setting for clean multiline prompt 2017-12-19 10:08:06 -05:00
Justin Hileman
162062b3ac Clean up theme_vcs_ignore_paths implementation.
- realpath isn't necessary for $PWD
- match subdirectories of all ignore paths (otherwise the vcs segment is missing for the directory itself, but shows in subdirectories, which is weird)
- check whether $theme_vsc_ignore_paths is set to save a command substitution
2017-12-19 06:58:56 -08:00
Jesper Derehag
2673d2c39d Add support for ignoring VCS directories
Signed-off-by: Jesper Derehag <jderehag@hotmail.com>
2017-12-19 09:41:12 -05:00
Justin Hileman
4e602d98d7 Fix fish < 2.4 command duration regression
For real this time

Fixes #107
2017-10-01 18:30:49 -07:00
Justin Hileman
0f2a2d9ada Fix fish < 2.4 command duration regression.
See #105

Fixes #107
2017-09-29 07:33:48 -07:00
Justin Hileman
f4378582d6 Clean up some unused glyphs from the nerd fonts PR. 2017-09-07 16:53:17 -07:00
Justin Hileman
c24bcc443d Merge pull request #99 from nemoDreamer/git-glyphs
Git glyphs for Nerd Fonts
2017-09-07 16:50:47 -07:00
Justin Hileman
d87e9486f8 Fix command duration in Fish 3.x
Drive-by: fix string replacement regex for rounding off >1h.

Fixes #105
2017-09-02 23:30:53 -07:00
Justin Hileman
574190aa7b Merge pull request #101 from cmrn/force-display-vi
Better hybrid mode support for theme_display_vi
2017-08-07 22:25:26 -07:00
Cameron Moon
ee8e150424 rename flag from 'force' to 'yes' 2017-08-08 12:46:23 +10:00
Cameron Moon
22114be816 Add docs for theme_display_vi 2017-08-08 12:43:10 +10:00
Cameron Moon
d204ecdb5b Enable vi mode display for hybrid_bindings
Vi mode display should be enabled for people using the hybrid_bindings
function found in the fish documentation.
2017-08-08 12:20:14 +10:00
Cameron Moon
5337033ee4 Add option to force show vi mode 2017-08-08 12:19:10 +10:00
Philip Blyth
e2cf9a7d3b Removed trailing white-space 2017-08-02 23:45:27 +01:00
Philip Blyth
7e6543a3f0 Merge branch 'master' into git-glyphs 2017-07-18 14:49:45 -04:00
Justin Hileman
6658ea3db0 Merge pull request #95 from JingkaiTang/master
Redirect git warnings in __bobthefish_prompt_git to /dev/null
2017-07-11 06:22:13 -07:00
Jingkai Tang
9ec8d2cf24 Fix git warnings in __bobthefish_prompt_git 2017-07-10 15:04:40 +08:00
Justin Hileman
8f055587da Merge pull request #92 from druchoo/feature/cursor_on_a_new_line
Feature/cursor on a new line
2017-06-18 00:26:35 -04:00
Andrew Choo
0b3b522160 Implement newline cursor feature with one option instead of three
Per bobthecow:

"In keeping with bobthefish's goal to be opinionated but flexible,
let's do this with one option, not three. I'm leaning toward:

set -g theme_cursor_on_new_line yes
Then:

Always show the arrow at the end of the first line
Always show a minimalist arrow at the start of the next line"
2017-06-17 11:37:12 -04:00
Andrew Choo
8181b4526b Update README 2017-06-10 22:51:46 -04:00
Andrew Choo
176c3a7a69 Remove tabs 2017-06-10 22:51:31 -04:00
Andrew Choo
28dfc4f985 Add ability to have cursor start on a new line
In order for the right prompt to work the new line must start with at
least one character. A space is used for this purpose. This looks a bit
strange so added option to include the default right arrow glyph. Lastly,
added option to remove the right arrow glyph on the first (top) line.
2017-06-10 22:51:14 -04:00
Philip Blyth
dc151776b6 moar git-glyps! 2017-05-18 17:10:24 -04:00
Justin Hileman
950e4f1bc8 Merge pull request #90 from nemoDreamer/git-glyphs
Moved Git chars to glyph variables
2017-05-03 13:56:47 -07:00
Philip Blyth
f8c8dc7f07 Moved Git chars to glyph variables 2017-05-03 15:23:28 -04:00
Justin Hileman
87534a008a Fix issues when RBENV_ROOT/version doesn't exist.
Fixes #89
2017-04-26 20:12:30 -07:00
Justin Hileman
1eb4cf63ac Show vi mode prompt in hybrid key bindings too. 2017-03-07 05:23:18 -08:00
Justin Hileman
cbae8ad3fc Fix git worktree support.
Fixes #82
2017-02-28 07:09:38 -08:00
Justin Hileman
1d7cb9346f Merge pull request #83 from LaurentTreguier/patch-1
Display superuser glyph when using fakeroot
2017-02-27 11:55:09 -08:00
LaurentTreguier
cb6bb0ecb3 Use a different glyph color when using fakeroot 2017-02-27 20:44:01 +01:00
LaurentTreguier
23fdcb8048 Display superuser glyph when using fakeroot 2017-02-27 10:37:15 +01:00
Justin Hileman
750030a110 Remove a ton of set_color normal calls.
Eases the pain of fish-shell/fish-shell#3793 just a bit.

This _shouldn't_ ever look any different to the end user. I think.
2017-02-01 05:13:31 -08:00
Justin Hileman
9b414bc6fb Speed up git ahead/behind parsing by ~20% 2017-01-30 07:33:52 -08:00