From 2fcfd2a60507aeb986774646a840ce08d9d5a207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederik=20Hangh=C3=B8j=20Iversen?= <fiversen@zendesk.com>
Date: Wed, 8 May 2019 09:28:28 +0200
Subject: [PATCH] Move the monokai-dark-theme file to canonical location

---
 emacs/init.el                                 | 58 ++++++++++---------
 .../monokai-dark-theme}/monokai-dark-theme.el |  1 +
 2 files changed, 32 insertions(+), 27 deletions(-)
 rename emacs/{ => lisp/monokai-dark-theme}/monokai-dark-theme.el (97%)

diff --git a/emacs/init.el b/emacs/init.el
index 87a64ca..eae0a9a 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -96,33 +96,6 @@
  '(window-resize-pixelwise t))
 
 
-;;;; MAC setup
-
-(defun set-xdg-variables ()
-  "Set the XDG base directory variables to sane defaults."
-  (setenv "XDG_CONFIG_HOME" (substitute-in-file-name "$HOME/.config"))
-  (setenv "XDG_DATA_HOME" (substitute-in-file-name "$HOME/.local/share"))
-  (setenv "XDG_CACHE_HOME" (substitute-in-file-name "$HOME/.cache")))
-
-(defun x11-shim ()
-  "Replace some behaviour otherwise handled by other system services."
-  (load-theme 'monokai-dark)
-  (set-xdg-variables))
-
-;;; Needed on MAC because we're not using Xresources :(
-(if (not (eq window-system 'x))
-    (x11-shim))
-
-
-;;;; Faces
-
-(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.
- )
-
 ;;;; Additional packages
 ;;;; Maybe we should use qelpa to mangage these.
 
@@ -151,6 +124,9 @@
 
 (require 'agda2-mode)
 
+;; TODO Why is this not handled by the magic with the load-path above?
+(load-file "lisp/monokai-dark-theme/monokai-dark-theme.el")
+
 ;; (require 'lsp)
 ;; Shame! `lsp-ui` is emitting:
 ;; Eager macro-expansion failure: (wrong-type-argument listp kind)
@@ -159,6 +135,34 @@
 ;; (add-hook 'lsp-mode-hook 'lsp-ui-mode)
 ;; (add-hook 'haskell-mode-hook #'lsp)
 
+
+;;;; MAC setup
+
+(defun set-xdg-variables ()
+  "Set the XDG base directory variables to sane defaults."
+  (setenv "XDG_CONFIG_HOME" (substitute-in-file-name "$HOME/.config"))
+  (setenv "XDG_DATA_HOME" (substitute-in-file-name "$HOME/.local/share"))
+  (setenv "XDG_CACHE_HOME" (substitute-in-file-name "$HOME/.cache")))
+
+(defun x11-shim ()
+  "Replace some behaviour otherwise handled by other system services."
+  (load-theme 'monokai-dark)
+  (set-xdg-variables))
+
+;;; Needed on MAC because we're not using Xresources :(
+(if (not (eq window-system 'x))
+    (x11-shim))
+
+
+;;;; Faces
+
+(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.
+ )
+
 
 ;;;; Captain Hook
 
diff --git a/emacs/monokai-dark-theme.el b/emacs/lisp/monokai-dark-theme/monokai-dark-theme.el
similarity index 97%
rename from emacs/monokai-dark-theme.el
rename to emacs/lisp/monokai-dark-theme/monokai-dark-theme.el
index dcb169c..f7b927c 100644
--- a/emacs/monokai-dark-theme.el
+++ b/emacs/lisp/monokai-dark-theme/monokai-dark-theme.el
@@ -4,6 +4,7 @@
 ;;;
 ;;; Commentary:
 ;;; Code:
+;; (provide 'monokai-dark-theme)
 (deftheme monokai-dark
   "Created 2019-03-28 by fredefox.")