about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-10-09 17:10:44 +0000
committerAlyssa Ross <hi@alyssa.is>2020-10-09 17:10:44 +0000
commita656309fcddbd1fd0a62c0a994d4da097a1adbee (patch)
tree170b8e4c2e8d4c1223e8e372a4f0e3cd2f71a272
parentff6c3e1cf9ee440de9701301d8b475d74e2d1bf3 (diff)
downloadnixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.tar
nixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.tar.gz
nixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.tar.bz2
nixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.tar.lz
nixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.tar.xz
nixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.tar.zst
nixlib-a656309fcddbd1fd0a62c0a994d4da097a1adbee.zip
modules/emacs: fix recent customisations
I need to remember to start up a fresh Emacs and everything looks okay
after changing init.el.

Both of these don't work if they're evaluated too early, and
dired-listing-switches wasn't being interpreted as a variable
reference, but as a stringp.
-rw-r--r--modules/workstation/emacs/init.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
index d15b25168172..4c480b86f094 100644
--- a/modules/workstation/emacs/init.el
+++ b/modules/workstation/emacs/init.el
@@ -26,12 +26,14 @@
 (add-to-list 'auto-mode-alist '("\\.quirks\\'" . conf-unix-mode))
 
 ;;; CC Mode ;;;
-;; Default to kernel style.
-(add-to-list 'c-default-style '(other . "linux"))
+(with-eval-after-load 'cc-styles
+  ;; Default to kernel style.
+  (add-to-list 'c-default-style '(other . "linux")))
 
 ;;; Dired ;;;
-(setq dired-listing-switches
-      (combine-and-quote-strings '(dired-listing-switches "-h")))
+(with-eval-after-load 'dired
+  (setq dired-listing-switches
+	(combine-and-quote-strings `(,dired-listing-switches "-h"))))
 
 ;;; Direnv ;;;
 (direnv-mode)