From 2b80ab79e7214879060a9c1cdbcc4840386d6a40 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 20 Oct 2020 06:32:07 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/Chizi123/.emacs.d into master
---
config.org | 197 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 147 insertions(+), 50 deletions(-)
diff --git a/config.org b/config.org
index ff5d0ba..ec58863 100644
--- a/config.org
+++ b/config.org
@@ -1,14 +1,21 @@
#+TITLE: My Emacs configuration
# LocalWords: poppler mingw emacs eq nt gnuplot setenv mapconcat el cond minibuffer pdf color Smartparens smartparens yas aindent whitespace eldoc ielm ibuffer hippie pscp pos Spaceline spaceline powerline spacemacs seperator dir Yasnippet yasnippet flycheck magit fullscreen CEDET askifnotset semanticdb EDE ede gdb srefactor analyzer eval cdb autosetup ghostscript math unicode reftex bibtex TeXcount texcount str latin rkt PlantUML plantuml autoload alist matlab verilog ds vh src fontify natively fortran dvipng plist xcolor EXWM Zenburn setq zenburn defun dolist init config DejaVu ispell aspell flyspell kbd recentf sexp ov bg listp defadvice progn prog keyfreq autosave dabbrev hl gc linum linux utf RET ARG arg configs backends contribs AucTex tex auctex LaTeX url htmlize linter backend writegood ggtags gtags dired eshell asm cd dwim VHDL defvar ctags vhdl concat sp html awk defalias cedet mips IPython ein contrib pandoc dokuwiki EMMS MPD emms toc favicon href css stylesheet async dataLayer gtag js UA sitelinks br Github postamble isso center disqus onclick Disqus javascript dsq createElement getElementsByTagName xml urlset xmlns curr loc RSS elfeed
-* COMMENT Windows dependencies
-Dependencies needed for Aspell, poppler PDF-tools, compilers and ghost-script provided by mingw64 in windows.
+* OS dependencies
+Windows and Mac have some interesting paths when starting emacs which needs to be fixed.
+Using mingw64 in windows and general path in mac.
#+BEGIN_SRC emacs-lisp
- (when (eq system-type 'windows-nt)
- (add-to-list 'exec-path "C:/msys64/usr/bin")
- (add-to-list 'exec-path "C:/msys64/mingw64/bin")
- (add-to-list 'exec-path "c:/Program Files/gnuplot")
- (setenv "PATH" (mapconcat #'identity exec-path path-separator)))
+ (cond ((eq system-type 'windows-nt)
+ (add-to-list 'exec-path "C:/msys64/usr/bin")
+ (add-to-list 'exec-path "C:/msys64/mingw64/bin")
+ (add-to-list 'exec-path "c:/Program Files/gnuplot")
+ (setenv "PATH" (mapconcat #'identity exec-path path-separator)))
+ ((eq system-type 'darwin)
+ (use-package exec-path-from-shell
+ :ensure t
+ :config
+ (exec-path-from-shell-initialize))
+ (setq default-directory "~/")))
#+END_SRC
* Aesthetic changes
@@ -106,7 +113,10 @@
(require 'ispell)
(setq-default ispell-program-name "aspell")
(setq-default ispell-local-dictionary "en_AU")
+ (add-hook 'tex-mode-hook 'flyspell-mode)
(add-hook 'latex-mode-hook 'flyspell-mode)
+ (add-hook 'TeX-mode-hook 'flyspell-mode)
+ (add-hook 'LaTeX-mode-hook 'flyspell-mode)
;; (add-hook 'latex-mode-hook 'flyspell-buffer)
(add-hook 'org-mode-hook 'flyspell-mode)
;; (add-hook 'org-mode-hook 'flyspell-buffer)
@@ -608,7 +618,9 @@
(set-language-environment "UTF-8")
(prefer-coding-system 'utf-8)
(setq-default indent-tabs-mode t
- tab-width 4)
+ tab-width 4
+ c-basic-offset tab-width
+ cperl-indent-level tab-width)
(delete-selection-mode)
(global-set-key (kbd "RET") 'newline-and-indent)
#+END_SRC
@@ -778,6 +790,28 @@
(setq company-minimum-prefix-length 3))
#+END_SRC
+** LSP Mode
+Use LSP for completion suggestions
+#+BEGIN_SRC emacs-lisp
+ (use-package lsp-mode
+ :ensure t
+ :hook ((lsp-mode . lsp-enable-which-key-integration))
+ :init
+ (setq lsp-keymap-prefix "C-c l")
+ :commands lsp
+ :config
+ (setq read-process-output-max (* 1024 1024))
+ (setq lsp-completion-provider :capf)
+ (add-to-list 'exec-path "~/.cargo/bin"))
+
+ (use-package lsp-ui
+ :ensure t
+ :commands lsp-ui-mode)
+
+ (use-package helm-lsp
+ :ensure t
+ :commands helm-lsp-workspace-symbol)
+#+END_SRC
** Version control
Settings for emacs' own version control system.
*** Enable version control on the mode line
@@ -937,6 +971,12 @@
company-irony)))
#+END_SRC
+**** LSP
+Allow completion with LSP.
+#+BEGIN_SRC emacs-lisp
+(add-hook 'c-mode-hook 'lsp)
+(add-hook 'cpp-mode-hook 'lsp)
+#+END_SRC
*** emacs-lisp
**** COMMENT yasnippet
Enable yasnippet.
@@ -1052,6 +1092,14 @@
(add-hook 'latex-mode-hook (lambda () (define-key latex-mode-map (kbd "C-c c") 'texcount)))
#+END_SRC
+**** LSP
+Allow LSP completion
+#+BEGIN_SRC emacs-lisp
+ (add-hook 'tex-mode-hook 'lsp)
+ (add-hook 'latex-mode-hook 'lsp)
+ (add-hook 'TeX-mode-hook 'lsp)
+ (add-hook 'LaTeX-mode-hook 'lsp)
+#+END_SRC
*** PlantUML
Sets the PlantUML path for the mode to generate models.
#+BEGIN_SRC emacs-lisp
@@ -1098,54 +1146,55 @@
**** Integrate into emacs
Add updated version (based off auto-package-update) and integrate it with Emacs.
#+BEGIN_SRC emacs-lisp
- (defun verilog-read-file-as-string (file)
- "Read FILE contents."
- (when (file-exists-p file)
- (with-temp-buffer
- (insert-file-contents file)
- (buffer-string))))
-
- (defun verilog-write-string-to-file (file string)
- "Substitute FILE contents with STRING."
+ (defun verilog-read-file-as-string (file)
+ "Read FILE contents."
+ (when (file-exists-p file)
(with-temp-buffer
- (insert string)
- (when (file-writable-p file)
- (write-region (point-min)
- (point-max)
- file))))
+ (insert-file-contents file)
+ (buffer-string))))
- (defun verilog-today-day ()
- (time-to-days (current-time)))
+ (defun verilog-write-string-to-file (file string)
+ "Substitute FILE contents with STRING."
+ (with-temp-buffer
+ (insert string)
+ (when (file-writable-p file)
+ (write-region (point-min)
+ (point-max)
+ file))))
- (defun should-update-verilog-p ()
- "Return non-nil when an update is due."
- (and
- (or
- (not (file-exists-p "~/.emacs.d/.last-verilog-update-day"))
- (if (>= (/ (- (verilog-today-day) (verilog-read-last-update-day)) 7) 1)
- t
- nil))))
+ (defun verilog-today-day ()
+ (time-to-days (current-time)))
- (defun verilog-read-last-update-day ()
- "Read last update day."
- (string-to-number
- (verilog-read-file-as-string "~/.emacs.d/.last-verilog-update-day")))
+ (defun should-update-verilog-p ()
+ "Return non-nil when an update is due."
+ (and
+ (or
+ (not (file-exists-p "~/.emacs.d/.last-verilog-update-day"))
+ (if (>= (/ (- (verilog-today-day) (verilog-read-last-update-day)) 7) 1)
+ t
+ nil))))
- (defun verilog-write-current-day ()
- "Store current day."
- (verilog-write-string-to-file
- "~/.emacs.d/.last-verilog-update-day"
- (int-to-string (verilog-today-day))))
+ (defun verilog-read-last-update-day ()
+ "Read last update day."
+ (string-to-number
+ (verilog-read-file-as-string "~/.emacs.d/.last-verilog-update-day")))
- (use-package verilog-mode
- :init
- (when (should-update-verilog-p)
- (get-verilog-latest)
- (verilog-write-current-day))
- (add-to-list 'load-path "~/.emacs.d/elpa/verilog-mode/verilog-mode.el")
- :config
- (autoload 'verilog-mode "verilog-mode" "Verilog mode" t )
- (add-to-list 'auto-mode-alist '("\\.[ds]?vh?\\'" . verilog-mode)))
+ (defun verilog-write-current-day ()
+ "Store current day."
+ (verilog-write-string-to-file
+ "~/.emacs.d/.last-verilog-update-day"
+ (int-to-string (verilog-today-day))))
+
+ (use-package verilog-mode
+ :hook (verilog-mode . lsp)
+ :init
+ (when (should-update-verilog-p)
+ (get-verilog-latest)
+ (verilog-write-current-day))
+ (add-to-list 'load-path "~/.emacs.d/elpa/verilog-mode/verilog-mode.el")
+ :config
+ (autoload 'verilog-mode "verilog-mode" "Verilog mode" t )
+ (add-to-list 'auto-mode-alist '("\\.[ds]?vh?\\'" . verilog-mode)))
#+END_SRC
*** COMMENT MATLAB
@@ -1178,6 +1227,54 @@
:ensure t)
#+END_SRC
+*** Rust
+**** Major mode
+Get the major mode for rust files.
+#+BEGIN_SRC emacs-lisp
+ (use-package rust-mode
+ :ensure t
+ :hook (rust-mode . lsp)
+ :config
+ ;; style guide suggests spaces not tabs
+ (add-hook 'rust-mode-hook (lambda () (setq indent-tabs-mode nil)))
+ (setq rust-format-on-save t))
+
+ (use-package toml-mode
+ :ensure t)
+#+END_SRC
+**** Cargo integration
+Integrate Cargo, rust's package manager.
+#+BEGIN_SRC emacs-lisp
+ (use-package cargo
+ :ensure t
+ :hook
+ (rust-mode . cargo-minor-mode))
+#+END_SRC
+**** Flycheck
+Linting with flycheck.
+#+BEGIN_SRC emacs-lisp
+ (use-package flycheck-rust
+ :ensure t
+ :config
+ (add-hook 'flyckeck-mode-hook #'flycheck-rust-setup))
+#+END_SRC
+
+**** COMMENT Completion
+Code completion with racer.
+#+BEGIN_SRC emacs-lisp
+ (use-package racer
+ :ensure t
+ :hook ((rust-mode . racer-mode)
+ (racer-mode . (eldoc-mode company-mode)))
+ :init
+ (setq racer-command "~/.cargo/bin/racer"))
+#+END_SRC
+*** Bash
+**** LSP
+Completion with LSP
+#+BEGIN_SRC emacs-lisp
+(add-hook 'sh-mode-hook 'lsp)
+#+END_SRC
* Org mode
** Up to date org
Pull the latest org mode from the repository, rather than the org which comes with emacs.
--
Gitblit v1.9.3