emacs: Configure cc-mode with use-package

1 files changed, 15 insertions, 11 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 97baec0..ba96c42 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -127,12 +127,22 @@
 
 ;; C++
 
-(setopt clang-format-style "google")
+(use-package cc-mode
+  :config
+  (defun my/c++-hooks ()
+    (setopt flycheck-clang-language-standard "c++20"))
+
+  :hook
+  ((c-mode-common . google-set-c-style)
+   (c++-mode . flycheck-mode)
+   (c++-mode . my/c++-hooks))
 
-(my/with-add-hook 'c-initialization-hook
-  (keymap-local-set "C-c d" #'clang-format))
-(add-hook 'c-mode-common-hook #'google-set-c-style)
-(add-hook 'c++-mode-hook #'flycheck-mode)
+  :bind (:map c-mode-base-map ("C-c d" . clang-format))
+  :custom (clang-format-style "google"))
+
+(use-package clang-format :defer t :ensure t)
+(use-package flycheck :defer t :ensure t)
+(use-package google-c-style :defer t :ensure t)
 
 
 ;; Dired
@@ -161,16 +171,10 @@
     (add-hook 'before-save-hook #'my/eglot-organize-imports nil :local)
     (add-hook 'before-save-hook #'eglot-format-buffer nil :local))
 
-  :defer t
   :hook ((go-mode . eglot-ensure)
          (go-mode . my/go-add-hooks)))
 
 
-;; Flycheck
-
-(setopt flycheck-clang-language-standard "c++20")
-
-
 ;; Git
 
 (use-package git-commit