Merge branch 'purcell:master' into master

lisp/init-corfu.el

@@ -21,9 +21,10 @@
  (setq-default corfu-quit-no-match 'separator)
  (add-hook 'after-init-hook 'global-corfu-mode)
 
- (when (featurep 'corfu-popupinfo)
- (with-eval-after-load 'corfu
- (corfu-popupinfo-mode)))
+
+
+ (with-eval-after-load 'corfu
+ (corfu-popupinfo-mode))
 
  ;; TODO: https://github.com/jdtsmith/kind-icon
  )

lisp/init-editing-utils.el

@@ -67,9 +67,8 @@
 
 
 
-;;; Newline behaviour
+;;; Newline behaviour (see also electric-indent-mode, enabled above)
 
-(global-set-key (kbd "RET") 'newline-and-indent)
 (defun sanityinc/newline-at-end-of-line ()
  "Move to end of line, enter a newline, and reindent."
  (interactive)
@@ -145,6 +144,9 @@
 
 ;;; Handy key bindings
 
+(with-eval-after-load 'help
+ (define-key help-map "A" 'describe-face))
+
 (global-set-key (kbd "C-.") 'set-mark-command)
 (global-set-key (kbd "C-x C-.") 'pop-global-mark)
 

lisp/init-git.el

@@ -15,7 +15,7 @@
 (require-package 'git-link)
 
 (when (maybe-require-package 'magit)
- (setq-default magit-diff-refine-hunk t)
+ (setq-default magit-diff-refine-hunk 'all)
 
  ;; Hint: customize `magit-repository-directories' so that you can use C-u M-F12 to
  ;; quickly open magit on any one of your projects.

lisp/init-nix.el

@@ -11,6 +11,8 @@
  ;; TODO: write a CAPF backend based on company-nixos-options
  ))
 
+(with-eval-after-load 'eglot
+ (add-to-list 'eglot-server-programs '((nix-mode) . ("nil"))))
 
 (provide 'init-nix)
 ;;; init-nix.el ends here

lisp/init-ocaml.el

@@ -2,10 +2,6 @@
 ;;; Commentary:
 ;;; Code:
 
-(with-eval-after-load 'eglot
- (put 'tuareg-mode 'eglot-language-id "ocaml")
- (add-to-list 'eglot-server-programs '((tuareg-mode) . ("ocamllsp")) t))
-
 (when (maybe-require-package 'tuareg)
  (with-eval-after-load 'tuareg
  (defvar-local tuareg-previous-tuareg-buffer nil

lisp/init-paredit.el

@@ -4,8 +4,9 @@
 
 (require-package 'paredit)
 
+
 (defun sanityinc/maybe-map-paredit-newline ()
- (unless (or (memq major-mode '(inferior-emacs-lisp-mode cider-repl-mode))
+ (unless (or (derived-mode-p 'inferior-emacs-lisp-mode 'cider-repl-mode)
  (minibufferp))
  (local-set-key (kbd "RET") 'paredit-newline)))
 
@@ -15,7 +16,7 @@
  (diminish 'paredit-mode " Par")
  ;; Suppress certain paredit keybindings to avoid clashes, including
  ;; my global binding of M-?
- (dolist (binding '("C-<left>" "C-<right>" "C-M-<left>" "C-M-<right>" "M-s" "M-?"))
+ (dolist (binding '("RET" "C-<left>" "C-<right>" "C-M-<left>" "C-M-<right>" "M-s" "M-?"))
  (define-key paredit-mode-map (read-kbd-macro binding) nil)))
 
 
@@ -34,8 +35,8 @@
 
 (defun sanityinc/conditionally-enable-paredit-mode ()
  "Enable paredit during lisp-related minibuffer commands."
- (if (memq this-command paredit-minibuffer-commands)
-  (enable-paredit-mode)))
+ (when (memq this-command paredit-minibuffer-commands)
+ (enable-paredit-mode)))
 
 
 (provide 'init-paredit)