Remove highlight-indentation; clean up
This commit is contained in:
parent
b05d099886
commit
645229ce08
3 changed files with 6 additions and 24 deletions
|
@ -204,8 +204,7 @@ Examples:
|
|||
(turn-on-auto-fill))
|
||||
|
||||
(defun narf|enable-tab-width-2 ()
|
||||
(setq tab-width 2 evil-shift-width 2)
|
||||
(highlight-indentation-set-offset 2))
|
||||
(setq tab-width 2 evil-shift-width 2))
|
||||
|
||||
(defun narf|enable-tab-width-4 ()
|
||||
(setq tab-width 4 evil-shift-width 4))
|
||||
|
|
|
@ -96,9 +96,6 @@
|
|||
(global-auto-revert-mode 1) ; revert buffers for changed files
|
||||
(electric-indent-mode -1)
|
||||
|
||||
;; (add-hook! prog-mode 'whitespace-mode)
|
||||
;; (add-hook! emacs-lisp-mode 'whitespace-mode)
|
||||
|
||||
;; window config undo/redo
|
||||
(setq winner-dont-bind-my-keys t)
|
||||
(winner-mode 1)
|
||||
|
@ -168,11 +165,6 @@
|
|||
(use-package smartparens
|
||||
:diminish smartparens-mode
|
||||
:functions sp-insert-pair
|
||||
:commands (smartparens-global-mode
|
||||
sp-pair
|
||||
sp-local-pair
|
||||
sp-point-in-string-or-comment)
|
||||
:init (add-hook! evil-insert-state-entry (unless smartparens-global-mode (smartparens-global-mode 1)))
|
||||
:config
|
||||
(setq blink-matching-paren t
|
||||
sp-autowrap-region nil ; let evil-surround handle this
|
||||
|
@ -180,14 +172,13 @@
|
|||
sp-autoescape-string-quote nil
|
||||
sp-show-pair-delay 0)
|
||||
|
||||
(smartparens-global-mode 1)
|
||||
(require 'smartparens-config)
|
||||
|
||||
;; Handle newlines + spaces
|
||||
(sp-pair "{" "}"
|
||||
:post-handlers '(("||\n[i]" "RET") ("| " " "))
|
||||
(sp-pair "{" "}" :post-handlers '(("||\n[i]" "RET") ("| " " "))
|
||||
:unless '(sp-point-before-word-p sp-point-before-same-p))
|
||||
(sp-pair "(" ")"
|
||||
:post-handlers '(("||\n[i]" "RET") ("| " " "))
|
||||
(sp-pair "(" ")" :post-handlers '(("||\n[i]" "RET") ("| " " "))
|
||||
:unless '(sp-point-before-word-p sp-point-before-same-p))
|
||||
|
||||
;; Auto-close more conservatively
|
||||
|
@ -216,7 +207,6 @@
|
|||
:commands (smex smex-major-mode-commands smex-initialize smex-update)
|
||||
:init (setq smex-save-file (! (concat narf-temp-dir "smex-items")))
|
||||
:config (smex-initialize)
|
||||
|
||||
;; Hook up smex to auto-update, rather than update on every run
|
||||
(defun smex-update-after-load (unused)
|
||||
(when (boundp 'smex-cache) (smex-update)))
|
||||
|
|
|
@ -40,13 +40,6 @@
|
|||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(use-package highlight-indentation
|
||||
:diminish highlight-indentation-mode
|
||||
:config
|
||||
(add-hook! (prog-mode scss-mode)
|
||||
(unless (eq major-mode 'emacs-lisp-mode)
|
||||
(highlight-indentation-mode 1))))
|
||||
|
||||
(use-package nlinum ; line numbers
|
||||
:defer t
|
||||
:defines nlinum--width
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue