From 7e362e8fbd468c4ce6becc72c4698d2d2e412705 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 24 Aug 2020 00:15:26 -0400
Subject: [PATCH] Redesign doom/info

+ Replace "daemonp" and "windowsys" fields with "traits" field, which
  can now indicate the presence of: Chemacs, exec-path-from-shell,
  symlinked EMACSDIR/DOOMDIR, a running server, the daemon and an envvar
  file.
+ Now replaces $USER in absolute paths with literal "$USER".
+ Reordered fields from most to least general (system -> emacs -> doom)
+ Show "&user" next to modules that are private modules (defined in
  ~/.doom.d/modules/)
---
 core/autoload/debug.el | 81 +++++++++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 33 deletions(-)

diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index fabe6ed80..4ca42252b 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -104,35 +104,44 @@ symbol and CDR is the value to set it to when `doom-debug-mode' is activated.")
 ready to be pasted in a bug report on github."
   (require 'vc-git)
   (require 'core-packages)
-  (let ((default-directory doom-emacs-dir)
-        (doom-modules (doom-module-list)))
-    (letf! (defun sh (&rest args) (cdr (apply #'doom-call-process args)))
-      `((emacs
-         (version . ,emacs-version)
-         (features ,@system-configuration-features)
-         (build . ,(format-time-string "%b %d, %Y" emacs-build-time))
-         (buildopts ,system-configuration-options)
-         (windowsys . ,(if doom-interactive-p window-system 'batch))
-         (daemonp . ,(cond ((daemonp) 'daemon)
-                           ((and (require 'server)
-                                 (server-running-p))
-                            'server-running))))
-        (doom
-         (version . ,doom-version)
-         (build . ,(sh "git" "log" "-1" "--format=%D %h %ci"))
-         (dir . ,(abbreviate-file-name (file-truename doom-private-dir))))
-        (system
-         (type . ,system-type)
+  (let ((default-directory doom-emacs-dir))
+    (letf! ((defun sh (&rest args) (cdr (apply #'doom-call-process args)))
+            (defun abbrev-path (path)
+              (replace-regexp-in-string
+               (regexp-quote (user-login-name)) "$USER"
+               (abbreviate-file-name path))))
+      `((system
+         (type   . ,system-type)
          (config . ,system-configuration)
-         (shell . ,shell-file-name)
-         (uname . ,(if IS-WINDOWS
-                       "n/a"
-                     (sh "uname" "-msrv")))
-         (path . ,(mapcar #'abbreviate-file-name exec-path)))
-        (config
-         (envfile
-          . ,(cond ((file-exists-p doom-env-file) 'envvar-file)
-                   ((featurep 'exec-path-from-shell) 'exec-path-from-shell)))
+         (shell  . ,(abbrev-path shell-file-name))
+         (uname  . ,(if IS-WINDOWS "n/a" (sh "uname" "-msrv")))
+         (path   . ,(mapcar #'abbrev-path exec-path)))
+        (emacs
+         (dir       . ,(abbrev-path (file-truename doom-emacs-dir)))
+         (version   . ,emacs-version)
+         (build     . ,(format-time-string "%b %d, %Y" emacs-build-time))
+         (buildopts . ,system-configuration-options)
+         (features  . ,system-configuration-features)
+         (traits . ,(delq
+                     nil (list (if (not doom-interactive-p) 'batch)
+                               (if (daemonp) 'daemon)
+                               (if (and (require 'server)
+                                        (server-running-p))
+                                   'server-running)
+                               (if (boundp 'chemacs-profiles-path)
+                                   'chemacs)
+                               (if (file-exists-p doom-env-file)
+                                   'envvar-file)
+                               (if (featurep 'exec-path-from-shell)
+                                   'exec-path-from-shell)
+                               (if (file-symlink-p user-emacs-directory)
+                                   'symlinked-emacsdir)
+                               (if (file-symlink-p doom-private-dir)
+                                   'symlinked-doomdir)))))
+        (doom
+         (dir     . ,(abbrev-path (file-truename doom-private-dir)))
+         (version . ,doom-version)
+         (build   . ,(sh "git" "log" "-1" "--format=%D %h %ci"))
          (elc-files
           . ,(length (doom-files-in `(,@doom-modules-dirs
                                       ,doom-core-dir
@@ -146,10 +155,16 @@ ready to be pasted in a bug report on github."
                          do (setq cat (car key))
                          and collect cat
                          collect
-                         (let ((flags (doom-module-get cat (cdr key) :flags)))
-                           (if flags
-                               `(,(cdr key) ,@flags)
-                             (cdr key))))
+                         (let* ((flags (doom-module-get cat (cdr key) :flags))
+                                (path  (doom-module-get cat (cdr key) :path))
+                                (module (append (if (file-in-directory-p path doom-private-dir)
+                                                    (list '&user))
+                                                (if flags
+                                                    `(,(cdr key) ,@flags)
+                                                  (list (cdr key))))))
+                           (if (= (length module) 1)
+                               (car module)
+                             module)))
                 '("n/a")))
          (packages
           ,@(or (condition-case e
@@ -226,7 +241,7 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
         (insert "<details>\n\n```\n")
         (dolist (group info)
           (insert! "%-8s%-10s %s\n"
-                   ((car group)
+                   ((upcase (symbol-name (car group)))
                     (caadr group)
                     (cdadr group)))
           (dolist (spec (cddr group))