T31M/ubuntu-fish-dotfiles
0
1
Fork 0
Code Pull Requests Releases Activity

prompt changes

Browse Source
This commit is contained in:
T31M
2020-06-07 16:58:08 +02:00
parent 55b092bc40
commit c4e29b5de3
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fish/config.fish
View File

@ -1,5 +1,13 @@
# pyenv config # deno config
set -gx PYENV_ROOT $HOME/.pyenv set -Ux DENO_INSTALL /home/t31m/.deno
set -gx PATH $PYENV_ROOT/bin $PATH set -Ux PATH $DENO_INSTALL/bin $PATH
status --is-interactive; and pyenv init - | source
status --is-interactive; and pyenv virtualenv-init - | source # pipx
if test (command -v pipx)
register-python-argcomplete --shell fish pipx | .
end
# pyenv init
if command -v pyenv 1>/dev/null 2>&1
pyenv init - | source
end

23
fish/theme-t31m/t31m_prompt.fish
View File

@ -11,13 +11,24 @@ function prompt::awsenv
end end
function prompt::pyenv function prompt::pyenv
if test -n "$PYENV_VERSION"
echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)"$PYENV_VERSION"(off)"@"(python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")(yellow)"]"(off) if test (command -v python)
set python_version (python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")
else
set python_version ""
end
#if test -n "$python_version"
# echo -n -s (yellow)(printf '%s' \U1F40D)"["(off)"$python_version"(yellow)"]"(off)
# else if test (command -v pyenv) # else if test (command -v pyenv)
else if test -n "$VIRTUAL_ENV" if set -q VIRTUAL_ENV
echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(pyenv version-name | sed 's/:.*$//' )(off)"@"(python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")(yellow)"]"(off) set venv $VIRTUALENV | grep -Eo '[^/]+/?$' | cut -d / -f1
else if test (command -v python) echo -n -s (yellow)(printf '%s' \U1F40D)"[($venv"(cyan)(pyenv version-name | sed 's/:.*$//')(yellow)")"(off)"@$python_version"(yellow)"]"(off)
echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(python -c "import sys;t='{v[0]}.{v[1]}.{v[2]}'.format(v=list(sys.version_info[:3]));sys.stdout.write(t)")(yellow)"]"(off) else if test -n "$PYENV_VERSION"; and [ "$PYENV_VERSION" != "$python_version" ]
# echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(pyenv version-name | sed 's/:.*$//' )(off)"@$python_version"(yellow)"]"(off)
echo -n -s (yellow)(printf '%s' \U1F40D)"["(cyan)(pyenv version-name )(off)"@$python_version"(yellow)"]"(off)
else if test -n "$python_version"
echo -n -s (yellow)(printf '%s' \U1F40D)"["(off)$python_version(yellow)"]"(off)
end end
end end

2
fish_setup.sh
View File

@ -32,6 +32,8 @@ if test -f "~/.config/fish/fishfile"; then
fi fi
cp fish/fishfile ~/.config/fish/ cp fish/fishfile ~/.config/fish/
echo "set --export PYENV_ROOT $HOME/.pyenv" > ~/.config/fish/conf.d/pyenv.fish
# install packages from fishfile # install packages from fishfile
fish -c "fisher self-update" fish -c "fisher self-update"
fish -c fisher fish -c fisher