el-get was too buggy. switch package management to Cask/Pallet

.gitignore

@@ -13,4 +13,4 @@ elpa
 var
 auto-save-list
 projectile-bookmarks.eld
-
+.cask

Cask

@@ -0,0 +1,57 @@
+(source gnu)
+(source marmalade)
+(source melpa)
+(source org)
+
+(depends-on "ag")
+(depends-on "apache-mode")
+(depends-on "cask")
+(depends-on "cider")
+(depends-on "coffee-mode")
+(depends-on "company")
+(depends-on "company-ghc")
+(depends-on "company-go")
+(depends-on "csv-mode")
+(depends-on "dash")
+(depends-on "dash-at-point")
+(depends-on "dired+")
+(depends-on "dired-details+")
+(depends-on "dired-single")
+(depends-on "dockerfile-mode")
+(depends-on "find-file-in-project")
+(depends-on "flx-ido")
+(depends-on "flycheck")
+(depends-on "ghc")
+(depends-on "gist")
+(depends-on "git-gutter")
+(depends-on "go-eldoc")
+(depends-on "go-mode")
+(depends-on "go-projectile")
+(depends-on "haskell-mode")
+(depends-on "inf-ruby")
+(depends-on "json-mode")
+(depends-on "json-reformat")
+(depends-on "json-snatcher")
+(depends-on "magit")
+(depends-on "markdown-mode")
+(depends-on "mo-git-blame")
+(depends-on "nginx-mode")
+(depends-on "org-plus-contrib")
+(depends-on "pallet")
+(depends-on "pbcopy")
+(depends-on "popup")
+(depends-on "projectile")
+(depends-on "rainbow-delimiters")
+(depends-on "request")
+(depends-on "robe")
+(depends-on "rubocop")
+(depends-on "ruby-mode")
+(depends-on "scala-mode2")
+(depends-on "shut-up")
+(depends-on "smart-mode-line")
+(depends-on "smartparens")
+(depends-on "smex")
+(depends-on "solarized-theme")
+(depends-on "sourcemap")
+(depends-on "textile-mode")
+(depends-on "yaml-mode")

README.md

@@ -1,14 +1,15 @@
 ## Introduction
 
