From 5f316dc15433fbf2d6801cd3b5a066fe28333e91 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 27 Apr 2021 07:06:30 +0000
Subject: [PATCH] Merge commit '83addc8'
---
config.org | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/config.org b/config.org
index a947797..0a78944 100644
--- a/config.org
+++ b/config.org
@@ -124,7 +124,14 @@
(diminish 'flyspell-mode)
#+END_SRC
-
+** Language Tool
+Language tool is an open source grammar checker.
+#+BEGIN_SRC emacs-lisp
+ (use-package langtool
+ :ensure t
+ :init
+ (setq langtool-java-classpath "/usr/share/languagetool:/usr/share/java/languagetool/*"))
+#+END_SRC
** Switch-window
Helps to change windows easily when many are open at once.
#+BEGIN_SRC emacs-lisp
@@ -607,7 +614,7 @@
#+BEGIN_SRC emacs-lisp
(setq c-default-style '((java-mode . "java")
(awk-mode . "awk")
- (other . "k&r")))
+ (other . "linux")))
#+END_SRC
** Coding system
@@ -618,7 +625,7 @@
(set-language-environment "UTF-8")
(prefer-coding-system 'utf-8)
(setq-default indent-tabs-mode t
- tab-width 4
+ tab-width 8
c-basic-offset tab-width
cperl-indent-level tab-width)
(delete-selection-mode)
@@ -792,7 +799,7 @@
(setq company-minimum-prefix-length 3))
#+END_SRC
-** COMMENT LSP Mode
+** LSP Mode
Use LSP for completion suggestions.
Causes too much memory usage, need to debug.
#+BEGIN_SRC emacs-lisp
@@ -814,6 +821,7 @@
(add-hook lsp-mode-hook lsp-enable-which-key-integration)
(setq read-process-output-max (* 1024 1024))
(setq lsp-completion-provider :capf)
+ (setq lsp-keep-workspace-alive 'nil)
(add-to-list 'exec-path "~/.cargo/bin"))
(use-package lsp-ui
@@ -980,7 +988,23 @@
company-dabbrev-code
company-irony)))
#+END_SRC
-
+**** COMMENT Clang-format
+Automatically format buffer on save.
+#+BEGIN_SRC emacs-lisp
+ (when (file-exists-p "/usr/share/clang/clang-format.el")
+ (load "/usr/share/clang/clang-format.el")
+ (setq clang-format-linux-style (concat "{BasedOnStyle: LLVM,"
+ "IndentWidth: 8,"
+ "UseTab: Always,"
+ "BreakBeforeBraces: Linux,"
+ "AllowShortIfStatementsOnASingleLine: false,"
+ "IndentCaseLabels: false}"))
+ (setq-default clang-format-style clang-format-linux-style)
+ (defun clang-format-on-save ()
+ (add-hook 'before-save-hook 'clang-format-buffer))
+ (add-hook 'c-mode-hook 'clang-format-on-save)
+ (add-hook 'c++-mode-hook 'clang-format-on-save))
+#+END_SRC
*** emacs-lisp
**** COMMENT company
Add slime backend.
--
Gitblit v1.10.0