Commit Graph

429 Commits

Author SHA1 Message Date
Justin Hileman
152f04febd Merge branch 'master' into screen 2024-03-09 14:19:30 -05:00
Justin Hileman
c8feda5fa9 Merge pull request #356 from SmollClover/color-scheme-catppuccin
Add Catppuccin color schemes
2024-03-09 10:25:56 -05:00
Justin Hileman
6b8fe17b7e Merge branch 'master' into color-scheme-catppuccin 2024-03-09 10:25:49 -05:00
Justin Hileman
d277125050 Update jellybeans 2024-03-09 10:23:46 -05:00
Justin Hileman
778b501583 Merge pull request #182 from chandlerc/jellybeans
Add a colorscheme inspired by the Jellybeans colorscheme for Vim.
2024-03-09 10:23:21 -05:00
Justin Hileman
83ca0de82f Merge branch 'master' into jellybeans 2024-03-09 10:23:11 -05:00
Justin Hileman
45cd2d790a Merge pull request #280 from josselinauguste/master
Add gruvbox light theme
2024-03-09 10:11:10 -05:00
Justin Hileman
6fc71551dd Merge pull request #333 from pindab0ter/feature/darcula-colors
Add color scheme using JetBrains' Darcula's colors
2024-03-09 10:10:20 -05:00
Justin Hileman
8669f50569 Don't show detached branch ref if we've already shown a tag. 2024-03-05 19:53:54 -05:00
Justin Hileman
f5ba0ce022 Merge pull request #311 from zztalker/patch-1
show git tags if any
2024-03-05 19:53:18 -05:00
Justin Hileman
6e0ceba5db Use $git_root_dir (to support WSL, worktrees, etc) for untracked files. 2024-03-05 19:36:57 -05:00
Evan Dean
8821f55849 Use repo root when looking for untracked files
Currently, if you add a new file to a directory, then cd to a sibling directory, the untracked glyph will not appear. This is inconsistent with the behavior of the other git colors and flags, e.g. if you modify a file and cd into a sibling directory, the prompt will still be red and the dirty working directory glyph will still appear.

This PR modifies the query used to find untracked files so it searches from the repo root instead of the current directory.
2024-03-05 19:34:15 -05:00
Justin Hileman
7216de5cac Formatting and a comment. 2024-03-05 19:27:31 -05:00
Justin Hileman
e711caac72 Merge pull request #336 from millimoose/patch-1
Support using Windows git under WSL
2024-03-05 18:46:02 -05:00
Justin Hileman
bbb7cff04d Handle missing Python more gracefully.
Fixes #335
2024-03-05 18:21:39 -05:00
Justin Hileman
4beb1bc3b4 Update README config example. 2024-03-05 18:01:34 -05:00
Justin Hileman
2e0f04b555 Support init.defaultBranch Git configuration option. 2024-03-05 17:57:41 -05:00
Justin Hileman
2b060736b3 Update configuration option documentation.
- Clean up README formatting.
- Move all configuration documentation from functions into the README.
- Add missing documentation for a bunch of other options.

Fixes #337
2024-03-05 17:57:16 -05:00
Justin Hileman
1a74ffd598 Update config path examples. 2024-03-05 15:55:21 -05:00
Justin Hileman
25b9c582c9 Allow hiding project parent paths.
Set `theme_show_project_parent` to `no` to suppress the parent directory and path entirely when inside a Git or Mercurial project.

Fixes #358
2024-03-05 15:20:50 -05:00
Justin Hileman
39cf45635b Merge pull request #357 from MaxSchambach/feature/hide-python-version
Add option to hide python version
2024-03-05 10:16:27 -05:00
Justin Hileman
0f7bca6df5 Merge pull request #327 from seanhagen/master
Add Go prompt
2024-03-05 10:03:27 -05:00
Kristian Rekstad
dc70af567e Use the new AWS_CREDENTIAL_EXPIRATION env var for aws-vault
Fixes #350
2024-03-04 16:29:15 -05:00
Maximilian Schambach
1ec3bba060 Remove old option from readme 2024-02-12 10:43:14 +01:00
Maximilian Schambach
01c546af51 Update virtualenv python version prompt 2024-02-12 10:42:09 +01:00
Maximilian Schambach
7ff4d6a3b3 Add option to hide python version 2024-02-09 12:54:58 +01:00
Clover
077e425d52 Add Catppuccin variants to bobthefish_display_colors 2024-01-04 22:44:54 +01:00
Clover
f3803bb20c Add README entry for Catppuccin color schemes 2024-01-04 22:39:07 +01:00
Clover
ba0e0dfbdc Add Catppuccin Mocha color scheme 2024-01-04 22:12:57 +01:00
Clover
ce7e20f61d Add Catppuccin Macchiato color scheme 2024-01-04 22:12:25 +01:00
Clover
dbba0c90a6 Add Catppuccin Frappe color scheme 2024-01-04 22:11:55 +01:00
Clover
11eef9f3fd Add Catppuccin Latte color scheme 2024-01-04 22:06:21 +01:00
Sergey Slipchenko
05c0765c4e Use status current-command for title
Why:

