--- a/elisp/haskell-init.el	Mon May 11 09:45:31 2015 -0500
+++ b/elisp/haskell-init.el	Tue Jun 23 17:34:37 2015 -0500
@@ -3,7 +3,7 @@
 
 ;; Require packages
 (require 'package-require)
-(package-require '(flycheck yasnippet haskell-snippets haskell-mode flycheck-haskell))
+(package-require '(haskell-mode yasnippet haskell-snippets flycheck flycheck-haskell))
 
 ;; Load haskell-mode from source
 ;; (add-to-list 'load-path "~/Code/elisp/haskell-mode/")

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/elisp/helm-init.el	Tue Jun 23 17:34:37 2015 -0500
@@ -0,0 +1,36 @@
+(require 'package-require)
+(package-require '(helm company helm-company flycheck helm-flycheck helm-flyspell helm-ls-hg helm-package))
+
+;;; helm
+(require 'helm-config)
+;; (helm-mode t)
+(global-set-key (kbd "M-x") 'helm-M-x)
+(global-set-key (kbd "C-x C-f") 'helm-find-files)
+(global-set-key (kbd "C-x f") 'helm-browse-project)
+(global-set-key (kbd "C-x b") 'helm-buffers-list)
+(setq-default
+ helm-buffers-fuzzy-matching t
+ helm-M-x-fuzzy-match t)
+
+;;;; helm company
+(eval-after-load 'company
+  '(progn
+     (define-key company-mode-map (kbd "M-/") 'helm-company)
+     (define-key company-active-map (kbd "M-/") 'helm-company)))
+
+;;;; helm flycheck
+ (eval-after-load 'flycheck
+   '(define-key flycheck-mode-map (kbd "C-c ! h") 'helm-flycheck))
+
+;;;; helm flyspell
+;; (define-key flyspell-mode-map (kbd "C-;") 'helm-flyspell-correct)
+
+;;;; helm eshell
+(add-hook 'eshell-mode-hook
+          #'(lambda ()
+              (define-key eshell-mode-map
+                [remap eshell-pcomplete]
+                'helm-esh-pcomplete)
+              (define-key eshell-mode-map
+                (kbd "M-p")
+                'helm-eshell-history)))

--- a/elisp/javascript-init.el	Mon May 11 09:45:31 2015 -0500
+++ b/elisp/javascript-init.el	Tue Jun 23 17:34:37 2015 -0500
@@ -3,7 +3,7 @@
 
 ;; Require packages
 (require 'package-require)
-(package-require '(ac-js2 js2-mode json-mode))
+(package-require '(auto-complete ac-js2 js2-mode json-mode))
 
 (require 'auto-complete-config)
 

--- a/elisp/package-require.el	Mon May 11 09:45:31 2015 -0500
+++ b/elisp/package-require.el	Tue Jun 23 17:34:37 2015 -0500
@@ -9,7 +9,8 @@
   "Ensure that a given package is installed"
   (mapc (lambda (package)
           (unless (package-installed-p package)
-            (package-install package)))
+            (package-install package)
+            (message "Installing %s package...done" package)))
         packages))
 
 (message "Loading packages...done")

--- a/init.el	Mon May 11 09:45:31 2015 -0500
+++ b/init.el	Tue Jun 23 17:34:37 2015 -0500
@@ -66,7 +66,8 @@
 (setq-default
  ido-enable-flex-matching t                             ; fuzzy matching for ido mode
  ido-create-new-buffer 'always                          ; create new buffer without prompt
- ido-everywhere t)                                      ; use ido where possible
+ ido-everywhere t                                       ; use ido where possible
+ ido-max-window-height 1)                               ; max ido window height
 
 ;;; whitespace-mode
 (global-whitespace-mode t)                              ; show whitespace
@@ -113,9 +114,10 @@
 
 ;;; packages
 (require 'package-require)
-(package-require '(exec-path-from-shell expand-region
- rainbow-delimiters rainbow-mode solarized-theme visual-regexp
- yasnippet zencoding-mode markdown-mode move-text powerline))
+(package-require '(company exec-path-from-shell expand-region
+hgignore-mode markdown-mode move-text paredit powerline
+rainbow-delimiters rainbow-mode solarized-theme visual-regexp
+yasnippet zencoding-mode))
 
 ;; powerline
 (require 'powerline)
@@ -132,9 +134,15 @@
 (require 'javascript-init)
 (require 'c-init)             ; c specific elisp
 
-;; ;;; company mode
-;; (add-hook 'after-init-hook 'global-company-mode)
-;; (global-set-key (kbd "M-/") 'company-complete)
+;;; company mode
+(add-hook 'after-init-hook 'global-company-mode)
+(global-set-key (kbd "M-/") 'company-complete)
+(custom-set-variables
+ '(company-idle-delay nil)
+ '(company-minimum-prefix-length 2)
+ '(company-selection-wrap-around t)
+ '(company-show-numbers t)
+ '(company-tooltip-align-annotations t))
 
 ;;; uniquify
 (require 'uniquify)           ; unique buffer names with dirs
@@ -157,6 +165,8 @@
 
 ;;; markdown-mode
 (add-hook 'markdown-mode-hook 'flyspell-mode)
+(setq-default
+ markdown-command "pandoc -f markdown_github")
 
 
 ;;; html-mode