summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dotfiles-darwin/emacs/init.el6
-rw-r--r--emacs/init.el8
2 files changed, 14 insertions, 0 deletions
diff --git a/dotfiles-darwin/emacs/init.el b/dotfiles-darwin/emacs/init.el
new file mode 100644
index 0000000..bc709fa
--- /dev/null
+++ b/dotfiles-darwin/emacs/init.el
@@ -0,0 +1,6 @@
+(when (display-graphic-p)
+ (setq mac-right-option-modifier 'none))
+
+(let ((gnu-ls "/usr/local/bin/gls"))
+ (when (file-exists-p gnu-ls)
+ (setq insert-directory-program gnu-ls)))
diff --git a/emacs/init.el b/emacs/init.el
index 909c6ae..431501d 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -8,6 +8,10 @@
package-user-dir (concat data-dir "elpa")
transient-history-file (concat cache-dir "transient/history.el")))
+(defun source-if-exists (filename)
+ (load (concat (file-truename "~/.emacs.d/../")
+ (substitute-in-file-name filename)) t))
+
(require 'package)
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
(package-initialize)
@@ -78,3 +82,7 @@
(add-hook 'ibuffer-mode-hook
(lambda () (ibuffer-switch-to-saved-filter-groups "default")))
(add-hook 'sh-mode-hook (lambda () (setq-local sh-basic-offset 2)))
+
+(source-if-exists "dotfiles-${UNAME}/emacs/init.el")
+(source-if-exists "dotfiles-${DOMAIN}/emacs/init.el")
+(source-if-exists "dotfiles-${HOST}/emacs/init.el")