Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@

[push]
default = simple
autoSetupRemote = true

[branch "master"]
mergeoptions = --no-edit
Expand Down
4 changes: 2 additions & 2 deletions settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
"notebook.diff.ignoreMetadata": true,
"notebook.lineNumbers": "on",
"notebook.markup.fontSize": 13,
"python.defaultInterpreterPath": "~/.pyenv/shims/python",
"python.defaultInterpreterPath": "~/.lewagon/venvs/lewagon/bin/python",
"python.formatting.provider": "yapf",
"python.languageServer": "Pylance",
"python.linting.enabled": false,
"python.linting.flake8Enabled": false,
"python.linting.pylintEnabled": false,
"python.terminal.activateEnvironment": false,
"python.terminal.activateEnvironment": true,
"ruby.lint": {
"rubocop": true
},
Expand Down
11 changes: 7 additions & 4 deletions zprofile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Setup the PATH for pyenv binaries and shims
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
# Setup the PATH for Homebrew on Apple Silicon
eval "$(/opt/homebrew/bin/brew shellenv 2> /dev/null)"
type -a pyenv > /dev/null && eval "$(pyenv init --path)"

# Setup the PATH for pyenv binaries and shims
# Uncomment the next lines if you still run a pyenv based setup
# export PYENV_ROOT="$HOME/.pyenv"
# export PATH="$PYENV_ROOT/bin:$PATH"
# type -a pyenv > /dev/null && eval "$(pyenv init --path)"
13 changes: 11 additions & 2 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ export PATH="${HOME}/.rbenv/bin:${PATH}" # Needed for Linux/WSL
type -a rbenv > /dev/null && eval "$(rbenv init -)"

# Load pyenv (to manage your Python versions)
export PYENV_VIRTUALENV_DISABLE_PROMPT=1
type -a pyenv > /dev/null && eval "$(pyenv init -)" && eval "$(pyenv virtualenv-init - 2> /dev/null)" && RPROMPT+='[🐍 $(pyenv version-name)]'
# Uncomment the next lines if you still run a pyenv based setup
# export PYENV_VIRTUALENV_DISABLE_PROMPT=1
# type -a pyenv > /dev/null && eval "$(pyenv init -)" && eval "$(pyenv virtualenv-init - 2> /dev/null)" && RPROMPT+='[🐍 $(pyenv version-name)]'

# Load nvm (to manage your node versions)
export NVM_DIR="$HOME/.nvm"
Expand Down Expand Up @@ -77,5 +78,13 @@ export EDITOR=code
# Set ipdb as the default Python debugger
export PYTHONBREAKPOINT=ipdb.set_trace

# Activate the Le Wagon Python venv and update the prompt
LW_VENV="$HOME/.lewagon/venvs/lewagon"
if [ -e $LW_VENV ]; then
export VIRTUAL_ENV_DISABLE_PROMPT=1
source $LW_VENV/bin/activate
RPROMPT+='[🐍 $VIRTUAL_ENV_PROMPT]'
fi

# Hook direnv but only if direnv is installed
if (( $+commands[direnv] )); then eval "$(direnv hook zsh)"; fi