-This is the Emacs configuration that [Alex Payne](http://al3x.net/) ([@al3x](https://github.com/al3x)) uses. It's not a "starter kit" or "configuration framework" for Emacs, though it does demonstrate the use of [El-Get](https://github.com/dimitri/el-get) and keeps customizations and tweaks tidy and modular.
+This is the Emacs configuration that [Alex Payne](http://al3x.net/) ([@al3x](https://github.com/al3x)) uses. It's not a "starter kit" or "configuration framework" or anything like that.
 
 ## Overview
 
+* Packages are managed with [Cask](https://github.com/cask/cask) and [Pallet](https://github.com/rdallasgray/pallet).
 * Works on Mac OS X. I install Emacs on OS X via [Homebrew](http://brew.sh/).
 * Previously worked on Linux (Emacs 23 GTK on Ubuntu), but _not actively maintained for Linux_.
 * Has some useful accommodations for Dvorak typists, such as `C-t` being mapped to `C-x`, and being able to `C-x c` (actually `C-t c`) to do a `M-x`.
   * Note that all of the above are way more comfortable if you set caps lock to act as ctrl.
-* Assumes that you want to use Emacs for editing and maybe very occasionally as your shell, but probably not for email, news, or web browsing.
+* Assumes that you want to use Emacs for editing text and code and not much more. No email, IRC, web browsing, Org mode craziness, etc.
 
 ## Supported Syntaxes
 
@@ -22,6 +23,8 @@ Beyond what Emacs supports out of the box:
 * Markdown
 * YAML
 
+...and some others. See the `Caskfile` for the whole gamut.
+
 ## Additional Modes and Tweaks
 
 * Magit – integration with the Git VCS

custom.el

@@ -0,0 +1,76 @@
+(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.
+ '(ansi-color-names-vector
+   ["#073642" "#dc322f" "#859900" "#b58900" "#268bd2" "#d33682" "#2aa198" "#657b83"])
+ '(compilation-message-face (quote default))
+ '(cua-global-mark-cursor-color "#2aa198")
+ '(cua-normal-cursor-color "#839496")
+ '(cua-overwrite-cursor-color "#b58900")
+ '(cua-read-only-cursor-color "#859900")
+ '(custom-safe-themes
+   (quote
+    ("3a727bdc09a7a141e58925258b6e873c65ccf393b2240c51553098ca93957723" "d677ef584c6dfc0697901a44b885cc18e206f05114c8a3b7fde674fce6180879" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" default)))
+ '(fci-rule-color "#073642")
+ '(highlight-changes-colors (quote ("#d33682" "#6c71c4")))
+ '(highlight-symbol-colors
+   (--map
+    (solarized-color-blend it "#002b36" 0.25)
+    (quote
+     ("#b58900" "#2aa198" "#dc322f" "#6c71c4" "#859900" "#cb4b16" "#268bd2"))))
+ '(highlight-symbol-foreground-color "#93a1a1")
+ '(highlight-tail-colors
+   (quote
+    (("#073642" . 0)
+     ("#546E00" . 20)
+     ("#00736F" . 30)
+     ("#00629D" . 50)
+     ("#7B6000" . 60)
+     ("#8B2C02" . 70)
+     ("#93115C" . 85)
+     ("#073642" . 100))))
+ '(magit-diff-use-overlays nil)
+ '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2))
+ '(term-default-bg-color "#002b36")
+ '(term-default-fg-color "#839496")
+ '(vc-annotate-background nil)
+ '(vc-annotate-color-map
+   (quote
+    ((20 . "#dc322f")
+     (40 . "#bb4914")
+     (60 . "#b0600c")
+     (80 . "#b58900")
+     (100 . "#947d04")
+     (120 . "#8b8004")
+     (140 . "#838304")
+     (160 . "#7b8603")
+     (180 . "#859900")
+     (200 . "#588c2f")
+     (220 . "#4c8d44")
+     (240 . "#3f8f5a")
+     (260 . "#329070")
+     (280 . "#2aa198")
+     (300 . "#2386a0")
+     (320 . "#2281ad")
+     (340 . "#217bba")
+     (360 . "#268bd2"))))
+ '(vc-annotate-very-old-color nil)
+ '(weechat-color-list
+   (quote
+    (unspecified "#002b36" "#073642" "#990A1B" "#dc322f" "#546E00" "#859900" "#7B6000" "#b58900" "#00629D" "#268bd2" "#93115C" "#d33682" "#00736F" "#2aa198" "#839496" "#657b83"))))
+(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-added ((t (:foreground "#559944"))) t)
+ '(diff-context ((t nil)) t)
+ '(diff-file-header ((((class color) (min-colors 88) (background dark)) (:foreground "RoyalBlue1"))) t)
+ '(diff-function ((t (:foreground "#00bbdd"))) t)
+ '(diff-header ((((class color) (min-colors 88) (background dark)) (:foreground "RoyalBlue1"))) t)
+ '(diff-hunk-header ((t (:foreground "#fbde2d"))) t)
+ '(diff-nonexistent ((t (:inherit diff-file-header :strike-through nil))) t)
+ '(diff-refine-change ((((class color) (min-colors 88) (background dark)) (:background "#182042"))) t)
+ '(diff-removed ((t (:foreground "#de1923"))) t))

init.el

@@ -29,8 +29,11 @@
 
 (setq default-directory "~/src")
 
+; load custom themeing
+(setq custom-file "~/.emacs.d/custom.el")
+(load custom-file)
+
 ; add directories to the load path
-(add-to-list 'load-path "~/.emacs.d")
 (add-to-list 'load-path "~/.emacs.d/customizations")
 (add-to-list 'load-path "~/.emacs.d/utilities")
 (add-to-list 'load-path "~/.emacs.d/vendor")
@@ -49,45 +52,10 @@
     (mapcar 'load-directory '("~/.emacs.d/linux-customizations"))
     (mapcar 'load-directory '("~/.emacs.d/mac-customizations")))
 
-; load and run El-Get
-(load-file "~/.emacs.d/el-get.el")
+; load packages via Pallet and Cask
+(require 'cask "/usr/local/Cellar/cask/0.7.1/cask.el")
+(cask-initialize)
+(require 'pallet)
 
-(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.
- '(ansi-color-names-vector ["#073642" "#dc322f" "#859900" "#b58900" "#268bd2" "#d33682" "#2aa198" "#657b83"])
- '(compilation-message-face (quote default))
- '(cua-global-mark-cursor-color "#2aa198")
- '(cua-normal-cursor-color "#839496")
- '(cua-overwrite-cursor-color "#b58900")
- '(cua-read-only-cursor-color "#859900")
- '(custom-safe-themes (quote ("d677ef584c6dfc0697901a44b885cc18e206f05114c8a3b7fde674fce6180879" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" default)))
- '(fci-rule-color "#073642")
- '(highlight-changes-colors (quote ("#d33682" "#6c71c4")))
- '(highlight-symbol-colors (--map (solarized-color-blend it "#002b36" 0.25) (quote ("#b58900" "#2aa198" "#dc322f" "#6c71c4" "#859900" "#cb4b16" "#268bd2"))))
- '(highlight-symbol-foreground-color "#93a1a1")
- '(highlight-tail-colors (quote (("#073642" . 0) ("#546E00" . 20) ("#00736F" . 30) ("#00629D" . 50) ("#7B6000" . 60) ("#8B2C02" . 70) ("#93115C" . 85) ("#073642" . 100))))
- '(magit-diff-use-overlays nil)
- '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2))
- '(term-default-bg-color "#002b36")
- '(term-default-fg-color "#839496")
- '(vc-annotate-background nil)
- '(vc-annotate-color-map (quote ((20 . "#dc322f") (40 . "#bb4914") (60 . "#b0600c") (80 . "#b58900") (100 . "#947d04") (120 . "#8b8004") (140 . "#838304") (160 . "#7b8603") (180 . "#859900") (200 . "#588c2f") (220 . "#4c8d44") (240 . "#3f8f5a") (260 . "#329070") (280 . "#2aa198") (300 . "#2386a0") (320 . "#2281ad") (340 . "#217bba") (360 . "#268bd2"))))
- '(vc-annotate-very-old-color nil)
- '(weechat-color-list (quote (unspecified "#002b36" "#073642" "#990A1B" "#dc322f" "#546E00" "#859900" "#7B6000" "#b58900" "#00629D" "#268bd2" "#93115C" "#d33682" "#00736F" "#2aa198" "#839496" "#657b83"))))
-(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-added ((t (:foreground "#559944"))) t)
- '(diff-context ((t nil)) t)
- '(diff-file-header ((((class color) (min-colors 88) (background dark)) (:foreground "RoyalBlue1"))) t)
- '(diff-function ((t (:foreground "#00bbdd"))) t)
- '(diff-header ((((class color) (min-colors 88) (background dark)) (:foreground "RoyalBlue1"))) t)
- '(diff-hunk-header ((t (:foreground "#fbde2d"))) t)
- '(diff-nonexistent ((t (:inherit diff-file-header :strike-through nil))) t)
- '(diff-refine-change ((((class color) (min-colors 88) (background dark)) (:background "#182042"))) t)
- '(diff-removed ((t (:foreground "#de1923"))) t))
+; initialize modes
+(mapc 'load-directory '("~/.emacs.d/mode-inits"))

el-get-init/init-cider.el → mode-inits/init-cider.el

@@ -1,3 +1,5 @@
+(require 'cider)
+
 ; settings
 (setq nrepl-hide-special-buffers t)
 (setq cider-repl-popup-stacktraces t)

mode-inits/init-dash-at-point.el

@@ -0,0 +1,3 @@
+(autoload 'dash-at-point "dash-at-point" nil t)
+
+(global-set-key "\C-cd" 'dash-at-point)

el-get-init/init-dired+.el → mode-inits/init-dired+.el

@@ -1,3 +1,5 @@
+(require 'dired+)
+
 (toggle-diredp-find-file-reuse-dir 1)
 
 (defun mydired-sort ()

mode-inits/init-dockerfile.el

@@ -0,0 +1,2 @@
+(autoload 'dockerfile-mode "dockerfile-mode" nil t)
+(add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode))

el-get-init/init-flx.el → mode-inits/init-flx.el

@@ -1,3 +1,5 @@
+(require 'flx-ido)
+
 (ido-mode 1)
 (ido-everywhere 1)
 (flx-ido-mode 1)

mode-inits/init-flycheck.el

@@ -0,0 +1,2 @@
+(autoload 'flycheck "flycheck" nil t)
+(add-hook 'after-init-hook 'global-flycheck-mode)

el-get-init/init-go-mode.el → mode-inits/init-go-mode.el

@@ -1,3 +1,5 @@
+(autoload 'go-mode "go-mode" nil t)
+
 (add-hook 'go-mode-hook
           #'(lambda () (setq indent-tabs-mode nil)))
 

el-get-init/init-haskell-mode.el → mode-inits/init-haskell-mode.el

@@ -1,3 +1,6 @@
+(autoload 'haskell-mode "haskell-mode" nil t)
+(autoload 'haskell-mode "ghc" nil t)
+
 (add-to-list 'auto-mode-alist '("\\.hs$" . haskell-mode))
 (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)

mode-inits/init-inf-ruby.el

@@ -0,0 +1,6 @@
+(autoload 'inf-ruby-minor-mode "inf-ruby" "Run an inferior Ruby process" t)
+(add-hook 'ruby-mode-hook 'inf-ruby-minor-mode)
+
+(setq
+  ruby-deep-indent-paren nil
+  ruby-deep-arglist nil)

el-get-init/init-magit.el → mode-inits/init-magit.el

@@ -1,4 +1,5 @@
-(autoload 'magit-status "magit" nil t)
+(autoload 'magit "magit" nil t)
+(autoload 'magit-status "magit-status" nil t)
 
 ; keys
 (global-set-key (kbd "C-c i") 'magit-status)

el-get-init/init-markdown-mode.el → mode-inits/init-markdown-mode.el

@@ -1,3 +1,6 @@
+(autoload 'markdown-mode "markdown-mode"
+  "Major mode for editing Markdown files" t)
+
 (add-to-list 'auto-mode-alist '("\\.markdown$" . markdown-mode))
 (add-to-list 'auto-mode-alist '("\\.mkd$" . markdown-mode))
 (add-to-list 'auto-mode-alist '("\\.md$" . markdown-mode))

mode-inits/init-rainbowdelimiters.el

@@ -0,0 +1 @@
+(require 'rainbow-delimiters)