1. `$_` is marked as deprecated
  https://fishshell.com/docs/current/language.html#envvar-_
2. `$_` contains wrong process name in cases like this one:

  ```fish
  sleep 1000 # `sleep` is the process, now press Ctrl-Z to suspend
  fg # unsuspend it, now `fg` is shown as the process
  ```

  `status current-command` will show `sleep` instead, which makes more
  sense.
2023-12-18 18:42:13 -05:00
Ramon Rüttimann
c2c47dc964 Fix pwd calculation for git worktrees
A refactor changed this block from a `set git_dir $PWD` to
`set git_dir $real_pwd`, but as `real_pwd` is a "static" variable and
not dynamically computed, this breaks within the `pushd` / `popd` flow.

Instead of using `$real_pwd`, we need to compute the *current* directory
by calling `__bobthefish_pwd` again.

Fixes #249.
2023-06-16 09:21:00 -04:00
Taylor "Nekroze" Lawson
ed896b65c3 Fix error when k8s context defined but namespace isn't (#343)
Fixed simple mistake of not double qouting namespace so when
empty -z consumed -o as its input.
2023-05-07 22:42:24 -04:00
Justin Hileman
76cac81206 Don't overwrite $hostname
Fixes #339
2023-03-26 10:22:17 -04:00
Taylor "Nekroze" Lawson
06ebe3b9af Hide k8s context or namespace when they are 'default' (#338) 2023-03-15 13:12:26 -04:00
Sean Patrick Hagen
9ff7cd3f3c Remove backslash to remove grep warning
New in grep 3.8 apparently is this warning: `grep: warning: stray \ before white
space`.

Explanation: https://github.com/koalaman/shellcheck/issues/2573
2022-10-12 14:05:37 -07:00
David Vallner
9588b3fe49 Support using Windows git under WSL
Linux Git is unusably slow when accessing repos in the Windows filesystem when using WSL; using Windows Git fixes this issue but it breaks the prompt since Windows Git returns Windows paths.

This converts the path to the equivalent POSIX path which restores the prompt under this setup; it should just return the original path when passed a POSIX path, and do nothing on non-WSL systems.
2022-09-30 17:03:48 +02:00
Hans van Luttikhuizen-Ross
96584de3df Add color scheme using JetBrains' Darcula's colors 2022-09-12 11:09:09 +02:00
Justin Hileman
2dcfcab653 Fix invalid range in node segment
Fixes #326
2022-08-01 21:41:04 -06:00
Sean Patrick Hagen
4828218af5 Simplifying the prompt 2022-06-18 14:08:52 -07:00
Sean Patrick Hagen
d25d03ab4a Better color setting for prompt 2022-06-17 13:01:51 -07:00
Sean Patrick Hagen
bb9c3f1946 Ensure we go up a directory each iteration
Whoops
2022-06-17 12:58:52 -07:00
Sean Patrick Hagen
92a2e46734 Update loop for finding go.mod
Also had to move `set -l real_pwd (__bobthefish_pwd)` above the prompts so that
`$real_pwd` is available inside the prompt function
2022-06-17 12:48:58 -07:00
Sean Patrick Hagen
fffbde266f Better "find directory", copied from hg code 2022-06-17 12:41:49 -07:00
Sean Patrick Hagen
27f900076e Some prompt cleanup 2022-06-17 12:40:18 -07:00
Sean Patrick Hagen
69e58a2f68 Better greping 2022-06-17 12:40:13 -07:00
Sean Patrick Hagen
20eb30bf4f Removing some un-needed code 2022-06-17 12:26:05 -07:00
Sean Patrick Hagen
64a6f8ee18 More logic cleanup/fixing 2022-06-17 12:21:52 -07:00