Enable company mode; install magit and auctex.

[Dotty.git] / emacs / .emacs

diff --git a/emacs/.emacs b/emacs/.emacs
index fc8ff518293da630b0669cf5eee8abcae22853d9..962443b60c8a4477901ea88b5c4e7cac98f5ed33 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -10,6 +10,9 @@
 ;; ESS - for working in R
 (autoload 'R-mode "ess-site.el" "Major mode for editing R source." t)
 
+;; enable autocomplete
+(add-hook 'after-init-hook 'global-company-mode)
+
 (require 'org)
 
 ;; Auctex
@@ -48,22 +51,19 @@
 ;; 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)))
+ '(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))))
+   '(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.