Reorder load-path and keys

1 files changed, 64 insertions, 66 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 23d1fb4..4a31ea6 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -842,6 +842,18 @@ If no direction is given, don't split."
 (defalias 'yes-or-no-p 'y-or-n-p)
 (defalias 'dabbrev-expand 'hippie-expand)
 
+;;;; Load path
+
+(eval-and-compile
+  (mapc #'loadpath-add-and-autoload
+        '("~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src"
+          "~/.emacs.d/vendor-lisp/org/lisp"
+          "~/.emacs.d/vendor-lisp/org/contrib/lisp"
+          "~/.emacs.d/vendor-lisp/mozrepl"
+          "~/.emacs.d/vendor-lisp/eap" "/usr/share/emacs/site-lisp")))
+
+(add-to-list 'load-path "/usr/lib/node_modules/tern/emacs/")
+
 ;;;; Unconditional settings
 
 (setq gnus-init-file "~/.emacs.d/site-lisp/gnus-init")
@@ -1260,61 +1272,7 @@ If no direction is given, don't split."
   ((tagedit) init-set-keys-for-tagedit)
   ((vala) oni:vala-mode-func))
 
-;;;; Visual cues
-
-(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
-          column-number-mode line-number-mode tooltip-mode)
-
-;;;; Typography
-
-;;;; Symbols
-
-(eval-and-compile
-  (mapc #'loadpath-add-and-autoload
-        '("~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src"
-          "~/.emacs.d/vendor-lisp/org/lisp"
-          "~/.emacs.d/vendor-lisp/org/contrib/lisp"
-          "~/.emacs.d/vendor-lisp/mozrepl"
-          "~/.emacs.d/vendor-lisp/eap" "/usr/share/emacs/site-lisp")))
-
-(global-set-key (kbd "C-c S") #'split-window-right)
-(global-set-key (kbd "C-c s") #'split-window-below)
-(global-set-key (kbd "C-c Q") #'delete-other-windows)
-(global-set-key (kbd "C-c R") #'delete-window)
-
-(add-to-list 'load-path "/usr/lib/node_modules/tern/emacs/")
-
-(global-set-key (kbd "C-. C-.") #'init-switch-to-other-buffer)
-
-(global-set-key (kbd "C-c -") #'decrease-number-at-point)
-(global-set-key (kbd "C-c +") #'increase-number-at-point)
-
-(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
-
-(enable '(downcase-region narrow-to-page narrow-to-region scroll-left
-          upcase-region))
-
-(eval-after-init (ido-ubiquitous-mode))
-
-(eval-after-load "org" '(require 'org-init))
-
-(eval-after-init
-  (require 'auto-complete-config)
-  (ac-config-default))
-
-(when (equal system-name "drd")
-  (eval-after-init
-   (load (expand-file-name "~/.local/share/quicklisp/slime-helper.el")))
-  (load "eap-autoloads"))
-
-(eval-after-init (smex-initialize))
-(eval-after-init (global-diff-hl-mode))
-(eval-after-init (mode-icons-mode))
-(eval-after-init (desktop-registry-auto-register))
-
-
-;; (setq pony-tpl-indent-moves t)
-;; (setq rainbow-delimiters-max-face-count 12)
+;;;; Keybindings
 
 (global-set-key (kbd "'") 'oni:self-insert-dwim)
 (global-set-key (kbd "<XF86HomePage>") 'oni:raise-scratch)
@@ -1324,6 +1282,9 @@ If no direction is given, don't split."
 (global-set-key (kbd "<f7>") 'magit-status)
 (global-set-key (kbd "<f8>") 'raise-eshell)
 (global-set-key (kbd "<hiragana>") 'oni:show-org-index)
+(global-set-key (kbd "<next>") 'oni:scroll-up-or-next-page)
+(global-set-key (kbd "<prior>") 'oni:scroll-down-or-prev-page)
+(global-set-key (kbd "C-. C-.") #'init-switch-to-other-buffer)
 (global-set-key (kbd "C-<") 'oni:indent-shift-left)
 (global-set-key (kbd "C->") 'oni:indent-shift-right)
 (global-set-key (kbd "C-M-4") 'split-window-vertically)
@@ -1333,17 +1294,31 @@ If no direction is given, don't split."
 (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)
 (global-set-key (kbd "C-M-z") 'indent-defun)
 (global-set-key (kbd "C-S-k") 'kill-whole-line)
+(global-set-key (kbd "C-c +") #'increase-number-at-point)
+(global-set-key (kbd "C-c -") #'decrease-number-at-point)
+(global-set-key (kbd "C-c Q") #'delete-other-windows)
+(global-set-key (kbd "C-c R") #'delete-window)
+(global-set-key (kbd "C-c S") #'split-window-right)
 (global-set-key (kbd "C-c a") 'org-agenda)
 (global-set-key (kbd "C-c c") 'org-capture)
 (global-set-key (kbd "C-c d c") 'desktop-clear)
 (global-set-key (kbd "C-c d d") 'desktop-registry-change-desktop)
 (global-set-key (kbd "C-c d s") 'desktop-save-in-desktop-dir)
+(global-set-key (kbd "C-c g b") 'magit-checkout)
+(global-set-key (kbd "C-c g f") 'magit-fetch)
+(global-set-key (kbd "C-c g i") 'magit-init)
+(global-set-key (kbd "C-c g s") 'magit-status)
+(global-set-key (kbd "C-c h r") 'hypo-region)
 (global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
+(global-set-key (kbd "C-c m") 'gnus)
 (global-set-key (kbd "C-c p") 'oni:show-buffer-position)
+(global-set-key (kbd "C-c s") #'split-window-below)
 (global-set-key (kbd "C-c t") 'oni:raise-ansi-term)
 (global-set-key (kbd "C-c w d") 'oni:downcase-prev)
 (global-set-key (kbd "C-c w u") 'oni:upcase-prev)
 (global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
+(global-set-key (kbd "C-x C-b") 'bs-show)
+(global-set-key (kbd "C-x f") 'fiplr-find-file)
 (global-set-key (kbd "M-0") 'delete-window)
 (global-set-key (kbd "M-1") 'delete-other-windows)
 (global-set-key (kbd "M-2") 'split-window-below)
@@ -1354,14 +1329,6 @@ If no direction is given, don't split."
 (global-set-key (kbd "M-x") 'smex)
 (global-set-key (kbd "\"") 'oni:self-insert-dwim)
 (global-set-key [remap move-beginning-of-line] 'move-beginning-of-dwim)
-(global-set-key (kbd "C-x f") 'fiplr-find-file)
-(global-set-key (kbd "C-c m") 'gnus)
-(global-set-key (kbd "C-c g s") 'magit-status)
-(global-set-key (kbd "C-c g i") 'magit-init)
-(global-set-key (kbd "C-c g b") 'magit-checkout)
-(global-set-key (kbd "C-c g f") 'magit-fetch)
-(global-set-key (kbd "C-c h r") 'hypo-region)
-(global-set-key (kbd "C-x C-b") 'bs-show)
 
 (if (daemonp)
     (global-set-key "\C-x\C-c" 'oni:close-client-window))
@@ -1369,6 +1336,40 @@ If no direction is given, don't split."
 (when (or window-system (daemonp))
   (global-unset-key "\C-z"))
 
+;;;; Visual cues
+
+(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
+          column-number-mode line-number-mode tooltip-mode)
+
+;;;; Symbols
+
+(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+
+(enable '(downcase-region narrow-to-page narrow-to-region scroll-left
+          upcase-region))
+
+(eval-after-init (ido-ubiquitous-mode))
+
+(eval-after-load "org" '(require 'org-init))
+
+(eval-after-init
+  (require 'auto-complete-config)
+  (ac-config-default))
+
+(when (equal system-name "drd")
+  (eval-after-init
+   (load (expand-file-name "~/.local/share/quicklisp/slime-helper.el")))
+  (load "eap-autoloads"))
+
+(eval-after-init (smex-initialize))
+(eval-after-init (global-diff-hl-mode))
+(eval-after-init (mode-icons-mode))
+(eval-after-init (desktop-registry-auto-register))
+
+
+;; (setq pony-tpl-indent-moves t)
+;; (setq rainbow-delimiters-max-face-count 12)
+
 (ido-mode)
 (minibuffer-electric-default-mode)
 (auto-insert-mode)
@@ -1378,9 +1379,6 @@ If no direction is given, don't split."
 (help-at-pt-set-timer)
 (windmove-default-keybindings)
 
-(global-set-key (kbd "<prior>") 'oni:scroll-down-or-prev-page)
-(global-set-key (kbd "<next>") 'oni:scroll-up-or-next-page)
-
 ;;; Finally, load any `customize' settings.
 (load custom-file)