Fix gestione hostname

This commit is contained in:
Fabio Scotto di Santolo
2022-09-10 12:49:22 +02:00
parent 19a0c575c1
commit 4849b54eab
8 changed files with 22 additions and 39 deletions

View File

@@ -1,5 +1,5 @@
# Fig pre block. Keep at the top of this file. # Fig pre block. Keep at the top of this file.
[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && . "$HOME/.fig/shell/bashrc.pre.bash" [[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
# #
# ~/.bashrc # ~/.bashrc
# #
@@ -201,4 +201,4 @@ export SDKMAN_DIR="/home/plague/.sdkman"
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
# Fig post block. Keep at the bottom of this file. # Fig post block. Keep at the bottom of this file.
[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && . "$HOME/.fig/shell/bashrc.post.bash" [[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"

View File

@@ -5,3 +5,4 @@ if test -d $HOME/.profile.d/; then
done done
unset profile unset profile
fi fi

View File

@@ -1,9 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ "$HOST" == 'nymph.localhost' ]]; then export GOPATH=$HOME/Library/Go
export GOPATH=$HOME/Go
elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
export GOPATH=$HOME/Library/Go
fi
export GOBIN=$GOPATH/bin export GOBIN=$GOPATH/bin

View File

@@ -1 +1,2 @@
export JAVA_HOME=$(/usr/libexec/java_home -v 18) #export JAVA_HOME=$(/usr/libexec/java_home -v 18)
export JAVA_HOME="$SDKMAN_CANDIDATES_DIR/java/current"

View File

@@ -1,7 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ "$HOST" == 'nymph.localhost' ]]; then export LIQUIBASE_HOME="/opt/homebrew/Cellar/liquibase/4.12.0/libexec"
export LIQUIBASE_HOME="/usr/local/opt/liquibase/libexec"
elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
export LIQUIBASE_HOME="/opt/homebrew/Cellar/liquibase/4.12.0/libexec"
fi

View File

@@ -1,9 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ "$HOST" == 'nymph.localhost' ]]; then export ZSH_HIGHLIGHT_DIR=/opt/homebrew/share/zsh-syntax-highlighting
export ZSH_HIGHLIGHT_DIR=/usr/local/share/zsh-syntax-highlighting export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/usr/local/share/zsh-syntax-highlighting/highlighters
elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
export ZSH_HIGHLIGHT_DIR=/opt/homebrew/share/zsh-syntax-highlighting
export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
fi

20
.zshenv
View File

@@ -7,22 +7,10 @@ function appendpath() {
esac esac
} }
if [[ "$HOST" == 'nymph.localhost' ]]; then appendpath /opt/homebrew/bin
appendpath $GOPATH/bin appendpath $GOPATH/bin
appendpath $HOME/.local/bin appendpath $HOME/.local/bin
appendpath $HOME/.pyenv/bin appendpath $HOME/Library/Application\ Support/JetBrains/Toolbox/scripts
appendpath $HOME/.cargo/bin
appendpath /usr/local/opt/libarchive/bin
appendpath $HOME/.local/opt/kafka/bin
appendpath $HOME/.crc/bin
appendpath $HOME/.crc/bin/oc
source /usr/local/opt/git-extras/share/git-extras/git-extras-completion.zsh
elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
appendpath /opt/homebrew/bin
appendpath $GOPATH/bin
appendpath $HOME/.local/bin
fi
unset appendpath unset appendpath

11
.zshrc
View File

@@ -1,5 +1,5 @@
# Fig pre block. Keep at the top of this file. # Fig pre block. Keep at the top of this file.
[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh" [[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
# If you come from bash you might have to change your $PATH. # If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH # export PATH=$HOME/bin:/usr/local/bin:$PATH
@@ -151,5 +151,12 @@ eval "$(pyenv virtualenv-init -)"
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
# NVM configuration
export NVM_DIR="$HOME/.nvm"
[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" # This loads nvm
[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
# Fig post block. Keep at the bottom of this file. # Fig post block. Keep at the bottom of this file.
[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh" [[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"