 ;; diff- mode (better colors)
 (use-package diff-mode-)
 ;; a slightly saner diff command
-(use-package ediff)
-(setq ediff-diff-options "-w")
+(use-package ediff
+  :config
+  (setq ediff-diff-options "-w"))
+
 
 ;; if no region is active, act on current line
-(use-package whole-line-or-region)
+(use-package whole-line-or-region
+  :ensure t)
 (setq whole-line-or-region-extensions-alist
       '((comment-dwim whole-line-or-region-comment-dwim-2 nil)
         (copy-region-as-kill whole-line-or-region-copy-region-as-kill nil)

(global-set-key (kbd "C-k") 'kill-and-join-forward)

;; delete all space before point up to beginning of line or non-whitespace char
(use-package hungry-delete)
(global-hungry-delete-mode)
(defun literal-delete-char (&optional arg)
  (interactive "P")
  (delete-char 1))

(define-key sp-keymap (kbd "C-c M-a") 'sp-copy-to-beginning-of-sexp)
(define-key sp-keymap (kbd "C-c M-e") 'sp-copy-to-end-of-sexp)

(use-package toggle-quotes
  :commands (toggle-quotes)
  :bind ("C-'" . toggle-quotes))

;; don't use shift to mark things; smartparens overwrites this anyway, but be explicit about it
(setq shift-select-mode nil)

