summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el9
-rw-r--r--lisp/cpp.el6
2 files changed, 4 insertions, 11 deletions
diff --git a/init.el b/init.el
index 77be056..f5f22ac 100644
--- a/init.el
+++ b/init.el
@@ -73,14 +73,7 @@
"3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa"
"a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e"
default))
- '(package-selected-packages
- '(all-the-icons clang-format company-quickhelp css-eldoc dracula-theme
- drag-stuff fish-mode flycheck git-gutter-fringe
- go-mode hl-todo ledger-mode marginalia
- markdown-mode mood-line orderless org-download
- org-modern org-roam perfect-margin plantuml-mode
- projectile pyvenv rg rust-mode vertico web-mode
- yasnippet-snippets))
+ '(package-selected-packages nil)
'(package-vc-selected-packages '((aider :url "https://github.com/tninja/aider.el")))
'(safe-local-variable-values
'((eval setq-local org-log-done 'time) (js-indent-level . 4)))
diff --git a/lisp/cpp.el b/lisp/cpp.el
index d6b1cad..d1255d7 100644
--- a/lisp/cpp.el
+++ b/lisp/cpp.el
@@ -35,7 +35,7 @@
(if (string= (buffer-file-name) "CMakeLists.txt")
(mk/cpp/generate-compile-commands-cmake)))
-(defun mk/clang-format-buffer-if-project-file ()
+(defun mk/cpp/clang-format-buffer-if-project-file ()
"Run clang-format-buffer only if a .clang-format exists in the Projectile project."
(when (and (projectile-project-p) ; inside a projectile project
(locate-dominating-file (buffer-file-name) ".clang-format"))
@@ -45,10 +45,10 @@
(add-hook 'c-mode-common-hook
(lambda ()
(add-hook 'before-save-hook
- #'mk/clang-format-buffer-if-project-file
+ #'mk/cpp/clang-format-buffer-if-project-file
nil 'local)))
-(add-hook 'after-save-hook 'maybe-regenerate-compile-commands)
+(add-hook 'after-save-hook 'mk/cpp/maybe-regenerate-compile-commands)
(provide 'cpp)
;;; cpp.el ends here