summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2014-03-12 23:11:48 +0100
committerGravatar Tom Willemse2014-03-12 23:11:48 +0100
commit81be8917642803d657c24c6fa9440fe5ecfec5ff (patch)
tree0a02e784bb1e58a51a0c0f5f3e491063650deca5 /.emacs.d/init.el
parentb4c5d4a51316d994d36a1d631791e8f64ffeaf47 (diff)
downloademacs-81be8917642803d657c24c6fa9440fe5ecfec5ff.tar.gz
emacs-81be8917642803d657c24c6fa9440fe5ecfec5ff.zip
Fix usage on laptop
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el42
1 files changed, 17 insertions, 25 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 31f2fd7..587b023 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -688,22 +688,21 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
(hide-entry))
(call-interactively func))))))
-(let ((theme (if (equal system-name "drd") 'yoshi 'leuven)))
- (let (setp)
- (defun oni:set-theme (frame)
- "Try to set the theme for the current (first) frame."
- (ignore frame)
- (unless setp
- (load-theme theme t)
- (smt/enable)
- (require 'my-smt)
- (smt/set-theme 'my-smt)
- (set-face-attribute 'mode-line nil :box nil)
- (set-face-attribute 'mode-line-inactive nil :box nil))))
-
- (if (daemonp)
- (add-hook 'after-make-frame-functions #'oni:set-theme)
- (oni:eval-after-init (oni:set-theme nil))))
+(let (setp)
+ (defun oni:set-theme (frame)
+ "Try to set the theme for the current (first) frame."
+ (ignore frame)
+ (unless setp
+ (load-theme 'yoshi t)
+ (smt/enable)
+ (require 'my-smt)
+ (smt/set-theme 'my-smt)
+ (set-face-attribute 'mode-line nil :box nil)
+ (set-face-attribute 'mode-line-inactive nil :box nil))))
+
+(if (daemonp)
+ (add-hook 'after-make-frame-functions #'oni:set-theme)
+ (oni:eval-after-init (oni:set-theme nil)))
(defun oni:shell-command-with-command (command &optional output-buffer)
"Print both COMMAND and the output into OUTPUT-BUFFER."
@@ -1418,15 +1417,6 @@ If no direction is given, don't split."
(when (equal system-name "drd")
(load "eap-autoloads"))
-(let ((quicklisp-slime-directory
- "~/.local/share/quicklisp/local-projects/slime/"))
- (add-to-list 'load-path quicklisp-slime-directory)
- (require 'slime-autoloads)
- (setq slime-backend (expand-file-name "swank-loader.lisp"
- quicklisp-slime-directory)
- slime-path quicklisp-slime-directory)
- (slime-setup '(slime-fancy)))
-
(auto-insert-mode)
(electric-indent-mode -1)
(ido-mode 1)
@@ -1438,6 +1428,8 @@ If no direction is given, don't split."
(help-at-pt-set-timer)
(windmove-default-keybindings)
+(load system-name :noerror)
+
;;;; Custom
;; Finally, load any `customize' settings.
(load custom-file)