Minor refactors & reformatting

modules/lang/cc/config.el

@@ -234,24 +234,26 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
       (setq-local company-transformers nil)
       (setq-local company-lsp-async t)
       (setq-local company-lsp-cache-candidates nil)
-      (lsp!))))
+      (lsp!)))
+
+  (when (featurep! :tools lsp +eglot)
+    ;; Map eglot specific helper
+    (map! :localleader
+          :after cc-mode
+          :map c++-mode-map
+          :n :desc "Show type inheritance hierarchy" "ct" #'+cc/eglot-ccls-inheritance-hierarchy)
+
+    ;; NOTE : This setting is untested yet
+    (after! eglot
+      ;; IS-MAC custom configuration
+      (when IS-MAC
+        (add-to-list 'eglot-workspace-configuration
+                     `((:ccls . ((:clang . ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1"
+                                                              "-isystem/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
+                                                              "-isystem/usr/local/include"]
+                                                  :resourceDir (string-trim (shell-command-to-string "clang -print-resource-dir"))))))))))))
 
-(when (and (featurep! +lsp) (featurep! :tools lsp +eglot))
-  ;; Map eglot specific helper
-  (map! :localleader
-        :after cc-mode
-        :map c++-mode-map
-        :n :desc "Show type inheritance hierarchy" "ct" #'+cc/eglot-ccls-inheritance-hierarchy)
 
-  ;; NOTE : This setting is untested yet
-  (after! eglot
-    ;; IS-MAC custom configuration
-    (when IS-MAC
-      (add-to-list 'eglot-workspace-configuration
-                   `((:ccls . ((:clang . ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1"
-                                                            "-isystem/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
-                                                            "-isystem/usr/local/include"]
-                                                :resourceDir (string-trim (shell-command-to-string "clang -print-resource-dir")))))))))))
 
 (use-package! ccls
   :when (and (featurep! +lsp) (not (featurep! :tools lsp +eglot)))

modules/lang/dart/config.el

@@ -31,7 +31,7 @@
 (use-package! flutter
   :when (featurep! +flutter)
   :defer t
-  :config
+  :init
   (map! :map dart-mode-map
         :localleader
         "r" #'flutter-run-or-hot-reload))

modules/lang/org/config.el

@@ -422,6 +422,7 @@ relative to `org-directory', unless it is an absolute path."
 
   ;; Add support for youtube links + previews
   (require 'org-yt nil t)
+
   (defadvice! +org-dont-preview-if-disabled-a (&rest _)
     "Make `org-yt' respect `org-display-remote-inline-images'."
     :before-while #'org-yt-image-data-fun
@@ -769,7 +770,6 @@ between the two."
           "p" #'org-priority
           "u" #'org-priority-up)))
 
-
   (map! :after org-agenda
         :map org-agenda-mode-map
         :m "C-SPC" #'org-agenda-show-and-scroll-up