Use Cask and Pallet to manage packages

21 files changed, 58 insertions, 67 deletions

diff --git a/.gitignore b/.gitignore
index 707addb..cfc2e00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 auto-save-list
 cache
-elpa
 bookmarks
 /lisp/init-untracked.el
 /.mc-lists.el
@@ -13,3 +12,4 @@ bookmarks
 /.org-id-locations
 /.python-environments
 /ac-comphist.dat
+/.cask
diff --git a/Cask b/Cask
new file mode 100644
index 0000000..c99d0ae
--- /dev/null
+++ b/Cask
@@ -0,0 +1,48 @@
+(source gnu)
+(source melpa)
+
+(depends-on "ace-jump-mode")
+(depends-on "ace-link")
+(depends-on "ace-window")
+(depends-on "auctex")
+(depends-on "auto-complete")
+(depends-on "boxquote")
+(depends-on "dash")
+(depends-on "diminish")
+(depends-on "dired-narrow")
+(depends-on "dired-subtree")
+(depends-on "ess")
+(depends-on "expand-region")
+(depends-on "flx")
+(depends-on "flx-ido")
+(depends-on "git-annex")
+(depends-on "git-timemachine")
+(depends-on "gitattributes-mode")
+(depends-on "gitconfig-mode")
+(depends-on "gitignore-mode")
+(depends-on "haskell-mode")
+(depends-on "htmlize")
+(depends-on "ido-at-point")
+(depends-on "ido-ubiquitous")
+(depends-on "ido-vertical-mode")
+(depends-on "jedi")
+(depends-on "key-chord")
+(depends-on "less-css-mode")
+(depends-on "lua-mode")
+(depends-on "markdown-mode")
+(depends-on "mocker")
+(depends-on "multiple-cursors")
+(depends-on "narrow-indirect")
+(depends-on "noflet")
+(depends-on "pallet")
+(depends-on "paredit")
+(depends-on "pkgbuild-mode")
+(depends-on "poporg")
+(depends-on "projectile")
+(depends-on "s")
+(depends-on "smex")
+(depends-on "stan-mode")
+(depends-on "subr+")
+(depends-on "wrap-region")
+(depends-on "yaml-mode")
+(depends-on "yasnippet")
\ No newline at end of file
diff --git a/init.el b/init.el
index 23316a0..32f73a9 100644
--- a/init.el
+++ b/init.el
@@ -2,19 +2,21 @@
 (add-to-list 'load-path km/init-lisp-dir)
 
 (require 'init-elpa)
+
+(require 'cask)
+(cask-initialize)
+(require 'pallet)
+(pallet-mode 1)
+
 (require 'init-appearance)
-(require 'init-general)
-(require 'init-diminish)
 
-(require-package 'dash)
 (require 'dash)
-(require-package 's)
 (require 's)
-(require-package 'noflet)
-(require-package 'mocker)
+
+(require 'init-general)
+(require 'init-diminish)
 
 (require 'init-org)
-(require-package 'poporg)
 (require 'init-orgcontacts)
 (require 'init-babel)
 
@@ -24,7 +26,6 @@
 (require 'init-view)
 
 (require 'init-editing)
-(require-package 'boxquote)
 
 (require 'init-text)
 (require 'init-elisp)
@@ -32,17 +33,11 @@
 (require 'init-haskell)
 (require 'init-python)
 (require 'init-ess)
-(require-package 'stan-mode)
-(require-package 'lua-mode)
 
 (require 'init-tex)
 (require 'init-bib)
 (require 'init-bog)
 
-(require-package 'htmlize)
-(require-package 'less-css-mode)
-(require-package 'yaml-mode)
-
 (require 'init-dired)
 (require 'init-git)
 (require 'init-projectile)
diff --git a/lisp/init-ace.el b/lisp/init-ace.el
index 80380ea..1e4bc55 100644
--- a/lisp/init-ace.el
+++ b/lisp/init-ace.el
@@ -1,7 +1,3 @@
-(require-package 'ace-jump-mode)
-(require-package 'ace-link)
-(require-package 'ace-window)
-
 ;;; Ace Jump
 
 (key-chord-define-global ";a" 'ace-jump-mode)
diff --git a/lisp/init-diminish.el b/lisp/init-diminish.el
index a2d726d..7c44072 100644
--- a/lisp/init-diminish.el
+++ b/lisp/init-diminish.el
@@ -1,4 +1,3 @@
-(require-package 'diminish)
 (require 'diminish)
 
 (diminish 'abbrev-mode "Ab")
diff --git a/lisp/init-dired.el b/lisp/init-dired.el
index db45f18..590536e 100644
--- a/lisp/init-dired.el
+++ b/lisp/init-dired.el
@@ -115,8 +115,6 @@ window."
   ;; This overrides `dired-find-file', which is also bound to "f".
   (define-key dired-mode-map "e" 'km/org-open-dired-marked-files))
 
-(require-package 'dired-narrow)
-
 (define-prefix-command 'km/dired-narrow-prefix-map)
 (define-key km/dired-narrow-prefix-map "n" 'dired-narrow)
 (define-key km/dired-narrow-prefix-map "f" 'dired-narrow-fuzzy)
@@ -124,8 +122,6 @@ window."
 
 (define-key dired-mode-map "/" 'dired-narrow)
 
-(require-package 'dired-subtree)
-
 (define-prefix-command 'km/dired-subtree-prefix-map)
 (define-key km/dired-subtree-prefix-map "i" 'dired-subtree-insert)
 (define-key km/dired-subtree-prefix-map "r" 'dired-subtree-remove)
diff --git a/lisp/init-editing.el b/lisp/init-editing.el
index 9e03333..a633e63 100644
--- a/lisp/init-editing.el
+++ b/lisp/init-editing.el
@@ -1,8 +1,3 @@
-(require-package 'multiple-cursors)
-(require-package 'expand-region)
-(require-package 'wrap-region)
-(require-package 'subr+)
-(require-package 'narrow-indirect)
 
 (global-set-key (kbd "C-x \\") 'align-regexp)
 
diff --git a/lisp/init-elisp.el b/lisp/init-elisp.el
index fa66852..8ec711d 100644
--- a/lisp/init-elisp.el
+++ b/lisp/init-elisp.el
@@ -1,4 +1,3 @@
-(require-package 'paredit)
 
 (autoload 'enable-paredit-mode "paredit"
   "Turn on pseudo-structural editing of Lisp code."
diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el
index cf0462b..ed79286 100644
--- a/lisp/init-elpa.el
+++ b/lisp/init-elpa.el
@@ -5,18 +5,6 @@
 
 (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
 
-(defun require-package (package &optional min-version no-refresh)
-  "Install given PACKAGE, optionally requiring MIN-VERSION.
-If NO-REFRESH is non-nil, the available package lists will not be
-re-downloaded in order to locate PACKAGE."
-  (if (package-installed-p package min-version)
-      t
-    (if (or (assoc package package-archive-contents) no-refresh)
-        (package-install package)
-      (progn
-        (package-refresh-contents)
-        (require-package package min-version t)))))
-
 (package-initialize)
 
 (provide 'init-elpa)
diff --git a/lisp/init-ess.el b/lisp/init-ess.el
index a9f9b79..6564b27 100644
--- a/lisp/init-ess.el
+++ b/lisp/init-ess.el
@@ -1,4 +1,3 @@
-(require-package 'ess)
 
 (autoload 'R-mode "ess-site")
 (add-to-list 'auto-mode-alist '("\\.[rR]\\'" . R-mode))
diff --git a/lisp/init-general.el b/lisp/init-general.el
index eb82345..65a37f8 100644
--- a/lisp/init-general.el
+++ b/lisp/init-general.el
@@ -36,7 +36,6 @@
 (put 'downcase-region 'disabled nil)
 (put 'upcase-region 'disabled nil)
 
-(require-package 'key-chord)
 (key-chord-mode 1)
 
 (global-set-key (kbd "C-h :") 'find-function)
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 29e4963..a166c60 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -6,16 +6,8 @@
 
 (require 'orgit)
 
-(require-package 'git-annex)
 (require 'git-annex)
 
-(require-package 'git-timemachine)
-
-(require-package 'git-timemachine)
-(require-package 'gitconfig-mode)
-(require-package'gitignore-mode)
-(require-package 'gitattributes-mode)
-
 (setq git-annex-commit nil)
 
 (require 'magit-annex-autoloads)
diff --git a/lisp/init-haskell.el b/lisp/init-haskell.el
index 219ed5f..895b4da 100644
--- a/lisp/init-haskell.el
+++ b/lisp/init-haskell.el
@@ -1,4 +1,3 @@
-(require-package 'haskell-mode)
 
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
 (add-hook 'haskell-mode-hook 'interactive-haskell-mode)
diff --git a/lisp/init-ido.el b/lisp/init-ido.el
index 7a25f99..ad597e5 100644
--- a/lisp/init-ido.el
+++ b/lisp/init-ido.el
@@ -1,8 +1,3 @@
-(require-package 'flx)
-(require-package 'flx-ido)
-(require-package 'ido-vertical-mode)
-(require-package 'ido-ubiquitous)
-(require-package 'ido-at-point)
 
 (setq ido-enable-prefix nil
       ido-enable-flex-matching t
diff --git a/lisp/init-projectile.el b/lisp/init-projectile.el
index 3d44b83..1571906 100644
--- a/lisp/init-projectile.el
+++ b/lisp/init-projectile.el
@@ -1,4 +1,3 @@
-(require-package 'projectile)
 
 (projectile-global-mode)
 
diff --git a/lisp/init-python.el b/lisp/init-python.el
index 45e899b..642e8fb 100644
--- a/lisp/init-python.el
+++ b/lisp/init-python.el
@@ -1,5 +1,3 @@
-(require-package 'auto-complete)
-(require-package 'jedi)
 
 (add-hook 'python-mode-hook 'jedi:setup)
 (add-hook 'python-mode-hook 'auto-complete-mode)
diff --git a/lisp/init-shell.el b/lisp/init-shell.el
index a353526..06a3732 100644
--- a/lisp/init-shell.el
+++ b/lisp/init-shell.el
@@ -1,7 +1,5 @@
 ;;; Shell and configuration files
 
-(require-package 'pkgbuild-mode)
-
 (add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
 (add-to-list 'auto-mode-alist '("\\.*rc\\'" . conf-unix-mode))
 
diff --git a/lisp/init-smex.el b/lisp/init-smex.el
index 14610d0..56183b9 100644
--- a/lisp/init-smex.el
+++ b/lisp/init-smex.el
@@ -1,4 +1,3 @@
-(require-package 'smex)
 
 (smex-initialize)
 
diff --git a/lisp/init-tex.el b/lisp/init-tex.el
index c1a4a0d..4fdefb1 100644
--- a/lisp/init-tex.el
+++ b/lisp/init-tex.el
@@ -1,4 +1,3 @@
-(require-package 'auctex)
 
 (add-hook 'LaTeX-mode-hook 'turn-on-reftex)
 
diff --git a/lisp/init-text.el b/lisp/init-text.el
index e432272..309566f 100644
--- a/lisp/init-text.el
+++ b/lisp/init-text.el
@@ -1,4 +1,3 @@
-(require-package 'markdown-mode)
 
 (setq-default fill-column 72)
 
diff --git a/lisp/init-yas.el b/lisp/init-yas.el
index 6baebea..9c708b0 100644
--- a/lisp/init-yas.el
+++ b/lisp/init-yas.el
@@ -1,4 +1,3 @@
-(require-package 'yasnippet)
 
 (require 'yasnippet)