Clean up

Cask

@@ -180,8 +180,8 @@
 (depends-on "php-extras")
 
 ;; Python -- modules/module-python.el
-(depends-on "anaconda-mode")
 (depends-on "nose")
+(depends-on "anaconda-mode")
 (depends-on "company-anaconda")
 
 ;; Ruby -- modules/module-ruby.el

core/core-editor.el

@@ -2,26 +2,26 @@
 
 (setq-default
  ;; spaces instead of tabs
- indent-tabs-mode        nil
+ indent-tabs-mode nil
- tab-always-indent       t
+ tab-always-indent t
- tab-width               4
+ tab-width 4
 
- require-final-newline   t
+ require-final-newline t
- delete-trailing-lines   nil
+ delete-trailing-lines nil
- fill-column             90
+ fill-column 90
- line-spacing            0
+ line-spacing 0
- word-wrap               t
+ word-wrap t
- truncate-lines                  t
+ truncate-lines t
- truncate-partial-width-windows  50
+ truncate-partial-width-windows 50
 
  visual-fill-column-center-text nil
  confirm-nonexistent-file-or-buffer nil
 
  ;; Sane scroll settings
- scroll-margin           0
+ scroll-margin 0
- scroll-conservatively   1001
+ scroll-conservatively 1001
  scroll-preserve-screen-position t
- hscroll-step   1
+ hscroll-step 1
  hscroll-margin 1
 
  shift-select-mode t

core/core-evil.el

@@ -195,6 +195,7 @@
       file-name))
 
   ;; Make :g[lobal] highlight matches
+  ;; TODO Redo this mess
   (defvar narf-buffer-match-global evil-ex-substitute-global "")
   (defun narf--ex-buffer-match (flag &optional arg)
     (let ((hl-name 'evil-ex-buffer-match))
@@ -394,7 +395,7 @@
         evil-escape-delay 0.2)
 
   ;; evil-escape causes noticable lag in linewise motions in visual mode, so only enable
-  ;; it in insert mode.
+  ;; it in insert mode. (I only need jk for insert mode anyway)
   (defun narf|evil-escape-disable () (evil-escape-mode -1))
   (add-hook 'evil-insert-state-entry-hook 'evil-escape-mode)
   (add-hook 'evil-insert-state-exit-hook 'narf|evil-escape-disable))

core/core-ui.el

@@ -5,17 +5,25 @@
  show-paren-delay 0.075
 
  ;;cursor-in-non-selected-windows nil ; no cursors except in active buffer
- highlight-nonselected-windows  nil
+ highlight-nonselected-windows nil
- hl-line-sticky-flag            nil  ; only highlight in one window
+ hl-line-sticky-flag nil ; only highlight in one window
- uniquify-buffer-name-style     nil  ; my mode-line does this for me
+
- visible-bell                   nil  ; silence of the bells
+ uniquify-buffer-name-style nil ; my mode-line does this for me
- use-dialog-box                 nil  ; always avoid GUI
+ visible-bell nil
- redisplay-dont-pause           t    ; don't pause display on input
+ visible-cursor nil
- indicate-buffer-boundaries     t    ; show indicators where buffer starts/ends
+ x-stretch-cursor t
- indicate-empty-lines           t    ; show indicators on empty lines
+ use-dialog-box nil            ; always avoid GUI
- fringes-outside-margins        t    ; switches order of fringe and margin
+ redisplay-dont-pause t        ; don't pause display on input
- split-width-threshold          nil  ; favor horizontal splits
+ indicate-buffer-boundaries t  ; show indicators where buffer starts/ends
- show-help-function             nil  ; hide :help-echo text
+ indicate-empty-lines t        ; show indicators on empty lines
+ fringes-outside-margins t     ; switches order of fringe and margin
+ split-width-threshold nil     ; favor horizontal splits
+ show-help-function nil        ; hide :help-echo text
+
+ jit-lock-defer-time 0.04
+ jit-lock-stealth-nice 0.1
+ jit-lock-stealth-time 0.2
+ jit-lock-stealth-verbose nil
 
  ;; Disable bidirectional text support for slight performance bonus
  bidi-display-reordering        nil

core/core.el

@@ -16,33 +16,35 @@
 ;;;
 
 (setq-default
- idle-update-delay                  2           ; update a little less often
  ad-redefinition-action            'accept      ; silence the advised function warnings
- echo-keystrokes                    0.02        ; show me what I type
- history-length                     1000
- ring-bell-function                'ignore      ; silence of the bells!
- save-interprogram-paste-before-kill nil
- sentence-end-double-space          nil
- enable-recursive-minibuffers       nil         ; no minibufferception
  compilation-always-kill            t           ; kill compilation process before spawning another
  compilation-ask-about-save         nil         ; save all buffers before compiling
  compilation-scroll-output          t           ; scroll with output while compiling
+ delete-by-moving-to-trash          t
+ echo-keystrokes                    0.02        ; show me what I type
  ediff-diff-options                 "-w"
  ediff-split-window-function       'split-window-horizontally   ; side-by-side diffs
  ediff-window-setup-function       'ediff-setup-windows-plain   ; no extra frames
+ enable-recursive-minibuffers       nil         ; no minibufferception
+ history-length                     1000
+ idle-update-delay                  2           ; update a little less often
  inhibit-startup-echo-area-message  "hlissner"  ; username shuts up emacs
  inhibit-startup-screen             t           ; don't show emacs start screen
- initial-scratch-message            nil
  initial-major-mode                'text-mode   ; initial scratch buffer mode
+ initial-scratch-message            nil
  major-mode                        'text-mode
-
+ ring-bell-function                'ignore      ; silence of the bells!
- ;; http://ergoemacs.org/emacs/emacs_stop_cursor_enter_prompt.html
+ save-interprogram-paste-before-kill nil
- minibuffer-prompt-properties '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)
+ sentence-end-double-space          nil
 
  ;; remove annoying ellipsis when printing sexp in message buffer
  eval-expression-print-length       nil
  eval-expression-print-level        nil
 
+ ;; http://ergoemacs.org/emacs/emacs_stop_cursor_enter_prompt.html
+ minibuffer-prompt-properties
+ '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)
+
  bookmark-save-flag                 t
  bookmark-default-file              (concat narf-temp-dir "/bookmarks")