diff options
| -rw-r--r-- | init.el | 1 | ||||
| -rw-r--r-- | init.org | 26 |
2 files changed, 14 insertions, 13 deletions
| diff --git a/init.el b/init.el index a933776..c8ae6a6 100644 --- a/init.el +++ b/init.el | |||
| @@ -9,4 +9,3 @@ | |||
| 9 | (org-babel-tangle) | 9 | (org-babel-tangle) |
| 10 | (load-file (concat user-emacs-directory "early-init.el")) | 10 | (load-file (concat user-emacs-directory "early-init.el")) |
| 11 | (load-file (concat user-emacs-directory "init.el")) | 11 | (load-file (concat user-emacs-directory "init.el")) |
| 12 | (byte-compile-file (concat user-emacs-directory "init.el")) | ||
| diff --git a/init.org b/init.org index 32e3ec8..3cebb79 100644 --- a/init.org +++ b/init.org | |||
| @@ -33,17 +33,16 @@ After the first run, the above ~init.el~ will be replaced by the tangled stuff h | |||
| 33 | 33 | ||
| 34 | #+NAME: tangle-on-save | 34 | #+NAME: tangle-on-save |
| 35 | #+BEGIN_SRC emacs-lisp :tangle no | 35 | #+BEGIN_SRC emacs-lisp :tangle no |
| 36 | (defun acdw/tangle-init () | 36 | (defun acdw/tangle-init () |
| 37 | "If the current buffer is `init.org', the code blocks are tangled, | 37 | "If the current buffer is `init.org', the code blocks are tangled, |
| 38 | and the tangled file is compiled and loaded." | 38 | and the tangled file is compiled and loaded." |
| 39 | (when (equal (buffer-file-name) | 39 | (when (equal (buffer-file-name) |
| 40 | (expand-file-name (concat user-emacs-directory "init.org"))) | 40 | (expand-file-name (concat user-emacs-directory "init.org"))) |
| 41 | ;; Avoid running hooks when tangling. | 41 | ;; Avoid running hooks when tangling. |
| 42 | (let ((prog-mode-hook nil)) | 42 | (let ((prog-mode-hook nil)) |
| 43 | (org-babel-tangle) | 43 | (org-babel-tangle) |
| 44 | (byte-compile-file (concat user-emacs-directory "init.el")) | 44 | (load-file (concat user-emacs-directory "early-init.el")) |
| 45 | (load-file (concat user-emacs-directory "early-init.el")) | 45 | (load-file (concat user-emacs-directory "init.el"))))) |
| 46 | (load-file (concat user-emacs-directory "init.el"))))) | ||
| 47 | 46 | ||
| 48 | (add-hook 'after-save-hook #'acdw/tangle-init) | 47 | (add-hook 'after-save-hook #'acdw/tangle-init) |
| 49 | #+END_SRC | 48 | #+END_SRC |
| @@ -312,6 +311,10 @@ I'm sure there's a better way to do this, but for now, this is the best I've got | |||
| 312 | (unicode-fonts-setup)) | 311 | (unicode-fonts-setup)) |
| 313 | 312 | ||
| 314 | #+END_SRC | 313 | #+END_SRC |
| 314 | ** Interactivity | ||
| 315 | #+begin_src emacs-lisp | ||
| 316 | (fset 'yes-or-no-p #'y-or-n-p) | ||
| 317 | #+end_src | ||
| 315 | * Editing | 318 | * Editing |
| 316 | ** Completion | 319 | ** Completion |
| 317 | I was using company, but I think it might've been causing issues with ~awk-mode~, so I'm trying ~hippie-mode~ right now. So far, I'm also enjoying not having a popup all the time. | 320 | I was using company, but I think it might've been causing issues with ~awk-mode~, so I'm trying ~hippie-mode~ right now. So far, I'm also enjoying not having a popup all the time. |
| @@ -437,8 +440,7 @@ I was using company, but I think it might've been causing issues with ~awk-mode~ | |||
| 437 | (when (= orig-point (point)) | 440 | (when (= orig-point (point)) |
| 438 | (move-beginning-of-line 1)))) | 441 | (move-beginning-of-line 1)))) |
| 439 | 442 | ||
| 440 | (bind-key "C-a" ; can't do [remap], don't know why | 443 | (bind-key "C-a" #'my/smarter-move-beginning-of-line) |
| 441 | #'my/smarter-move-beginning-of-line) | ||
| 442 | #+END_SRC | 444 | #+END_SRC |
| 443 | ** Delete the selection when typing | 445 | ** Delete the selection when typing |
| 444 | #+BEGIN_SRC emacs-lisp | 446 | #+BEGIN_SRC emacs-lisp |