From 2ae9b155adef0d8f2b0322d23ea941d412735436 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 8 Apr 2016 16:15:37 -0400 Subject: [PATCH] Clean up --- Cask | 2 +- core/core-editor.el | 26 +++++++++++++------------- core/core-evil.el | 3 ++- core/core-ui.el | 30 +++++++++++++++++++----------- core/core.el | 24 +++++++++++++----------- 5 files changed, 48 insertions(+), 37 deletions(-) diff --git a/Cask b/Cask index 5ae3507e7..c6883f8a1 100644 --- a/Cask +++ b/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 diff --git a/core/core-editor.el b/core/core-editor.el index 4e4962ee9..3d60b567b 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -2,26 +2,26 @@ (setq-default ;; spaces instead of tabs - indent-tabs-mode nil - tab-always-indent t - tab-width 4 + indent-tabs-mode nil + tab-always-indent t + tab-width 4 - require-final-newline t - delete-trailing-lines nil - fill-column 90 - line-spacing 0 - word-wrap t - truncate-lines t - truncate-partial-width-windows 50 + require-final-newline t + delete-trailing-lines nil + fill-column 90 + line-spacing 0 + word-wrap t + truncate-lines t + truncate-partial-width-windows 50 visual-fill-column-center-text nil confirm-nonexistent-file-or-buffer nil ;; Sane scroll settings - scroll-margin 0 - scroll-conservatively 1001 + scroll-margin 0 + scroll-conservatively 1001 scroll-preserve-screen-position t - hscroll-step 1 + hscroll-step 1 hscroll-margin 1 shift-select-mode t diff --git a/core/core-evil.el b/core/core-evil.el index d18c0e388..2069d840d 100644 --- a/core/core-evil.el +++ b/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)) diff --git a/core/core-ui.el b/core/core-ui.el index 57dbf5f90..4c6e8abc7 100644 --- a/core/core-ui.el +++ b/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 - 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 - use-dialog-box nil ; always avoid GUI - redisplay-dont-pause t ; don't pause display on input - indicate-buffer-boundaries t ; show indicators where buffer starts/ends - 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 + highlight-nonselected-windows nil + 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 + visible-cursor nil + x-stretch-cursor t + use-dialog-box nil ; always avoid GUI + redisplay-dont-pause t ; don't pause display on input + indicate-buffer-boundaries t ; show indicators where buffer starts/ends + 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 diff --git a/core/core.el b/core/core.el index 3454900ad..a86fec881 100644 --- a/core/core.el +++ b/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 - - ;; http://ergoemacs.org/emacs/emacs_stop_cursor_enter_prompt.html - minibuffer-prompt-properties '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt) + ring-bell-function 'ignore ; silence of the bells! + save-interprogram-paste-before-kill nil + 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")