summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/.config/emacs/early-init.el2
-rw-r--r--emacs/.config/emacs/init.el7
2 files changed, 9 insertions, 0 deletions
diff --git a/emacs/.config/emacs/early-init.el b/emacs/.config/emacs/early-init.el
index 6757f7b..6892501 100644
--- a/emacs/.config/emacs/early-init.el
+++ b/emacs/.config/emacs/early-init.el
@@ -13,6 +13,8 @@
13(setq selection-coding-system 'utf-8 13(setq selection-coding-system 'utf-8
14 default-input-method nil) 14 default-input-method nil)
15 15
16(setq load-prefer-newer t)
17
16(setq user-emacs-directory (file-name-directory load-file-name)) 18(setq user-emacs-directory (file-name-directory load-file-name))
17 19
18(add-to-list 'load-path (expand-file-name "arkta" user-emacs-directory)) 20(add-to-list 'load-path (expand-file-name "arkta" user-emacs-directory))
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index 8fd9b2c..520c254 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -51,6 +51,7 @@
51 (auto-mode-case-fold nil) 51 (auto-mode-case-fold nil)
52 (auto-save-file-name-transforms `((".*" ,tmp-dir t))) 52 (auto-save-file-name-transforms `((".*" ,tmp-dir t)))
53 (backup-directory-alist `((".*" . ,tmp-dir))) 53 (backup-directory-alist `((".*" . ,tmp-dir)))
54 (confirm-kill-emacs #'yes-or-no-p)
54 (major-mode-remap-alist '((c-mode . c-ts-mode) 55 (major-mode-remap-alist '((c-mode . c-ts-mode)
55 (c-or-c++-mode . c-or-c++-ts-mode) 56 (c-or-c++-mode . c-or-c++-ts-mode)
56 (c++-mode . c++-ts-mode) 57 (c++-mode . c++-ts-mode)
@@ -71,6 +72,7 @@
71 (toml-mode . toml-ts-mode) 72 (toml-mode . toml-ts-mode)
72 (tsx-mode . tsx-ts-mode) 73 (tsx-mode . tsx-ts-mode)
73 (typescript-mode . typescript-ts-mode))) 74 (typescript-mode . typescript-ts-mode)))
75 (require-final-newline t)
74 :config 76 :config
75 (advice-add #'locate-user-emacs-file :around #'$adv-write-to-sane-paths)) 77 (advice-add #'locate-user-emacs-file :around #'$adv-write-to-sane-paths))
76 78
@@ -128,6 +130,11 @@
128 (initial-major-mode 'fundamental-mode) 130 (initial-major-mode 'fundamental-mode)
129 (initial-scratch-message nil)) 131 (initial-scratch-message nil))
130 132
133(setq delete-by-moving-to-trash t)
134(setq show-trailing-whitespace t)
135
136(setq-default word-wrap t)
137
131;; Don't draw stuff in other windows. 138;; Don't draw stuff in other windows.
132(setq-default cursor-in-non-selected-windows nil) 139(setq-default cursor-in-non-selected-windows nil)
133(setq highlight-nonselected-windows nil) 140(setq highlight-nonselected-windows nil)