General refactors, reformatting & comment revision

modules/lang/clojure/config.el

@@ -11,21 +11,22 @@
 ;;
 ;;; Packages
 
-;;;###package clojure-mode
-(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
-(when (featurep! +lsp)
-  (add-hook! '(clojure-mode-local-vars-hook
-               clojurec-mode-local-vars-hook
-               clojurescript-mode-local-vars-hook)
-    (defun +clojure-disable-lsp-indentation-h ()
-      (setq-local lsp-enable-indentation nil))
-    #'lsp!)
-  (after! lsp-clojure
-    (dolist (m '(clojure-mode
-                 clojurec-mode
-                 clojurescript-mode
-                 clojurex-mode))
-      (add-to-list 'lsp-language-id-configuration (cons m "clojure")))))
+(use-package! clojure-mode
+  :hook (clojure-mode . rainbow-delimiters-mode)
+  :config
+  (when (featurep! +lsp)
+    (add-hook! '(clojure-mode-local-vars-hook
+                 clojurec-mode-local-vars-hook
+                 clojurescript-mode-local-vars-hook)
+      (defun +clojure-disable-lsp-indentation-h ()
+        (setq-local lsp-enable-indentation nil))
+      #'lsp!)
+    (after! lsp-clojure
+      (dolist (m '(clojure-mode
+                   clojurec-mode
+                   clojurescript-mode
+                   clojurex-mode))
+        (add-to-list 'lsp-language-id-configuration (cons m "clojure"))))))
 
 
 (use-package! cider
@@ -58,13 +59,18 @@
         cider-repl-history-quit-action 'delete-and-restore
         cider-repl-history-highlight-inserted-item t
         cider-repl-history-size 1000
-        cider-repl-pop-to-buffer-on-connect 'display-only
         cider-repl-result-prefix ";; => "
         cider-repl-print-length 100
         cider-repl-use-clojure-font-lock t
         cider-repl-use-pretty-printing t
         cider-repl-wrap-history nil
-        cider-stacktrace-default-filters '(tooling dup))
+        cider-stacktrace-default-filters '(tooling dup)
+
+        ;; Don't focus the CIDER REPL when it starts. Since it can take so long
+        ;; to start up, you either wait for a minute doing nothing or be
+        ;; prepared for your cursor to suddenly change buffers without warning.
+        ;; See https://github.com/clojure-emacs/cider/issues/1872
+        cider-repl-pop-to-buffer-on-connect 'display-only)
 
   ;; Error messages emitted from CIDER is silently funneled into *nrepl-server*
   ;; rather than the *cider-repl* buffer. How silly. We might want to see that

modules/lang/emacs-lisp/packages.el

@@ -4,6 +4,8 @@
 (package! elisp-mode :built-in t)
 
 (package! highlight-quoted :pin "2410347815")
+
+;; Tools
 (package! macrostep :pin "424e3734a1")
 (package! overseer :pin "02d49f582e")
 (package! elisp-def :pin "368b04da68")
@@ -11,4 +13,5 @@
 (when (featurep! :checkers syntax)
   (package! flycheck-cask :pin "3457ae553c"))
 
+;; Libraries
 (package! buttercup :pin "a91f282025")

modules/lang/java/config.el

@@ -22,7 +22,7 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
 
 
 ;;
-;; java-mode
+;;; java-mode
 
 (add-hook 'java-mode-hook #'rainbow-delimiters-mode)
 
@@ -31,7 +31,7 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
 
 
 ;;
-;; Common packages
+;;; Common packages
 
 (use-package! android-mode
   :commands android-mode

modules/lang/org/contrib/dragndrop.el

@@ -38,7 +38,7 @@
   (defadvice! +org--dragndrop-insert-link-a (_link filename)
     "Produces and inserts a link to FILENAME into the document.
 
-If FILENAME is an image, produce an attach:%s path, otherwise use file:%s (with
+If FILENAME is an image, produce an download:%s path, otherwise use file:%s (with
 an file icon produced by `+org-attach-icon-for')."
     :override #'org-download-insert-link
     (if (looking-back "^[ \t]+" (line-beginning-position))
@@ -54,11 +54,9 @@ an file icon produced by `+org-attach-icon-for')."
              (if (= org-download-image-org-width 0) ""
                (format "#+attr_org: :width %dpx\n" org-download-image-org-width))
              (format org-download-link-format
-                     (cond ((file-in-directory-p filename org-attach-id-dir)
-                            (file-relative-name filename org-attach-id-dir))
-                           ((file-in-directory-p filename org-directory)
-                            (file-relative-name filename org-directory))
-                           (filename)))))
+                     (if (file-in-directory-p filename org-attach-id-dir)
+                         (file-relative-name filename org-attach-id-dir)
+                       filename))))
            (org-display-inline-images))
           ((insert
             (format "%s [[./%s][%s]] "
@@ -72,6 +70,6 @@ an file icon produced by `+org-attach-icon-for')."
     :filter-return #'org-download--fullname
     (let ((dir (or (if buffer-file-name (file-name-directory buffer-file-name))
                    default-directory)))
-      (if (file-in-directory-p dir org-directory)
+      (if (file-in-directory-p dir org-attach-id-dir)
           (file-relative-name path dir)
         path))))