summaryrefslogtreecommitdiff
path: root/.config/emacs/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r--.config/emacs/init.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 2a7645f..2dfa5cb 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -4,6 +4,7 @@
(setq notify-method 'notify-via-libnotify)
(add-to-list 'load-path "~/.emacs.d/")
(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
+(setq server-auth-dir (locate-user-emacs-file "server/") (getenv "HOSTNAME"))
(setq custom-file "~/.emacs.d/custom.el")
; derived from ELPA installation
@@ -17,10 +18,9 @@
(eval-region (point) (point-max))
(kill-buffer (current-buffer)))))
- ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(unless (require 'package nil t)
- (eval-url "http://tromey.com/elpa/package-install.el"))
+(require 'package)
(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
("marmalade" . "http://marmalade-repo.org/packages/")
@@ -59,7 +59,7 @@
;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'go-mode-load)
-
+(require 'ess)
(require 'mailcrypt)
(mc-setversion "gpg")
(add-hook 'wl-summary-mode-hook 'mc-install-read-mode)
@@ -96,7 +96,7 @@
(ido-mode t)
(show-paren-mode 1)
(setq org-log-done 'time)
-(setq gamegrid-user-score-file-directory "/var/games/emacs/")
+;(setq gamegrid-user-score-file-directory "/var/games/emacs/")
;(xclip-mode 1)
(load "whitespace")
@@ -107,7 +107,6 @@
empty
))
-
;; These are my preferred settings; we let dtrt-indent detect when we play with other's files
(setq-default tab-width 8)
(setq-default c-basic-offset 8)