phg/.files
0
0
Fork 0
mirror of https://github.com/shokinn/.files.git synced 2025-11-03 20:18:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove fig; fix pyenv initialization

Browse source
This commit is contained in:
Philip Henning 2023-06-02 14:46:45 +02:00
parent 66cab63945
commit cd10055f53
2 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dotfiles/z_profile
View file

@ -1,8 +1,3 @@
{%@@ if profile == 'WVDEWOBMC001307' @@%}
# Fig pre block. Keep at the top of this file.
[[ -f "$HOME/.fig/shell/zprofile.pre.zsh" ]] && . "$HOME/.fig/shell/zprofile.pre.zsh"
{%@@ endif @@%}
# #
# {{@@ header() @@}} # {{@@ header() @@}}
# #
@ -21,9 +16,10 @@ export EDITOR
export PATH="$PATH:/Users/vw6au89/Library/Application Support/JetBrains/Toolbox/scripts" export PATH="$PATH:/Users/vw6au89/Library/Application Support/JetBrains/Toolbox/scripts"
{%@@ endif @@%} {%@@ endif @@%}
# Initialize pyenv
[[ $(command -v pyenv) ]] && export PYENV_ROOT="$HOME/.pyenv" [[ $(command -v pyenv) ]] && export PYENV_ROOT="$HOME/.pyenv"
[[ $(command -v pyenv) ]] && export PATH="$PYENV_ROOT/bin:$PATH" [[ $(command -v pyenv) ]] && command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
[[ $(command -v pyenv) ]] && eval "$(pyenv init --path)" [[ $(command -v pyenv) ]] && eval "$(pyenv init -)"
{%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' @@%} {%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' @@%}
# Set DOTNET_ROOT enviroment variable # Set DOTNET_ROOT enviroment variable
@ -41,8 +37,3 @@ export XDG_CONFIG_HOME
# Run VPN-Kit alpine VM to route traffic through Windows and if connected through VPNs # Run VPN-Kit alpine VM to route traffic through Windows and if connected through VPNs
wsl.exe -d wsl-vpnkit service wsl-vpnkit start wsl.exe -d wsl-vpnkit service wsl-vpnkit start
{%@@ endif @@%} {%@@ endif @@%}
{%@@ if profile == 'WVDEWOBMC001307' @@%}
# Fig post block. Keep at the bottom of this file.
[[ -f "$HOME/.fig/shell/zprofile.post.zsh" ]] && . "$HOME/.fig/shell/zprofile.post.zsh"
{%@@ endif @@%}

12
dotfiles/zshrc
View file

@ -1,8 +1,3 @@
{%@@ if profile == 'WVDEWOBMC001307' @@%}
# Fig pre block. Keep at the top of this file.
[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh"
{%@@ endif @@%}
# #
# {{@@ header() @@}} # {{@@ header() @@}}
# #
@ -163,6 +158,9 @@ source ${ZSH}/oh-my-zsh.sh
alias ssh-no-check="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" alias ssh-no-check="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
# Initialize pyenv # Initialize pyenv
[[ $(command -v pyenv) ]] && export PYENV_ROOT="$HOME/.pyenv"
[[ $(command -v pyenv) ]] && command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
[[ $(command -v pyenv) ]] && eval "$(pyenv init -)"
# Enable pipx completions # Enable pipx completions
if [ -f "{{@@ env['HOME'] @@}}/.local/bin/pipx" ]; then if [ -f "{{@@ env['HOME'] @@}}/.local/bin/pipx" ]; then
@ -254,10 +252,6 @@ function setVpnGitRemote(){
echo -e "🔗 git remote (${HIGHLIGHT}${ORIGIN}${RESET}): ${HIGHLIGHT}${repo}${RESET}\n" echo -e "🔗 git remote (${HIGHLIGHT}${ORIGIN}${RESET}): ${HIGHLIGHT}${repo}${RESET}\n"
} }
# Fig post block. Keep at the bottom of this file.
[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh"
{%@@ endif @@%} {%@@ endif @@%}
{%@@ if profile == 'ymir' @@%} {%@@ if profile == 'ymir' @@%}