From 80ac69c14e58037dcf3547a77be8fd2bd9b14429 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Tue, 1 Feb 2022 17:06:54 +0100
Subject: [PATCH] fix(python): deprioritize ~/.conda detection

Since ~/.conda is always created, whether or not the other possibilities
exist, best we treat it as a last resort.

Fix: #6071
---
 modules/lang/python/config.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 7bf8a9a30..3673e0806 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -265,7 +265,6 @@
   ;; explicitly. Afterwards, run M-x `conda-env-activate' to switch between
   ;; environments
   (or (cl-loop for dir in (list conda-anaconda-home
-                                "~/.conda"
                                 "~/.anaconda"
                                 "~/.miniconda"
                                 "~/.miniconda3"
@@ -277,7 +276,8 @@
                                 "/usr/bin/anaconda3"
                                 "/usr/local/anaconda3"
                                 "/usr/local/miniconda3"
-                                "/usr/local/Caskroom/miniconda/base")
+                                "/usr/local/Caskroom/miniconda/base"
+                                "~/.conda")
                if (file-directory-p dir)
                return (setq conda-anaconda-home (expand-file-name dir)
                             conda-env-home-directory (expand-file-name dir)))