cleanup

diff --git a/init.el b/init.el
index 150669d27659899fa13c92750784fd7884f081f5..66d28bb93684cfe10b7b2505398151780378c14e 100644 (file)
--- a/init.el
+++ b/init.el
@@ -20,7 +20,7 @@
 
 ;;; init.el --- the start of customization
 
-(toggle-debug-on-error) ;uncomment to help debug
+;;(toggle-debug-on-error) ;uncomment to help debug
 
 
 ;; stop from minimizing & freezing the gui
@@ -46,11 +46,16 @@
           ;; taken from wiegley, dunno why the t is there.
           t)
 
+;; stuff to allow an alternate location for ~/.emacs.d
+(setq user-emacs-directory (file-name-directory user-init-file))
+(when (getenv "EHOME")
+  (setenv "HOME" (getenv "EHOME")))
+
 ;; 2019-6-26, 1.26s
 ;; ; to profile init:
 ;; ; uncomment the following block
-(require 'benchmark-init)
-(add-hook 'after-init-hook 'benchmark-init/deactivate)
+;;(require 'benchmark-init)
+;;(add-hook 'after-init-hook 'benchmark-init/deactivate)
 ;; ; Then run:
 ;; ; emacs -f benchmark-init/show-durations-tabulated
 ;; ; emacs -f benchmark-init/show-durations-tree
@@ -939,7 +944,6 @@ A non-nil CURRENT-ONLY argument means save only current buffer."
 
 ;; todo, turn on auto-fill just for txt files
 ;;(add-hook 'text-mode-hook 'turn-on-auto-fill)
-(add-hook 'text-mode-hook 'turn-on-flyspell)
 
 ;; random extra highlights
 (require 'volatile-highlights)
@@ -1418,8 +1422,6 @@ Go to the next directory based on where the cursor is."
                     nil))))))
 (add-hook 'prog-mode-hook 'prog-mode-defaults)
 
-;; enable flyspell in prog mode. text mode is handled
-(add-hook 'prog-mode-hook 'flyspell-prog-mode)
 
 
 ;;; yank auto-indent
@@ -1516,6 +1518,10 @@ indent yanked text (with prefix arg don't indent)."
   :defer t)
 ;; rw-hunspell sets up hunspell dictionary automagically.
 
+(use-package flyspell
+  :ensure-system-package hunspell
+  :hook ((prog-mode . flyspell-prog-mode)
+         (text-mode . turn-on-flyspell)))
 
 ;; Rant: Hunspell SHOULD be standard. its used by firefox and openoffice and
 ;; osx. In contrast, the first few words I added to aspell dictionary were
@@ -2220,7 +2226,7 @@ modes like org-mode which have their own yank function."
 
 ;;;;; C-M-d - split-window-horizontally
 
-(global-set-key (kbd "C-M-c") 'split-window-horizontally)
+(global-set-key (kbd "C-M-d") 'split-window-horizontally)
 
 
 ;;;;; C-f - kill-whole-line
@@ -2318,7 +2324,7 @@ modes like org-mode which have their own yank function."
 
 ;;;;; C-M-c - copy-to-register
 
-(global-set-key (kbd "C-M-d") 'copy-to-register)
+(global-set-key (kbd "C-M-c") 'copy-to-register)
 
 ;;;;; C-v - yank