diff --git a/.emacs.d/init.el b/.emacs.d/init.el index bc3f0d9..16edac6 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -5,9 +5,9 @@ (setq package-enable-at-startup nil) (setq package-archives '( + ("melpa" . "https://melpa.org/packages/") ("ELPA" . "http://tromey.com/elpa/") ("gnu" . "http://elpa.gnu.org/packages/") - ("melpa" . "https://melpa.org/packages/") ("ORG" . "https://orgmode.org/elpa/") ) ) @@ -189,6 +189,12 @@ :config ) +;;robe +(use-package robe + :ensure t + :config + ) + (require 'robe) (add-hook 'ruby-mode-hook 'robe-mode) (add-hook 'robe-mode-hook 'ac-robe-setup) @@ -196,12 +202,6 @@ (require 'flymake-ruby) (add-hook 'ruby-mode-hook 'flymake-ruby-load) -;;robe -(use-package robe - :ensure t - :config - ) - ;; Docker (use-package dockerfile-mode :ensure t @@ -239,28 +239,37 @@ (add-hook 'yaml-mode-hook #'ansible-doc-mode) ;; Markdown-mode +(custom-set-variables + '(markdown-command "/usr/bin/pandoc")) (use-package markdown-mode :ensure t :config ) +;; C++ C +(use-package auto-complete-clang + :ensure t + :config + ) + ;; Apache (use-package apache-mode :ensure t :config ) -;; Livedown -;;; sudo npm install -g livedown -;;; (add-to-list 'load-path (expand-file-name "~/.emacs.d/emacs-livedown")) -(require 'livedown) +;; Haskell +(use-package haskell-mode + :ensure t + :config +) + +(use-package flycheck-haskell + :ensure t + :config + ) +(add-hook 'flycheck-mode-hook #'flycheck-haskell-setup) -(custom-set-variables - '(livedown-autostart nil) ; automatically open preview when opening markdown files - '(livedown-open t) ; automatically open the browser window - '(livedown-port 1337) ; port for livedown server - '(livedown-browser nil)) ; browser to use -(global-set-key (kbd "C-M-m") 'livedown-preview) ;;; --- Look & Feel ---