merge

2 files changed, 15 insertions, 6 deletions

diff --git a/elisp/package-require.el b/elisp/package-require.el
index 6cec6e5..198b01f 100644
--- a/elisp/package-require.el
+++ b/elisp/package-require.el
@@ -1,14 +1,18 @@
-;; ~/.emacs.d/elisp/package-require.el
-;; Luke Hoersten <[email protected]>
+;;; package-require --- Require that packages are installed
+;;; Commentary:
+;;; ~/.emacs.d/elisp/package-require.el
+;;; Luke Hoersten <[email protected]>
 
 (require 'package)
+
+;;; Code:
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
 
 (package-initialize)
 (package-refresh-contents)
 
 (defun package-require (packages)
-  "Ensure that a given package is installed"
+  "Ensure that a given PACKAGES are installed."
   (mapc (lambda (package)
           (unless (package-installed-p package)
             (package-install package)
@@ -17,3 +21,4 @@
 
 (message "Loading packages...done")
 (provide 'package-require)
+;;; package-require.el ends here
diff --git a/init.el b/init.el
index c52c84f..fe9aa7b 100644
--- a/init.el
+++ b/init.el
@@ -1,7 +1,7 @@
 ;; ~/.emacs.d/init.el (~/.emacs)
 ;; Luke Hoersten <[email protected]>
 
-;;;; General ;;;;
+;;; Code:
 (add-to-list 'load-path "~/.emacs.d/elisp")   ; set default emacs load path
 
 (setq-default
@@ -134,8 +134,11 @@
 (exec-path-from-shell-copy-env "PYTHONPATH")
 (exec-path-from-shell-initialize)
 (eshell)
-(add-hook 'eshell-mode-hook (lambda () (setenv "TERM" "emacs")))
 (setq tramp-default-method "ssh")
+(add-hook 'eshell-mode-hook
+          (lambda ()
+            (setenv "TERM" "emacs")
+            (setenv "PAGER" "cat")))
 
 ;;; ido / smex / completion
 (setq-default
@@ -231,7 +234,8 @@
    clojure-mode-hook
    emacs-lisp-mode-hook
    conf-mode-hook
-   yaml-mode-hook))
+   yaml-mode-hook
+   sql-mode-hook))
 
 
 ;;; expand-region