Skip to content

Commit e457486

Browse files
committed
fix: correct latest mac and add deno
1 parent abb8024 commit e457486

File tree

6 files changed

+31
-5
lines changed

6 files changed

+31
-5
lines changed

dot_zsh/env.zsh

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
# Setting and editing of environment variables.
2+
# >>> conda initialize >>>
3+
# !! Contents within this block are managed by 'conda init' !!
4+
__conda_setup="$('/opt/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
5+
if [ $? -eq 0 ]; then
6+
eval "$__conda_setup"
7+
else
8+
if [ -f "/opt/miniconda3/etc/profile.d/conda.sh" ]; then
9+
. "/opt/miniconda3/etc/profile.d/conda.sh"
10+
else
11+
export PATH="/opt/miniconda3/bin:$PATH"
12+
fi
13+
fi
14+
unset __conda_setup
15+
# <<< conda initialize <<<
216

317
# Variables
418
export CLICOLOR="YES"
@@ -81,7 +95,16 @@ export CARGOPATH="${HOME}/.cargo/bin"
8195
export PKGPATH="/opt/pkg/bin:/opt/pkg/sbin:/opt/pkg/gnu/bin"
8296
export PYPATH="/Library/Frameworks/Python.framework/Versions/3.10/bin:${HOME}/Library/Python/3.10/bin:${HOME}/.local/bin"
8397
export GEMBINPATH="${GEM_HOME}/bin"
98+
export POSTGRESPATH="/Applications/Postgres.app/Contents/Versions/16/bin"
99+
export LMSTUDIOPATH="${HOME}/.cache/lm-studio/bin"
84100

85-
export PATH="$PKGPATH:$NPMPATH:$NODENPATH:$GOBINPATH:$CARGOPATH:$PYPATH:$GEMBINPATH:$PATH"
101+
export PATH="$PKGPATH:$NPMPATH:$NODENPATH:$GOBINPATH:$CARGOPATH:$PYPATH:$GEMBINPATH:$POSTGRESPATH:$LMSTUDIOPATH:$PATH"
102+
103+
source "${HOME}/.deno/env"
86104

87105
typeset -U PATH # Remove duplicates in $PATH
106+
107+
if [[ ":$FPATH:" != *":/Users/vortex/.zsh/completions:"* ]]; then export FPATH="/Users/vortex/.zsh/completions:$FPATH"; fi
108+
109+
autoload -Uz compinit
110+
compinit

install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,9 @@ fi
2020
# POSIX way to get script's dir: https://stackoverflow.com/a/29834779/12156188
2121
script_dir="$(cd -P -- "$(dirname -- "$(command -v -- "$0")")" && pwd -P)"
2222

23+
#chezmoi state delete-bucket --bucket=entryState
24+
#chezmoi state delete-bucket --bucket=scriptState
25+
2326
# exec: replace current process with chezmoi init
2427
exec "$chezmoi" init --apply "--source=$script_dir" --refresh-externals
28+
#exec "$chezmoi" -v --debug init --apply "--source=$script_dir" --refresh-externals

run_once_000_install_dependencies.sh.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ sudo /opt/pkg/bin/pkgin -y install \
1313
fd-find \
1414
gnuls \
1515
jq \
16-
mc \
1716
neofetch \
1817
ripgrep \
1918
sd \

run_once_210_node_packages.sh.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then
55
exit 0
66
fi
77

8-
{{ if (and (eq .chezmoi.os "linux") (not .codespaces)) -}}
8+
{{ if (or (and (eq .chezmoi.os "linux") (not .codespaces)) (eq .chezmoi.os "darwin")) -}}
99
SCRIPTS_FOLDER="$HOME/.dotfiles/scripts"
1010
{{ else -}}
1111
SCRIPTS_FOLDER="/__w/dotfiles/dotfiles/scripts"

run_once_220_go_packages.sh.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then
55
exit 0
66
fi
77

8-
{{ if (and (eq .chezmoi.os "linux") (not .codespaces)) -}}
8+
{{ if (or (and (eq .chezmoi.os "linux") (not .codespaces)) (eq .chezmoi.os "darwin")) -}}
99
SCRIPTS_FOLDER="$HOME/.dotfiles/scripts"
1010
{{ else -}}
1111
SCRIPTS_FOLDER="/__w/dotfiles/dotfiles/scripts"

run_once_230_rust_packages.sh.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [[ -n "${DRY_RUN}" && "${DRY_RUN}" == true ]]; then
55
exit 0
66
fi
77

8-
{{ if (and (eq .chezmoi.os "linux") (not .codespaces)) -}}
8+
{{ if (or (and (eq .chezmoi.os "linux") (not .codespaces)) (eq .chezmoi.os "darwin")) -}}
99
# install Rust global packages
1010
"$HOME/.cargo/bin/cargo" install \
1111
dotenv-linter \

0 commit comments

Comments
 (0)