From 1255ebdbd7f0d934bc44aa10b74ff95033240221 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Oct 2020 14:17:39 -0400 Subject: [PATCH] Add XDG detection to 'doom install' #4040 Create ~/.config/doom instead of ~/.doom.d if your emacs config lives in ~/.config/emacs. --- core/cli/install.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/cli/install.el b/core/cli/install.el index c76454447..ba34d10cb 100644 --- a/core/cli/install.el +++ b/core/cli/install.el @@ -28,6 +28,12 @@ DOOMDIR environment variable. e.g. ;; Create `doom-private-dir' (if noconfig-p (print! (warn "Not copying private config template, as requested")) + ;; Create DOOMDIR in ~/.config/doom if ~/.config/emacs exists. + (when (and (not (file-directory-p doom-private-dir)) + (not (getenv "DOOMDIR"))) + (let ((xdg-config-dir (or (getenv "XDG_CONFIG_HOME") "~/.config"))) + (when (file-in-directory-p doom-emacs-dir xdg-config-dir) + (setq doom-private-dir (expand-file-name "doom/" xdg-config-dir))))) (print! (start "Creating %s") (relpath doom-private-dir)) (make-directory doom-private-dir 'parents) (print-group!