Skip to content

Commit

Permalink
Merge pull request #237 from joclement/184-try-out-httpslaunchpadnetd…
Browse files Browse the repository at this point in the history
…eadsnakes-as-an-alternative-to-pyenv

feat!: drop pyenv and add deadsnakes ppa to https://github.com/joclement/DevPackages
  • Loading branch information
joclement authored Nov 12, 2024
2 parents aac01fe + e40aba9 commit 95b939f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 56 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
path = dotbot
url = https://github.com/anishathalye/dotbot
ignore = dirty
[submodule "pyenv"]
path = pyenv
url = https://github.com/pyenv/pyenv
[submodule "vim/pack/plugins/start/vim-matchup"]
path = vim/pack/plugins/start/vim-matchup
url = https://github.com/andymass/vim-matchup.git
Expand Down
19 changes: 1 addition & 18 deletions env.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
###This file contains the environment variables used by bash and zsh

# Functions to add a folder to the PATH environment variable:
# Both functions take 1 argument, namely the dir, which should be added.
# this function adds the dir to the begin, if the dir is not in PATH
__pathaddbegin() {
if [ -d "$1" ] && [[ ":$PATH" != *":$1:"* ]]; then
PATH="$1${PATH:+":$PATH"}"
fi
}
# add dir to end, if it is nowhere in PATH
# NOTE: only add the directory if it is nowhere in PATH
__pathaddend() {
if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
PATH="$PATH:$1"
Expand All @@ -28,18 +18,11 @@ if [ -d "$POETRY_HOME" ]; then
__pathaddend "$POETRY_HOME"
fi

export PYENV_ROOT="$HOME/.pyenv"
if [ -d "$PYENV_ROOT/bin" ]; then
__pathaddbegin "$PYENV_ROOT"/bin
__pathaddbegin "$PYENV_ROOT"/shims
fi

if [ -f "$HOME/.cargo/env" ]; then
# shellcheck source=/dev/null
source "$HOME"/.cargo/env
fi

unset -f __pathaddbegin
unset -f __pathaddend

# ---------------------------------------------------------------------
Expand Down
32 changes: 0 additions & 32 deletions install-python-build-dependencies.sh

This file was deleted.

2 changes: 0 additions & 2 deletions install.conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
~/.profile:
force: true
path: profile
~/.pyenv:
~/.shared_aliases.sh:
~/.ruff.toml:
~/.shared_shell.sh:
Expand Down Expand Up @@ -77,7 +76,6 @@
- git submodule update --recursive --init --jobs=8
- sudo apt-get update
- sudo snap refresh
- ./install-python-build-dependencies.sh
- description: Install package for fc-cache
command: sudo apt-get install --yes fontconfig
- ./install-solarized.sh
Expand Down
1 change: 0 additions & 1 deletion pyenv
Submodule pyenv deleted from f17809

0 comments on commit 95b939f

Please sign in to comment.