Doomemacs config reorganisation
This commit is contained in:
Leni Ven
parent
92ceeb37c1
commit
cbb7f9aa03
|
|
@ -3,113 +3,172 @@
|
|||
;; Place your private configuration here! Remember, you do not need to run 'doom
|
||||
;; sync' after modifying this file!
|
||||
|
||||
|
||||
;; Key bindings
|
||||
(setq doom-localleader-key ",") ; Spacemacs like comma major mode
|
||||
(map! :leader
|
||||
:desc "Kill buffer and window"
|
||||
"b 0" #'kill-buffer-and-window)
|
||||
|
||||
(map! :localleader
|
||||
(:map git-commit-mode-map
|
||||
"c" #'with-editor-finish)
|
||||
(:map git-commit-mode-map
|
||||
"q" #'with-editor-cancel))
|
||||
|
||||
|
||||
;; Some functionality uses this to identify you, e.g. GPG configuration, email
|
||||
;; clients, file templates and snippets. It is optional.
|
||||
(setq user-full-name "Leni Ven"
|
||||
user-mail-address "leniv@stanford.edu")
|
||||
|
||||
;; Doom exposes five (optional) variables for controlling fonts in Doom:
|
||||
;;
|
||||
;; - `doom-font' -- the primary font to use
|
||||
;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
|
||||
;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
|
||||
;; presentations or streaming.
|
||||
;; - `doom-unicode-font' -- for unicode glyphs
|
||||
;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
|
||||
;;
|
||||
;; See 'C-h v doom-font' for documentation and more examples of what they
|
||||
;; accept. For example:
|
||||
;;
|
||||
(setq doom-font (font-spec :family "Source Code Pro" :size 14 :weight 'semi-light)
|
||||
doom-variable-pitch-font (font-spec :family "Source Code Pro" :size 15))
|
||||
;;
|
||||
;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
|
||||
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
|
||||
;; refresh your font settings. If Emacs still can't find your font, it likely
|
||||
;; wasn't installed correctly. Font issues are rarely Doom issues!
|
||||
;; Key bindings
|
||||
(setq doom-localleader-key ",") ; Spacemacs like comma major mode
|
||||
(map! :leader ; "SPC b 0" kills window and buffer
|
||||
:desc "Kill buffer and window"
|
||||
"b 0" #'kill-buffer-and-window)
|
||||
(map! :leader ; "SPC :" executes command
|
||||
:desc "Execute shell command"
|
||||
"!" #'shell-command)
|
||||
(map! :leader ; "SPC SPC" becomes M-x
|
||||
:desc "Execute extended command (emacs M-x)"
|
||||
"SPC" #'execute-extended-command)
|
||||
(map! :leader ; "SPC :" becomes M-:
|
||||
:desc "Evaluate expression (emacs M-:)"
|
||||
":" #'eval-expression)
|
||||
|
||||
(map! :localleader
|
||||
(:map git-commit-mode-map
|
||||
"c" #'with-editor-finish)
|
||||
(:map git-commit-mode-map
|
||||
"q" #'with-editor-cancel))
|
||||
|
||||
;; There are two ways to load a theme. Both assume the theme is installed and
|
||||
;; available. You can either set `doom-theme' or manually load a theme with the
|
||||
;; `load-theme' function. This is the default:
|
||||
(setq doom-theme 'doom-monokai-pro)
|
||||
|
||||
;; This determines the style of line numbers in effect. If set to `nil', line
|
||||
;; numbers are disabled. For relative line numbers, set this to `relative'.
|
||||
(setq display-line-numbers-type 'relative)
|
||||
(after! whitespace (global-whitespace-mode +1))
|
||||
(setq
|
||||
whitespace-style '(face tabs tab-mark spaces space-mark trailing lines-tail newline newline-mark)
|
||||
whitespace-display-mappings
|
||||
'(
|
||||
(space-mark 32 [183] [46]) ; 32 SPACE 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
|
||||
(newline-mark 10 [172 10]) ; 10 LINE FEED, 172 Not Sign「¬」
|
||||
(tab-mark 9 [10141 9] [92 9]) ; 9 TAB, 10141 Triangle-headed rightwards arrow 「➝」
|
||||
;; Doom exposes five (optional) variables for controlling fonts in Doom:
|
||||
;;
|
||||
;; - `doom-font' -- the primary font to use
|
||||
;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
|
||||
;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
|
||||
;; presentations or streaming.
|
||||
;; - `doom-unicode-font' -- for unicode glyphs
|
||||
;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
|
||||
;;
|
||||
;; See 'C-h v doom-font' for documentation and more examples of what they
|
||||
;; accept. For example:
|
||||
;;
|
||||
default-font "Source Code Pro"
|
||||
default-font-size 14.0
|
||||
;; If you or Emacs can't find your font, use 'M-x describe-font' to look
|
||||
;; them up, `M-x eval-region' to execute elisp code, and 'M-x
|
||||
;; doom/reload-font' to refresh your font settings. If Emacs still can't
|
||||
;; find your font, it likely wasn't installed correctly. Font issues are
|
||||
;; rarely Doom issues!
|
||||
doom-font (font-spec
|
||||
:family default-font
|
||||
:size default-font-size
|
||||
:weight 'semi-light)
|
||||
doom-variable-pitch-font (font-spec
|
||||
:family default-font
|
||||
:size (+ default-font-size 1.0))
|
||||
doom-unicode-font (font-spec
|
||||
:family default-font
|
||||
:size default-font-size)
|
||||
;; There are two ways to load a theme. Both assume the theme is
|
||||
;; installed and available. You can either set `doom-theme' or manually
|
||||
;; load a theme with the `load-theme' function. This is the default:
|
||||
doom-theme 'doom-lantern
|
||||
;; This determines the style of line numbers in effect. If set to `nil',
|
||||
;; line numbers are disabled. For relative line numbers, set this to
|
||||
;; `relative'.
|
||||
display-line-numbers-type 'relative)
|
||||
|
||||
;; Splash screen
|
||||
|
||||
(defun sun-position-banner ()
|
||||
(let* (
|
||||
(sunrise '(
|
||||
"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀"
|
||||
"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀"
|
||||
"⠀⠀⠀⣤⣄⠀⠀⠀⠀⢾⡀⠀⠀⠸⠇⠀⠀⢀⡷⠀⠀⠀⠀⣠⣤⠀⠀⠀"
|
||||
"⠀⠀⠀⠈⠻⣷⣄⠀⠀⠈⠁⠀⠀⣀⣀⠀⠀⠈⠁⠀⠀⣠⣾⠟⠁⠀⠀⠀"
|
||||
"⠀⠀⠀⠀⠀⠈⠁⠀⠀⢀⣴⣾⣿⣿⣿⣿⣷⣦⡀⠀⠀⠈⠁⠀⠀⠀⠀⠀"
|
||||
"⠀⠀⢠⣤⣀⠀⠀⠀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⠀⠀⠀⣀⣤⡄⠀⠀"
|
||||
"⠀⠀⠀⠀⠁⠀⠀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀⠈⠀⠀⠀⠀"
|
||||
"⢠⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⣤⡄"
|
||||
"⠈⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠁"))
|
||||
(longest-line (apply #'max (mapcar #'length sunrise))))
|
||||
(put-text-property
|
||||
(point)
|
||||
(dolist (line sunrise (point))
|
||||
(insert (+doom-dashboard--center
|
||||
+doom-dashboard--width
|
||||
(concat line (make-string (max 0 (- longest-line (length line))) 32)))
|
||||
"\n"))
|
||||
'face 'doom-dashboard-banner)))
|
||||
(setq +doom-dashboard-ascii-banner-fn #'sun-position-banner)
|
||||
|
||||
|
||||
;; Whitespace mode
|
||||
(use-package! whitespace
|
||||
:config
|
||||
(setq
|
||||
whitespace-style '(face tabs tab-mark spaces space-mark trailing newline newline-mark)
|
||||
whitespace-line-column 80
|
||||
whitespace-display-mappings
|
||||
'(
|
||||
(space-mark 32 [183] [46]) ; 32 SPACE 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
|
||||
(newline-mark 10 [172 10]) ; 10 LINE FEED, 172 Not Sign「¬」
|
||||
(tab-mark 9 [10141 9] [92 9]) ; 9 TAB, 10141 Triangle-headed rightwards arrow 「➝」
|
||||
))
|
||||
(global-whitespace-mode +1)
|
||||
)
|
||||
)
|
||||
|
||||
(defun custom/common-program-hook ()
|
||||
(setq whitespace-style '(face spaces tabs newline trailing space-mark tab-mark newline-mark lines-tail))
|
||||
(interactive)
|
||||
(setq whitespace-line-column 80)
|
||||
(setq
|
||||
whitespace-style '(face spaces tabs newline trailing space-mark tab-mark newline-mark)
|
||||
whitespace-line-column 80)
|
||||
(display-fill-column-indicator-mode)
|
||||
;;(whitespace-mode)
|
||||
(setq
|
||||
indent-tabs-mode t
|
||||
indent-line-function 'tab-to-tab-stop
|
||||
tab-width 2)
|
||||
(indent-tabs-mode)
|
||||
(smart-tabs-mode-enable)
|
||||
)
|
||||
(defun custom/common-richtext-hook ()
|
||||
(setq whitespace-style '(face spaces tabs newline trailing space-mark tab-mark newline-mark))
|
||||
(interactive)
|
||||
(setq whitespace-line-column 'nil)
|
||||
)
|
||||
(defun custom/common-markup-hook ()
|
||||
(custom/common-program-hook)
|
||||
(setq whitespace-line-column 120)
|
||||
(setq fill-column 120)
|
||||
(indent-tabs-mode)
|
||||
)
|
||||
(defun custom/lisp-family-hook ()
|
||||
(custom/common-program-hook)
|
||||
(indent-tabs-mode)
|
||||
(setq
|
||||
indent-line-function 'tab-to-tab-stop
|
||||
tab-width 4)
|
||||
(indent-tabs-mode)
|
||||
)
|
||||
|
||||
(add-hook 'text-mode-hook #'custom/common-richtext-hook)
|
||||
(add-hook 'LaTeX-mode-hook #'custom/common-markup-hook)
|
||||
(add-hook 'latex-mode-hook #'custom/common-markup-hook)
|
||||
(add-hook 'lisp-mode-hook #'custom/lisp-family-hook)
|
||||
(add-hook 'lisp-data-mode-hook #'custom/lisp-family-hook)
|
||||
|
||||
(setq
|
||||
(use-package! smart-tabs-mode
|
||||
:config
|
||||
(smart-tabs-insinuate
|
||||
'c 'c++
|
||||
'java
|
||||
'javascript))
|
||||
(setq-default
|
||||
indent-tabs-mode t
|
||||
indent-line-function 'tab-to-tab-stop
|
||||
tab-width 2)
|
||||
(smart-tabs-insinuate
|
||||
'c
|
||||
'c++
|
||||
'java
|
||||
'javascript)
|
||||
|
||||
;; If you use `org' and don't want your org files in the default location below,
|
||||
;; change `org-directory'. It must be set before org loads!
|
||||
(setq org-directory "~/org/")
|
||||
|
||||
;; Lilypond Mode
|
||||
(require 'lilypond-mode)
|
||||
(add-to-list 'auto-mode-alist '("\\.ly\\'" . LilyPond-mode))
|
||||
(add-hook 'LilyPond-mode-hook #'custom/common-markup-hook)
|
||||
(after! spell
|
||||
(setq ispell-dictionary "english"))
|
||||
|
||||
(use-package! lilypond-mode
|
||||
:init
|
||||
(add-to-list 'auto-mode-alist '("\\.ly\\'" . LilyPond-mode))
|
||||
:config
|
||||
(add-hook 'LilyPond-mode-hook #'custom/common-markup-hook)
|
||||
)
|
||||
|
||||
;; LaTeX
|
||||
(after! latex
|
||||
(add-hook 'tex-mode-hook #'custom/common-program-hook)
|
||||
(add-hook 'LaTeX-mode-hook #'custom/common-program-hook)
|
||||
(setq-default TeX-electric-sub-and-superscript nil))
|
||||
|
||||
;; Whenever you reconfigure a package, make sure to wrap your config in an
|
||||
;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
vertico ; the search engine of the future
|
||||
|
||||
:ui
|
||||
;;deft ; notational velocity for Emacs
|
||||
deft ; notational velocity for Emacs
|
||||
doom ; what makes DOOM look the way it does
|
||||
doom-dashboard ; a nifty splash screen for Emacs
|
||||
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
|
||||
|
|
|
|||
|
|
@ -50,4 +50,3 @@
|
|||
;(unpin! t)
|
||||
|
||||
(package! whitespace)
|
||||
(package! smart-tabs-mode)
|
||||
|
|
|
|||
Loading…
Reference in New Issue