Small correction to pyenv installation and config

borland502 · Dec 28, 2024 · 6684e83 · 6684e83
1 parent 9410c06
commit 6684e83
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/.chezmoi.yml.tmpl b/.chezmoi.yml.tmpl
@@ -52,6 +52,7 @@ data:
   home: "{{ $home }}"
   name: "{{ $name }}"
   email: "{{ $email }}"
+  sourceDir: "{{ $xdg_data_home }}/automation/home-ops/scripts/dotfiles"
   taskfile: [
     'ANSIBLE_HOME: "{{$home}}/.ansible"',
     'AUTOMATION_HOME: "{{$xdg_data_home}}/automation"',

diff --git a/.chezmoidata/env.toml b/.chezmoidata/env.toml
@@ -43,7 +43,7 @@ COLORTERM = "truecolor"
 
 
 [pyenv.cmds]
-INIT = 'eval "$($PYENV_BIN init --path)"'
+INIT = 'eval "$(pyenv init - --zsh)"'
 VIRTUAL_ENV = 'eval "$($PYENV_BIN virtualenv-init -)"'
 INSTALL = '$PYENV_BIN install ${PYTHON_VERSION}'
 LTS = '$PYENV_BIN install ${PYTHON_VERSION}'
@@ -55,6 +55,7 @@ PYTHON_CONFIGURE_OPTS = '--enable-optimizations --with-lto'
 PYTHON_CFLAGS = '-march=native -mtune=native'
 LDFLAGS = '-L$HOMEBREW_PREFIX/opt/zlib/lib'
 CPPFLAGS = '-I$$HOMEBREW_PREFIX/opt/zlib/include'
+PATH="$PYENV_ROOT/bin:$PATH"
 [nvm.cmds]
 SOURCE = 'source "${NVM_DIR}/nvm.sh"'
 INSTALL = 'nvm install'

diff --git a/dot_zprofile.tmpl b/dot_zprofile.tmpl
@@ -0,0 +1,7 @@
+
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
+
+# Added by Toolbox App
+export PATH="$PATH:/Users/jhettenh/Library/Application Support/JetBrains/Toolbox/scripts"
+
diff --git a/dot_zshenv.tmpl b/dot_zshenv.tmpl
@@ -12,24 +12,4 @@ set +o allexport
   eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 {{ end }}
 
-# Set Pyenv
-set -o allexport
-{{- range .pyenv.vars -}}
-  {{- range $key, $value := . }}
-    {{ $key }}="{{ $value }}"
-  {{- end }}
-{{- end }}
-set +o allexport
-
-{{ .pyenv.cmds.INIT }}
-
-# Set NVM
-set -o allexport
-{{- range .nvm.vars -}}
-  {{- range $key, $value := . }}
-    {{ $key }}="{{ $value }}"
-  {{- end }}
-{{- end }}
-set +o allexport
 
-{{ .nvm.cmds.SOURCE }}
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
@@ -104,7 +104,27 @@ ssh-add {{ .chezmoi.homeDir }}/.ssh/id_ed25519
 eval "$(starship init zsh)"
 {{end}}
 
+# Set Pyenv
+set -o allexport
+{{- range .pyenv.vars -}}
+  {{- range $key, $value := . }}
+    {{ $key }}="{{ $value }}"
+  {{- end }}
+{{- end }}
+set +o allexport
+
 {{ .pyenv.cmds.INIT }}
 
+# Set NVM
+set -o allexport
+{{- range .nvm.vars -}}
+  {{- range $key, $value := . }}
+    {{ $key }}="{{ $value }}"
+  {{- end }}
+{{- end }}
+set +o allexport
+
+{{ .nvm.cmds.SOURCE }}
+
 autoload -U +X bashcompinit && bashcompinit
 autoload -U +X compinit && compinit