From 5f7643630c8b69b6ae83df855c1c680c27f877c1 Mon Sep 17 00:00:00 2001
From: petrucci4prez <natedwarshuis@gmail.com>
Date: Sun, 19 Aug 2018 10:27:55 -0400
Subject: [PATCH] add flyspell helm and correct holiday bug

---
 conf.org | 18 +++++++++++++++++-
 init.el  |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/conf.org b/conf.org
index a75f7c4..da42aad 100644
--- a/conf.org
+++ b/conf.org
@@ -339,6 +339,12 @@ event of an error or nonlocal exit."
   (yas-reload-all))
 #+END_SRC
 * languages
+** flyspell
+#+BEGIN_SRC emacs-lisp
+(use-package flyspell-correct-helm
+  :ensure t
+  :after (helm flyspell))
+#+END_SRC
 ** progmode
 #+BEGIN_SRC emacs-lisp
 (add-hook 'prog-mode-hook #'prettify-symbols-mode)
@@ -819,6 +825,9 @@ the agenda does not do this by default...it's annoying
 	  holiday-hebrew-holidays nil
 	  holiday-oriental-holidays nil
 	  holiday-islamic-holidays nil)
+
+(setq calendar-holidays (append holiday-general-holidays
+								holiday-christian-holidays))
 #+END_SRC
 **** library
 Since I am never totally satisfied with how the agenda works, I have a massive library of functions to filter and manipulate tasks (mostly for skip functions). I also have a few variables I set in order to toggle certain views
@@ -1649,7 +1658,9 @@ I like being evil. All package and custom bindings go here.
   :config
   (evil-mode 1))
 #+END_SRC
-*** surround
+*** enhancements
+delightfully ripped off from vim plugins
+**** surround
 #+BEGIN_SRC emacs-lisp
 (use-package evil-surround
   :ensure t
@@ -1736,6 +1747,11 @@ ESS has not joined the dark side. Configure similarly to term (see below) where
 			(add-hook 'evil-insert-state-entry-hook
 					  'nd/ess-char-mode-insert nil t)))
 #+END_SRC
+*** flyspell
+#+BEGIN_SRC emacs-lisp
+(evil-define-key 'nornal 'flyspell-mode-map
+  (kbd "C-;") 'flyspell-correct-previous-word-generic)
+#+END_SRC
 *** collection
 Most packages that don't have an evil version are in this one. I don't like surprises so I set =evil-collection-modes-list= with the modes I actually want. Some of these are further configured below.
 #+BEGIN_SRC emacs-lisp
diff --git a/init.el b/init.el
index f717262..0033637 100644
--- a/init.el
+++ b/init.el
@@ -21,7 +21,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-	(evil-surround markdown-mode polymode csv-mode company-ghc calf-org evil-magit magit yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window))))
+	(flyspell-correct-helm helm-flyspell evil-surround markdown-mode polymode csv-mode company-ghc calf-org evil-magit magit yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.