From 2f6a45f5618b5bc614a7cc14d508694d8a0388f8 Mon Sep 17 00:00:00 2001
From: Timothy Jones <git@zmthy.io>
Date: Tue, 22 Sep 2015 16:25:51 +1200
Subject: [PATCH] Rename the idris-lang layer to idris

The idris-mode package has been updated to no longer use the
idris-packages variable, which allows the Idris layer to safely be
renamed to the standard for other languages.
---
 layers/+lang/{idris-lang => idris}/README.org    |   2 +-
 layers/+lang/{idris-lang => idris}/img/idris.png | Bin
 layers/+lang/{idris-lang => idris}/packages.el   |   8 +++-----
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename layers/+lang/{idris-lang => idris}/README.org (98%)
 rename layers/+lang/{idris-lang => idris}/img/idris.png (100%)
 rename layers/+lang/{idris-lang => idris}/packages.el (92%)

diff --git a/layers/+lang/idris-lang/README.org b/layers/+lang/idris/README.org
similarity index 98%
rename from layers/+lang/idris-lang/README.org
rename to layers/+lang/idris/README.org
index 7ba9c04e9..4b52ee4d4 100644
--- a/layers/+lang/idris-lang/README.org
+++ b/layers/+lang/idris/README.org
@@ -24,7 +24,7 @@ This layer adds support for the [[http://www.idris-lang.org/][Idris]] language.
 To use this layer, add it to your =~/.spacemacs=
 
 #+BEGIN_SRC elisp
-(setq-default dotspacemacs-configuration-layers '(idris-lang))
+(setq-default dotspacemacs-configuration-layers '(idris))
 #+END_SRC
 
 ** Idris
diff --git a/layers/+lang/idris-lang/img/idris.png b/layers/+lang/idris/img/idris.png
similarity index 100%
rename from layers/+lang/idris-lang/img/idris.png
rename to layers/+lang/idris/img/idris.png
diff --git a/layers/+lang/idris-lang/packages.el b/layers/+lang/idris/packages.el
similarity index 92%
rename from layers/+lang/idris-lang/packages.el
rename to layers/+lang/idris/packages.el
index d02f4eb0c..2696489d0 100644
--- a/layers/+lang/idris-lang/packages.el
+++ b/layers/+lang/idris/packages.el
@@ -10,14 +10,12 @@
 ;;
 ;;; License: GPLv3
 
-;; We name this layer idris-lang instead of idris because
-;; the variable `idris-packages' is already used by `idris-mode'
-(setq idris-lang-packages '(idris-mode))
+(setq idris-packages '(idris-mode))
 
-(defun idris-lang/init-idris-mode ()
+(defun idris/init-idris-mode ()
   (use-package idris-mode
     :defer t
-    :init
+    :config
     (progn
       (defun spacemacs/idris-load-file-and-focus (&optional set-line)
         "Pass the current buffer's file to the REPL and switch to it in