Load elpy and use size 14 font by default.

[Dotty.git] / emacs / .emacs

diff --git a/emacs/.emacs b/emacs/.emacs
index 8cfb5be101fea0240ad083488b1def5fa55875a7..fc8ff518293da630b0669cf5eee8abcae22853d9 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -10,14 +10,19 @@
 ;; ESS - for working in R
 (autoload 'R-mode "ess-site.el" "Major mode for editing R source." t)
 
-(require 'ess-smart-underscore)
-(require 'auto-complete)
+(require 'org)
+
+;; Auctex
+(load "auctex.el" nil t t)
+(load "preview-latex.el" nil t t)
 
 ;; org-mode support for R and LaTeX
 (org-babel-do-load-languages
  'org-babel-load-languages
  '((R . t)
    (latex . t)))
+;; Security risk - This is somewhat ill-advised it appears
+(setq org-confirm-babel-evaluate nil)
 
 ;; Automatically switch to various modes
 (setq auto-mode-alist
@@ -37,6 +42,7 @@
       ("\\.ick\\'" . yaml-mode)
       ("\\.py\\'" . python-mode)
       ("\\.R\\'" . R-mode)
+      ("\\.org\\'" . org-mode)
       ("\\.sh\\'" . shell-script-mode)))
 
 ;; Enable the melpa archive for packages
@@ -54,14 +60,15 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(org-export-backends (quote (ascii html icalendar latex md odt)))
  '(package-selected-packages
    (quote
-    (leuven-theme lua-mode auto-complete ess-smart-underscore ess-R-data-view ess))))
+    (elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(default ((t (:family "Source Code Pro" :foundry "ADBO" :slant normal :weight normal :height 143 :width normal)))))