summary refs log tree commit diff
path: root/emacs.d/custom/fcuny-edit.el
blob: bdbe29b28acdee5c257b986b3270bed608523f7e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
(use-package autorevert
  :config
  (setq global-auto-revert-non-file-buffers t)
  (setq auto-revert-verbose nil)
  (global-auto-revert-mode t))

(use-package whitespace
  :hook ((prog-mode         . fcuny/whitespace-setup)
         (conf-mode-hook    . fcuny/whitespace-setup)
         (outline-mode-hook . fcuny/whitespace-setup))

  :custom
  (whitespace-style '(face))
  (show-trailing-whitespace nil)

  :init
  (defun fcuny/whitespace-setup ()
    (setq show-trailing-whitespace t)))

(use-package electric-pair-mode
  :commands electric-pair-mode
  :hook (prog-mode . electric-pair-mode))

(use-package paren
  :ensure t
  :custom
  (show-paren-delay 0)
  (show-paren-when-point-inside-paren t)
  (show-paren-when-point-in-periphery t)
  :config
  (show-paren-mode 1))

(use-package ediff
  :config
  (defhydra hydra-ediff (:color blue)
  "
^Buffers           Files               VC                Ediff regions
----------------------------------------------------------------------
_b_uffers          _f_iles (_=_)       _r_evisions       _l_inewise
_B_uffers (3-way)  _F_iles (3-way)                       _w_ordwise
                   _c_urrent file
"
  ("b" ediff-buffers)
  ("B" ediff-buffers3)
  ("=" ediff-files)
  ("f" ediff-files)
  ("F" ediff-files3)
  ("c" ediff-current-file)
  ("r" ediff-revision)
  ("l" ediff-regions-linewise)
  ("w" ediff-regions-wordwise))

  (global-set-key (kbd "C-c d") 'hydra-ediff/body))

(global-set-key (kbd "M-j") 'join-line)

(provide 'fcuny-edit)