diff --git a/.bashrc b/.bashrc index 5f89dd6..f9011e2 100644 --- a/.bashrc +++ b/.bashrc @@ -102,7 +102,9 @@ alias ls="exa --icons" alias ll="exa -lah --icons" alias q="exit" alias c="clear" -alias ic="init_conda" +alias ci="init_conda" +alias ca="conda activate" +alias cii="export INIT_CONDA=true && init_conda" # Aliases:1 ends here # [[file:Console.org::*Aliases][Aliases:2]] @@ -127,6 +129,10 @@ init_conda () { fi unset __conda_setup } + +if [[ ! -z "$INIT_CONDA" ]]; then + init_conda +fi # Anaconda:1 ends here # [[file:Console.org::*Starship prompt][Starship prompt:1]] diff --git a/.config/fish/config.fish b/.config/fish/config.fish index e55210f..cbea81d 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -11,13 +11,19 @@ alias ls="exa --icons" alias ll="exa -lah --icons" alias q="exit" alias c="clear" -alias ic="init_conda" +alias ci="init_conda" +alias ca="conda activate" +alias cii="export INIT_CONDA=true && init_conda" # Fish:2 ends here # [[file:../../Console.org::*Fish][Fish:3]] function init_conda eval /home/pavel/.guix-extra-profiles/dev/dev/bin/conda "shell.fish" "hook" $argv | source end + +if test -n "$INIT_CONDA"; + init_conda +end # Fish:3 ends here # [[file:../../Console.org::*Fish][Fish:4]] diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 3ebf4a2..cbe2dbd 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -48,11 +48,11 @@ :straight t :if (executable-find "conda") :config - (setq conda-anaconda-home (expand-file-name "~/Programs/miniconda3/")) - (setq conda-env-home-directory (expand-file-name "~/Programs/miniconda3/")) + (setq conda-anaconda-home (string-replace "/bin/conda" "" (executable-find "conda"))) + (setq conda-env-home-directory (expand-file-name "~/.conda/")) (setq conda-env-subdirectory "envs") (unless (getenv "CONDA_DEFAULT_ENV") - (conda-env-activate "base"))) + (conda-env-activate "general"))) (setenv "IS_EMACS" "true") @@ -2591,7 +2591,7 @@ parent." (use-package elcord :straight t - :if (and (string= (system-name) "pdsk") (not my/slow-ssh)) + :if (and (string= (system-name) "indigo") (not my/slow-ssh)) :config (elcord-mode)) diff --git a/Console.org b/Console.org index 315cc35..bd29147 100644 --- a/Console.org +++ b/Console.org @@ -296,7 +296,9 @@ alias ls="exa --icons" alias ll="exa -lah --icons" alias q="exit" alias c="clear" -alias ic="init_conda" +alias ci="init_conda" +alias ca="conda activate" +alias cii="export INIT_CONDA=true && init_conda" #+end_src #+begin_src bash @@ -326,6 +328,10 @@ init_conda () { fi unset __conda_setup } + +if [[ ! -z "$INIT_CONDA" ]]; then + init_conda +fi #+end_src *** Starship prompt #+begin_src bash @@ -361,6 +367,10 @@ Anaconda function init_conda eval /home/pavel/.guix-extra-profiles/dev/dev/bin/conda "shell.fish" "hook" $argv | source end + +if test -n "$INIT_CONDA"; + init_conda +end #+end_src | Guix dependency | diff --git a/Emacs.org b/Emacs.org index 765f182..fd8d9ea 100644 --- a/Emacs.org +++ b/Emacs.org @@ -324,12 +324,11 @@ References: :straight t :if (executable-find "conda") :config - (setq conda-anaconda-home (expand-file-name "~/Programs/miniconda3/")) - (setq conda-env-home-directory (expand-file-name "~/Programs/miniconda3/")) + (setq conda-anaconda-home (string-replace "/bin/conda" "" (executable-find "conda"))) + (setq conda-env-home-directory (expand-file-name "~/.conda/")) (setq conda-env-subdirectory "envs") (unless (getenv "CONDA_DEFAULT_ENV") - (conda-env-activate "base"))) - + (conda-env-activate "general"))) #+end_src Also, I sometimes need to know if a program is running inside Emacs (say, inside a terminal emulator). To do that, I set the following environment variable: