Emacs: Remove cask and pallet

Instead, use a package-directory based upon the emacs version, which was
the main feature about cask, for me.

3 files changed, 3 insertions, 207 deletions

diff --git a/hooks/post-up/emacs b/hooks/post-up/emacs
index b8a8edc..1cc19f9 100755
--- a/hooks/post-up/emacs
+++ b/hooks/post-up/emacs
@@ -2,22 +2,13 @@
 
 if [[ -s $commands[emacs] ]]
 then
-	if [[ ! -d ~/cask ]]
-	then
-		git clone git://github.com/cask/cask ~/.cask
-		if [[ ! -d ~/bin ]]
-		then
-			mkdir ~/bin
-		fi
-		ln -s ~/.cask/bin/cask ~/bin/cask
-	fi
 	pushd ~/.emacs.d
-	cask install
 	emacs --batch --eval "(progn
 (find-file \"init.org\")
 (require 'ob-tangle)
 (org-babel-tangle nil \"init.el\")
 (byte-compile-file \"init.el\")
+(load-file \"init.el\")
 )"
 	popd
 fi
diff --git a/tag-emacs/emacs.d/Cask b/tag-emacs/emacs.d/Cask
deleted file mode 100644
index 096b802..0000000
--- a/tag-emacs/emacs.d/Cask
+++ /dev/null
@@ -1,150 +0,0 @@
-(source gnu)
-(source marmalade)
-(source melpa)
-(source melpa-stable)
-(source org)
-
-(depends-on "ace-window")
-(depends-on "ag")
-(depends-on "async")
-(depends-on "auto-compile")
-(depends-on "auto-indent-mode")
-(depends-on "autopair")
-(depends-on "avy")
-(depends-on "bind-key")
-(depends-on "cask")
-(depends-on "cider")
-(depends-on "clj-refactor")
-(depends-on "clojure-mode")
-(depends-on "coffee-mode")
-(depends-on "company")
-(depends-on "company-go")
-(depends-on "company-tern")
-(depends-on "counsel")
-(depends-on "csv-mode")
-(depends-on "cyphejor")
-(depends-on "dash")
-(depends-on "dash-functional")
-(depends-on "deferred")
-(depends-on "diff-hl")
-(depends-on "diminish")
-(depends-on "dired+")
-(depends-on "dired-hacks-utils")
-(depends-on "dired-k")
-(depends-on "dired-subtree")
-(depends-on "discover")
-(depends-on "discover-my-major")
-(depends-on "dockerfile-mode")
-(depends-on "dtrt-indent")
-(depends-on "editorconfig")
-(depends-on "elisp-slime-nav")
-(depends-on "emmet-mode")
-(depends-on "epl")
-(depends-on "expand-region")
-(depends-on "f")
-(depends-on "fancy-narrow")
-(depends-on "fasd")
-(depends-on "feature-mode")
-(depends-on "flx")
-(depends-on "flx-ido")
-(depends-on "flycheck")
-(depends-on "framemove")
-(depends-on "geiser")
-(depends-on "ggtags")
-(depends-on "gh")
-(depends-on "gist")
-(depends-on "git-commit")
-(depends-on "git-timemachine")
-(depends-on "gntp")
-(depends-on "go-eldoc")
-(depends-on "go-mode")
-(depends-on "go-projectile")
-(depends-on "goto-chg")
-(depends-on "grizzl")
-(depends-on "haskell-mode")
-(depends-on "helm")
-(depends-on "helm-dash")
-(depends-on "helm-projectile")
-(depends-on "helm-swoop")
-(depends-on "help-fns+")
-(depends-on "hemisu-theme")
-(depends-on "highlight-stages")
-(depends-on "ido-completing-read+")
-(depends-on "ido-vertical-mode")
-(depends-on "jinja2-mode")
-(depends-on "jquery-doc")
-(depends-on "js2-mode")
-(depends-on "json-mode")
-(depends-on "json-reformat")
-(depends-on "ledger-mode")
-(depends-on "let-alist")
-(depends-on "litable")
-(depends-on "log4e")
-(depends-on "logito")
-(depends-on "lua-mode")
-(depends-on "magit")
-(depends-on "makey")
-(depends-on "markdown-mode")
-(depends-on "mmm-mode")
-(depends-on "move-text")
-(depends-on "multi-term")
-(depends-on "multiple-cursors")
-(depends-on "nginx-mode")
-(depends-on "nix-mode")
-(depends-on "nodejs-repl")
-(depends-on "org-journal")
-(depends-on "org-plus-contrib")
-(depends-on "package-build")
-(depends-on "packed")
-(depends-on "page-break-lines")
-(depends-on "pallet")
-(depends-on "paredit")
-(depends-on "password-store")
-(depends-on "pcache")
-(depends-on "persp-projectile")
-(depends-on "perspective")
-(depends-on "php-extras")
-(depends-on "php-mode")
-(depends-on "pkg-info")
-(depends-on "popwin")
-(depends-on "projectile")
-(depends-on "pt")
-(depends-on "queue")
-(depends-on "quickrun")
-(depends-on "rainbow-mode")
-(depends-on "redshank")
-(depends-on "relative-buffers")
-(depends-on "req-package")
-(depends-on "restclient")
-(depends-on "s")
-(depends-on "sass-mode")
-(depends-on "scss-mode")
-(depends-on "shrink-whitespace")
-(depends-on "shut-up")
-(depends-on "simple-httpd")
-(depends-on "skewer-mode")
-(depends-on "slime")
-(depends-on "slime-repl")
-(depends-on "smart-tab")
-(depends-on "smart-tabs-mode")
-(depends-on "smartparens")
-(depends-on "smex")
-(depends-on "solarized-theme")
-(depends-on "spinner")
-(depends-on "spotlight")
-(depends-on "swiper")
-(depends-on "tern")
-(depends-on "toml-mode")
-(depends-on "tup-mode")
-(depends-on "typopunct")
-(depends-on "undo-tree")
-(depends-on "use-package")
-(depends-on "visual-regexp")
-(depends-on "web-mode")
-(depends-on "wgrep")
-(depends-on "wgrep-ag")
-(depends-on "wgrep-pt")
-(depends-on "ws-butler")
-(depends-on "xrdb-mode" :git "git://github.com/emacsmirror/xrdb-mode")
-(depends-on "yaml-mode")
-(depends-on "yasnippet")
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index ed21bd1..720f14d 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -29,38 +29,6 @@ the buffer to be empty.
 
 * Packaging
 
-** Cask
-
-For most packages, I use [[https://github.com/cask/cask][cask]]
-#+BEGIN_SRC emacs-lisp
-  (eval-and-compile
-    (add-to-list 'load-path (expand-file-name "~/.cask")))
-  (require 'cask)
-  (cask-initialize)
-#+END_SRC
-
-*** Cask commands
-
-Installing
-#+BEGIN_SRC sh :tangle no
-curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
-#+END_SRC
-
-Install all packages specified in the Caskfile
-#+BEGIN_SRC sh :tangle no :dir ~/.emacs.d/
-cask install
-#+END_SRC
-
-List packages with new versions
-#+BEGIN_SRC sh :tangle no :dir ~/.emacs.d/ :results output
-cask outdated
-#+END_SRC
-
-Update old packages
-#+BEGIN_SRC sh :tangle no :dir ~/.emacs.d/
-cask update
-#+END_SRC
-
 ** Req-package
 
 #+BEGIN_SRC emacs-lisp
@@ -81,7 +49,8 @@ cask update
     (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
                              ("marmalade" . "https://marmalade-repo.org/packages/")
                              ("melpa" . "https://melpa.org/packages/")
-                             ("melpa-stable" . "https://stable.melpa.org/packages/")))
+                             ("melpa-stable" . "https://stable.melpa.org/packages/"))
+          package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa"))
     (package-initialize)
     (unless (package-installed-p 'req-package)
       (package-refresh-contents)
@@ -90,19 +59,6 @@ cask update
   (setq use-package-verbose t)
 #+END_SRC
 
-** Pallet
-
-I use [[https://github.com/rdallasgray/pallet][pallet]] to keep my [[file:Cask][Caskfile]] up-to-date with packages installed
-from inside Emacs.  I don’t need it on startup, so I tell
-=req-package= to initialise it when Emacs is idle.
-
-#+BEGIN_SRC emacs-lisp
-(req-package pallet
-  :defer 5
-  :config (pallet-mode 1))
-#+END_SRC
-
-
 * Customize
 I don’t really like using customize for normal configuration.
 Instead, I use it for things that get saved automatically. That’s why
@@ -1706,7 +1662,6 @@ Customise the modeline-display of =emacs-lisp-mode=. Then make sure
 it runs the common lisp hooks.
 
 #+BEGIN_SRC emacs-lisp
-(add-to-list 'auto-mode-alist '("/Cask\\'" . emacs-lisp-mode))
 (add-hook 'emacs-lisp-mode-hook #'ap/lisp-setup)
 (add-hook 'emacs-lisp-mode-hook #'eldoc-mode)
 #+END_SRC