X-Git-Url: http://git.vanrenterghem.biz/Dotty.git/blobdiff_plain/091d6360b362d4177f979aad98b29c678b4471d5..e34c555a0236966418f26bd0fd1072255a930529:/emacs/.emacs

diff --git a/emacs/.emacs b/emacs/.emacs
index fc8ff51..653d0ae 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -4,11 +4,16 @@
 ;; You may delete these explanatory comments.
 (package-initialize)
 
-;; Mandatory theme, being from Leuven originally
-(load-theme 'leuven t)
+;; Use a dark theme now
+(load-theme 'wheatgrass)
 
 ;; ESS - for working in R
 (autoload 'R-mode "ess-site.el" "Major mode for editing R source." t)
+(setq load-path (cons "/usr/share/emacs/site-lisp/ess" load-path))
+(load "/usr/share/emacs/site-lisp/ess/lisp/ess-site")
+
+;; enable autocomplete
+(add-hook 'after-init-hook 'global-company-mode)
 
 (require 'org)
 
@@ -48,22 +53,20 @@
 ;; Enable the melpa archive for packages
 (require 'package)
 (setq package-enable-at-startup nil)
-(add-to-list 'package-archives
-             '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
 (add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t)
 (add-to-list 'package-archives
              '("elpy" . "http://jorgenschaefer.github.io/packages/"))
 
-
 (custom-set-variables
  ;; custom-set-variables 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.
- '(org-export-backends (quote (ascii html icalendar latex md odt)))
+ '(browse-url-browser-function 'browse-url-firefox)
+ '(org-export-backends '(ascii html icalendar latex md odt))
  '(package-selected-packages
-   (quote
-    (elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess))))
+   '(ack company magit auctex lsp-mode 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.
@@ -72,3 +75,13 @@
  '(default ((t (:family "Source Code Pro" :foundry "ADBO" :slant normal :weight normal :height 143 :width normal)))))
 
 
+;; Send mail using SMTP via mail.vanrenterghem.io.
+(setq send-mail-function    'smtpmail-send-it)
+(setq smtpmail-smtp-server "mail.vanrenterghem.io"
+      smtpmail-smtp-service 587
+      smtpmail-stream-type 'starttls)
+(setq user-full-name "Frederik Vanrenterghem"
+      smtpmail-local-domain "vanrenterghem.io"
+      user-mail-address (concat "frederik@" smtpmail-local-domain))
+ 
+(setq w3m-pop-up-frames t)