diff options
Diffstat (limited to '.config/emacs')
| -rw-r--r-- | .config/emacs/custom.el | 9 | ||||
| -rw-r--r-- | .config/emacs/init.el | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index 47bf654..ffc65c9 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -5,8 +5,12 @@ ;; If there is more than one, they won't work right. '(ansi-color-faces-vector [default bold shadow italic underline bold bold-italic bold]) '(ansi-color-names-vector (vector "#ffffff" "#ff9da4" "#d1f1a9" "#ffeead" "#bbdaff" "#ebbbff" "#99ffff" "#002451")) + '(asm-comment-char 35) + '(auto-save-default nil) '(custom-enabled-themes (quote (tango-dark))) - '(custom-safe-themes (quote ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) + '(custom-safe-themes (quote ("21d9280256d9d3cf79cbcf62c3e7f3f243209e6251b215aede5026e0c5ad853f" "9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) + '(dired-listing-switches "-alv") + '(dired-use-ls-dired t) '(erc-nick "lukeshu") '(explicit-shell-file-name "/bin/bash") '(fci-rule-color "#00346e") @@ -15,6 +19,9 @@ '(maildir-mail-dir "~/Maildir") '(mdmua-maildir "~/Maildir") '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))) + '(org-babel-load-languages (quote ((R . t) (emacs-lisp . t)))) + '(org-confirm-babel-evaluate nil) + '(org-export-latex-default-packages-alist (quote (("AUTO" "inputenc" t) ("" "fixltx2e" nil) ("" "graphicx" t) ("" "longtable" nil) ("" "float" nil) ("" "wrapfig" nil) ("" "textcomp" t) ("" "marvosym" t) ("" "wasysym" t) ("" "latexsym" t) ("" "amssymb" t) ("" "hyperref" nil) "\\tolerance=1000"))) '(page-break-lines-char 45) '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) 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) |