kogakure/dotfiles
1
1
Fork 0
mirror of https://github.com/kogakure/dotfiles.git synced 2026-02-03 20:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rewrite conda setup to run on Intel and Silicon Macs

Browse Source
This commit is contained in:
Stefan Imhoff
2023-04-17 13:13:50 +02:00
parent 868b1d0b06
commit 3e2adeab65
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fish/config.fish
View File

@@ -51,12 +51,11 @@ set --export FZF_TMUX_OPTS -p
set --export FZF_ALT_C_COMMAND "fd --type d $FD_OPTIONS --color=never --hidden" set --export FZF_ALT_C_COMMAND "fd --type d $FD_OPTIONS --color=never --hidden"
set --export FZF_ALT_C_OPTS "--preview 'tree -C {} | head -50'" set --export FZF_ALT_C_OPTS "--preview 'tree -C {} | head -50'"
# >>> conda initialize >>> # Conda
# !! Contents within this block are managed by 'conda init' !! set conda_path (brew --prefix)/Caskroom/miniconda/base/bin/conda
if test -f /opt/homebrew/Caskroom/miniconda/base/bin/conda if test -f $conda_path
eval /opt/homebrew/Caskroom/miniconda/base/bin/conda "shell.fish" hook $argv | source eval $conda_path "shell.fish" hook $argv | source
end end
# <<< conda initialize <<<
# Zoxide # Zoxide
zoxide init fish | source zoxide init fish | source

16
zsh/zshrc
View File

@@ -60,20 +60,10 @@ eval "$(zoxide init zsh)"
export PATH="/Library/TeX/texbin:$PATH" export PATH="/Library/TeX/texbin:$PATH"
# Conda # Conda
# >>> conda initialize >>> conda_path=$(brew --prefix)/Caskroom/miniconda/base/bin/conda
# !! Contents within this block are managed by 'conda init' !! if [ -f "$conda_path" ]; then
__conda_setup="$('/usr/local/Caskroom/miniconda/base/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" eval "$("$conda_path" shell.zsh hook $argv)" | source
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/usr/local/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then
. "/usr/local/Caskroom/miniconda/base/etc/profile.d/conda.sh"
else
export PATH="/usr/local/Caskroom/miniconda/base/bin:$PATH"
fi
fi fi
unset __conda_setup
# <<< conda initialize <<<
# Man # Man
export MANPATH="/usr/local/man:$MANPATH" export MANPATH="/usr/local/man:$MANPATH"