From e8a4cbe0d290f4432f76568dbaccac6805920008 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 14 Aug 2021 01:51:45 +0000
Subject: [PATCH] Merge branch 'master' of ssh://github.com/Chizi123/.emacs.d
---
config.org | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/config.org b/config.org
index f58e4b8..1bf6271 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)
@@ -765,7 +772,6 @@
(use-package flycheck
:ensure t
:diminish flycheck-mode
- :hook (prog-mode . flycheck-mode)
:config
(global-flycheck-mode))
#+END_SRC
@@ -793,7 +799,8 @@
#+END_SRC
** LSP Mode
-Use LSP for completion suggestions
+Use LSP for completion suggestions.
+Causes too much memory usage, need to debug.
#+BEGIN_SRC emacs-lisp
(use-package lsp-mode
:ensure t
@@ -810,9 +817,10 @@
(setq lsp-keymap-prefix "C-c l")
:commands lsp
:config
- (add-hook lsp-mode-hook lsp-enable-which-key-integration)
+ (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
@@ -979,9 +987,25 @@
company-dabbrev-code
company-irony)))
#+END_SRC
-
+**** 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 nil t))
+ (add-hook 'c-mode-hook 'clang-format-on-save nil t)
+ (add-hook 'c++-mode-hook 'clang-format-on-save nil t))
+#+END_SRC
*** emacs-lisp
-**** COMMENT company
+**** COMMENT Company
Add slime backend.
#+BEGIN_SRC emacs-lisp
(add-hook 'emacs-lisp-mode-hook 'company-mode)
@@ -1060,7 +1084,7 @@
(defun get-texcount-latest()
(if (not(file-directory-p "~/.texcount"))
(make-directory "~/.texcount"))
- (url-copy-file "https://app.uio.no/ifi/texcount/download.php?file=texcount_3_1_1.zip" "~/.texcount/texcount.zip" 1)
+ (url-copy-file "https://app.uio.no/ifi/texcount/download.php?file=texcount_3_2_0_41.zip" "~/.texcount/texcount.zip" 1)
(shell-command "unzip -o ~/.texcount/texcount.zip -d ~/.texcount")
(add-to-list 'exec-path "~/.texcount/texcount.pl"))
@@ -1344,8 +1368,9 @@
#+END_SRC
** Org export additions
-*** COMMENT Pandoc
+*** Pandoc
Call pandoc on org buffer from org export.
+Need to add ~#+OPTIONS: H:99~ to enable large level header exports.
#+BEGIN_SRC emacs-lisp
(use-package ox-pandoc
:ensure t)
--
Gitblit v1.10.0