Minor updates.

.emacs.d/modules/lang/cc/config.el

@@ -230,28 +230,26 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
   (add-hook! '(c-mode-local-vars-hook
                c++-mode-local-vars-hook
                objc-mode-local-vars-hook)
-    (defun +cc-init-lsp-h ()
-      (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)))

.emacs.d/modules/lang/cc/packages.el

@@ -3,31 +3,31 @@
 
 (package! cmake-mode
   :recipe (:host github :repo "emacsmirror/cmake-mode" :files (:defaults "*"))
-  :pin "bfe85bc009")
-(package! cuda-mode :pin "9ae9eacfdb")
-(package! demangle-mode :pin "06903d731d")
-(package! disaster :pin "10a785facc")
-(package! modern-cpp-font-lock :pin "02f104701b")
-(package! opencl-mode :pin "55cb49c824")
+  :pin "bfe85bc009c4778b44e246d5c27d0f888f0bfc0c")
+(package! cuda-mode :pin "9ae9eacfdba3559b5456342d0d03296290df8ff5")
+(package! demangle-mode :pin "697c1dbde93f164eac7ea0dc530d7e8b799272d6")
+(package! disaster :pin "10a785facc60d89d78e0d5177985ab1af1741bb4")
+(package! modern-cpp-font-lock :pin "865955d0035382a17a7f03add0d00d0bd812b103")
+(package! opencl-mode :pin "55cb49c8243e6420961d719faced035bc547c1ef")
 
-(when (package! glsl-mode :pin "43d906688a")
+(when (package! glsl-mode :pin "b07112016436d9634cd4ef747f9af6b01366d136")
   (when (featurep! :completion company)
     (package! company-glsl
       :recipe (:host github :repo "Kaali/company-glsl")
-      :pin "404cd0694a")))
+      :pin "404cd0694ab34971f9c01eb22126cd2e7d3f9dc4")))
 
 (if (featurep! +lsp)
     (unless (featurep! :tools lsp +eglot)
       ;; ccls package is necessary only for lsp-mode.
-      (package! ccls :pin "17ec7bb4cf"))
-  (when (package! irony :pin "5f75fc0c92")
-    (package! irony-eldoc :pin "0df5831eaa")
+      (package! ccls :pin "b8e2f4d9b5bed5b5e8b387ac8e43eff723120b80"))
+  (when (package! irony :pin "5f75fc0c9274f4622470e2324e2f4457087aa643")
+    (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978")
     (when (featurep! :checkers syntax)
-      (package! flycheck-irony :pin "42dbecd4a8"))
+      (package! flycheck-irony :pin "42dbecd4a865cabeb301193bb4d660e26ae3befe"))
     (when (featurep! :completion company)
-      (package! company-irony :pin "b44711dfce")
-      (package! company-irony-c-headers :pin "72c386aeb0")))
-  (when (package! rtags :pin "d370c09007")
+      (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a")
+      (package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97")))
+  (when (package! rtags :pin "080cb0e6b025b5d3d40fe9f7aecc791c0ea53f36")
     (when (featurep! :completion ivy)
       (package! ivy-rtags))
     (when (featurep! :completion helm)