diff options
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/init.el | 8 | ||||
| -rw-r--r-- | .emacs.d/init.org | 53 |
2 files changed, 34 insertions, 27 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 84a7d20..3f1a90d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -557,16 +557,16 @@ Also change directories to current working directory." (eval-after-init (ido-ubiquitous-mode)) -(eval-after-init - (load (expand-file-name "~/.local/share/quicklisp/slime-helper.el"))) - (eval-after-load "org" '(require 'org-init)) (eval-after-init (require 'auto-complete-config) (ac-config-default)) -(load "eap-autoloads") +(when (equal system-name "drd") + (eval-after-init + (load (expand-file-name "~/.local/share/quicklisp/slime-helper.el"))) + (load "eap-autoloads")) (eval-after-init (smex-initialize)) (eval-after-init (global-diff-hl-mode)) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 28b8cf9..1f37c7b 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -182,16 +182,19 @@ running a daemon, just set the theme. #+BEGIN_SRC emacs-lisp - (let ((setp (not (daemonp)))) - (defun init-set-theme (frame) - "Try to set the theme for the current (first) frame." - (ignore frame) - (unless setp - (run-at-time .1 nil (lambda () (setq setp (load-theme 'yoshi t))))))) - - (if (daemonp) - (add-hook 'after-make-frame-functions #'init-set-theme) - (eval-after-init (load-theme 'yoshi t))) + (let ((theme (if (equal system-name "drd") + 'yoshi + 'leuven))) + (let ((setp (not (daemonp)))) + (defun init-set-theme (frame) + "Try to set the theme for the current (first) frame." + (ignore frame) + (unless setp + (run-at-time .1 nil (lambda () (setq setp (load-theme theme t))))))) + + (if (daemonp) + (add-hook 'after-make-frame-functions #'init-set-theme) + (eval-after-init (load-theme theme t)))) #+END_SRC * Browsing with eww @@ -222,12 +225,13 @@ #+BEGIN_SRC emacs-lisp (defun init-set-emacs-lisp-symbols () - (setq prettify-symbols-alist - (append prettify-symbols-alist - '(("<=" . ?≤) - (">=" . ?≥) - ("sqrt" . ?√))))) - + (when (boundp 'prettify-symbols-alist) + (setq prettify-symbols-alist + (append prettify-symbols-alist + '(("<=" . ?≤) + (">=" . ?≥) + ("sqrt" . ?√)))))) + (add-hook 'emacs-lisp-mode-hook #'init-set-emacs-lisp-symbols) #+END_SRC @@ -237,19 +241,22 @@ #+BEGIN_SRC emacs-lisp (defun init-set-python-symbols () - (setq prettify-symbols-alist - '(("lambda" . ?λ) - ("<=" . ?≤) - (">=" . ?≥) - ("!=" . ?≠)))) - + (when (boundp 'prettify-symbols-alist) + (setq prettify-symbols-alist + '(("lambda" . ?λ) + ("<=" . ?≤) + (">=" . ?≥) + ("!=" . ?≠))))) + (add-hook 'python-mode-hook #'init-set-python-symbols) #+END_SRC Now just turn it on for =prog-mode=. #+BEGIN_SRC emacs-lisp - (add-hook 'prog-mode-hook 'prettify-symbols-mode) + (when (and (>= emacs-major-version 24) + (> emacs-minor-version 3)) + (add-hook 'prog-mode-hook 'prettify-symbols-mode)) #+END_SRC * Slime implementations |