From: Ramakrishnan Muthukrishnan <ramakrmu@insiemenetworks.com>
Date: Tue, 16 May 2017 12:54:09 +0000 (+0530)
Subject: remove ghc-mod, other misc changes
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg//%22%22?a=commitdiff_plain;h=317ada2b387ca4a787418f41a95797c40638ab3a;p=.emacs.d.git

remove ghc-mod, other misc changes
---

diff --git a/Makefile b/Makefile
index 25ef0ab..d2c78ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
 emacs ?= emacs
 
+inst:
+	# install hlint ghc-mod etc.. (assumption is that ghc and cabal-install
+	# are already installed.
+	cabal install hlint hindent alex happy
+
 upgrade:
+	cabal update
 	$(emacs) -batch -l packages.el
 
 run:
 	$(emacs) -Q -l init.el
 
-up: upgrade run
+up: upgrade inst run
diff --git a/init.el b/init.el
index 3b6b762..74dcfe3 100644
--- a/init.el
+++ b/init.el
@@ -3,9 +3,6 @@
 ;; y-or-n instead of yes-or-no
 (defalias 'yes-or-no-p 'y-or-n-p)
 
-;; theme
-(require 'color-theme-sanityinc-tomorrow)
-
 ;; Don't show startup msg, don't store tilde files
 (setq make-backup-files nil)
 (setq initial-scratch-message "")
@@ -185,13 +182,6 @@
 ;; sign all emails
 (add-hook 'message-setup-hook 'mml-secure-message-sign-pgp)
 
-(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.
- )
-
 ;; company mode for auto completion
 (add-hook 'after-init-hook 'global-company-mode)
 
@@ -262,3 +252,17 @@
 ;; key shortcut for org-agenda
 (global-set-key (kbd "C-c a") 'org-agenda)
 
+(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.
+ '(package-selected-packages
+   (quote
+    (tangotango-theme restclient railscasts-theme racket-mode racer paredit notmuch markdown-mode magit leuven-theme ledger-mode hindent go-mode flycheck-rust flycheck-haskell fill-column-indicator company-racer color-theme-sanityinc-tomorrow auto-complete))))
+(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.
+ )
diff --git a/packages.el b/packages.el
index 506bd88..78b8458 100644
--- a/packages.el
+++ b/packages.el
@@ -23,7 +23,6 @@
                      rust-mode
                      haskell-mode
                      hindent
-                     ghc
                      restclient
                      tangotango-theme
                      fill-column-indicator
@@ -36,22 +35,23 @@
                      magit
                      ledger-mode
                      company
-                     company-ghc
                      company-racer
                      markdown-mode
                      flycheck
                      flycheck-rust
                      flycheck-haskell
-                     racer
-                     color-theme-sanityinc-tomorrow))
+                     racer))
 
 ; install the missing packages
-(dolist (package package-list)
-  (unless (package-installed-p package)
-    (package-install package)))
+(defun install-all-packages ()
+  (dolist (package package-list)
+    (unless (package-installed-p package)
+      (package-install package))))
 
 ;; upgrade installed
-(save-window-excursion
-  (package-list-packages t)
-  (package-menu-mark-upgrades)
-  (package-menu-execute t))
+(defun upgrade-all-packages ()
+  (save-window-excursion
+    (package-list-packages t)
+    (package-menu-mark-upgrades)
+    (package-menu-execute t)))
+