diff options
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | lisp/cpp.el | 6 | ||||
| -rw-r--r-- | lisp/general.el | 11 |
3 files changed, 5 insertions, 14 deletions
@@ -70,7 +70,7 @@ '(custom-safe-themes '("f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default)) '(package-selected-packages - '(centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2)) + '(eglot centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2)) '(safe-local-variable-values '((js-indent-level . 4))) '(warning-suppress-types '((comp)))) (custom-set-faces diff --git a/lisp/cpp.el b/lisp/cpp.el index ab8cffc..d7a58e7 100644 --- a/lisp/cpp.el +++ b/lisp/cpp.el @@ -12,12 +12,6 @@ ;; (electric-indent-mode 0) ) -(use-package eglot - :ensure t - :config - (add-hook 'c-mode-common-hook 'eglot-ensure) - ) - (add-hook 'c-mode-common-hook 'setup-c) (defun create-cpp-class() diff --git a/lisp/general.el b/lisp/general.el index 9ea8067..71156f4 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -284,7 +284,10 @@ :custom (eglot-autoshutdown t) :ensure t - :bind ("<f2>" . #'eglot-rename)) + :bind ("<f2>" . #'eglot-rename) + :config + (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd")) + (add-hook 'c-mode-common-hook 'eglot-ensure)) (set-face-underline 'eglot-highlight-symbol-face t) @@ -363,11 +366,5 @@ (use-package yasnippet-snippets :ensure t) -(use-package centered-window - :ensure t - :config - (setq cwm-centered-window-width 180) - (centered-window-mode t)) - (provide 'general) ;;; general.el ends here |