Rethink config/default & keybindings

+ Added +smartparens flag to config/default for default smartparens
  config.
+ Fixed +tng support for completion/company.
+ Removed super keybinds (for all but MacOS)
+ Moved "keybind fixes" to config/default/config.el (these should be
  universally available).
+ Replaced both +default-repeat-forward-key and +default-repeat-backward-key
  with +default-repeat-keys. If this variable is nil, the universal
  repeat motions won't be bound.

init.example.el

@@ -153,7 +153,6 @@
        ;;literate
 
        ;; The default module sets reasonable defaults for Emacs. It also
-       ;; provides a Spacemacs-inspired keybinding scheme, a custom yasnippet
+       ;; provides a Spacemacs-inspired keybinding scheme and a smartparens
-       ;; library, and additional ex commands for evil-mode. Use it as a
+       ;; config. Use it as a reference for your own modules.
-       ;; reference for your own modules.
+       (default +bindings +smartparens))
-       (default +bindings))

modules/completion/company/autoload.el

@@ -86,6 +86,12 @@ To have BACKENDS apply to any mode that is a parent of MODES, set MODES to
 ;;
 ;; Commands
 
+;;;###autoload
+(defun +company-has-completion-p ()
+  "Return non-nil if a completion candidate exists at point."
+  (and (company-manual-begin)
+       (= company-candidates-length 1)))
+
 ;;;###autoload
 (defun +company/toggle-auto-completion ()
   "Toggle as-you-type code completion."

modules/completion/company/config.el

@@ -35,8 +35,11 @@
   :config
   (add-to-list 'company-frontends 'company-tng-frontend)
   (define-key! company-active-map
+    "RET"       nil
     [return]    nil
+    "TAB"       #'company-select-next
     [tab]       #'company-select-next
+    "<backtab>" #'company-select-previous
     [backtab]   #'company-select-previous))
 
 

modules/config/default/+evil-bindings.el

@@ -6,6 +6,12 @@
 ;; tell it explicitly.
 (setq expand-region-contract-fast-key "V")
 
+;; Don't let evil-collection interfere with certain keys
+(setq evil-collection-key-blacklist
+      (list "C-j" "C-k" "gd" "gf" "K" "[" "]" "gz"
+            doom-leader-key doom-localleader-key
+            doom-leader-alt-key doom-localleader-alt-key))
+
 
 ;;
 ;; Global keybindings
@@ -20,50 +26,30 @@
       [remap evil-jump-to-tag] #'projectile-find-tag
       [remap find-tag]         #'projectile-find-tag
 
-      :i [remap newline] #'newline-and-indent
+      ;; Smart tab
-      :i "C-j"           #'+default/newline
+      :i [tab] (general-predicate-dispatch 'indent-for-tab-command
+                 (and (featurep! :feature snippets)
+                      (yas-maybe-expand-abbrev-key-filter 'yas-expand))
+                 'yas-expand
+                 (and (featurep! :completion company +tng)
+                      (+company-has-completion-p))
+                 '+company/complete)
 
-      :n "s-+"    (λ! (text-scale-set 0))
+      ;; Smarter newlines
-      :n "s-="    #'text-scale-increase
+      :i [remap newline] #'newline-and-indent  ; auto-indent on newline
-      :n "s--"    #'text-scale-decrease
+      :i "C-j"           #'+default/newline    ; default behavior
-
-      ;; Simple window/frame navigation/manipulation
-      :n "s-w"    #'delete-window
-      :n "s-W"    #'delete-frame
-      :n "C-S-f"  #'toggle-frame-fullscreen
-      :n "s-n"    #'+default/new-buffer
-      :n "s-N"    #'make-frame
-
-      ;; Textmate-esque bindings
-      :n "s-R"    #'+eval/region-and-replace
-      :n "s-a"    #'mark-whole-buffer
-      :n "s-b"    #'+default/compile
-      :n "s-c"    #'evil-yank
-      :n "s-f"    #'swiper
-      :n "s-q"    (if (daemonp) #'delete-frame #'evil-quit-all)
 
       ;; expand-region
       :v "v"   #'er/expand-region
       :v "C-v" #'er/contract-region
 
-      ;; Restore OS undo, save, copy, & paste keys (without cua-mode, because it
+      (:after vc-annotate
-      ;; imposes some other functionality and overhead we don't need)
-      :g "s-z"    #'undo
-      :g "s-s"    #'save-buffer
-      :g "s-c"    #'yank
-      :g "s-v"    #'copy-region-as-kill
-      :v "s-v"    (if (featurep 'evil) #'evil-yank #'yank)
-
-      :nv "C-SPC" #'+evil/fold-toggle)
-
-
-;;
-;; Built-in plugins
-
-(map! :after vc-annotate
         :map vc-annotate-mode-map
         [remap quit-window] #'kill-this-buffer)
 
+      ;; misc
+      :n "C-S-f"  #'toggle-frame-fullscreen)
+
 
 ;;
 ;; Module keybinds
@@ -104,6 +90,7 @@
         :nv "gx"    #'evil-exchange
         :nv "C-a"   #'evil-numbers/inc-at-pt
         :nv "C-S-a" #'evil-numbers/dec-at-pt
+        :nv "C-SPC" #'+evil/fold-toggle
         :nv [tab]   #'+evil/matchit-or-toggle-fold
         :v  "gp"    #'+evil/paste-preserve-register
         :v  "@"     #'+evil:apply-macro
@@ -202,13 +189,12 @@
           (:map yas-keymap
             "C-e"         #'+snippets/goto-end-of-field
             "C-a"         #'+snippets/goto-start-of-field
-            "<s-right>"     #'+snippets/goto-end-of-field
+            [s-right]     #'+snippets/goto-end-of-field
-            "<s-left>"      #'+snippets/goto-start-of-field
+            [s-left]      #'+snippets/goto-start-of-field
-            "<s-backspace>" #'+snippets/delete-to-start-of-field
+            [s-backspace] #'+snippets/delete-to-start-of-field
             [backspace]   #'+snippets/delete-backward-char
             [delete]      #'+snippets/delete-forward-char-or-field)
           (:map yas-minor-mode-map
-            :ie [tab] yas-maybe-expand
             :v [tab] #'yas-insert-snippet)))
 
       (:when (featurep! :feature spellcheck)
@@ -230,18 +216,6 @@
           :n "RET" #'flycheck-error-list-goto-error))
 
       (:when (featurep! :feature workspaces)
-        :n "s-t" #'+workspace/new
-        :n "s-T" #'+workspace/display
-        :n "s-1" (λ! (+workspace/switch-to 0))
-        :n "s-2" (λ! (+workspace/switch-to 1))
-        :n "s-3" (λ! (+workspace/switch-to 2))
-        :n "s-4" (λ! (+workspace/switch-to 3))
-        :n "s-5" (λ! (+workspace/switch-to 4))
-        :n "s-6" (λ! (+workspace/switch-to 5))
-        :n "s-7" (λ! (+workspace/switch-to 6))
-        :n "s-8" (λ! (+workspace/switch-to 7))
-        :n "s-9" (λ! (+workspace/switch-to 8))
-        :n "s-0" #'+workspace/switch-to-last
         :n "gt"  #'+workspace/switch-right
         :n "gT"  #'+workspace/switch-left
         :n "]w"  #'+workspace/switch-right
@@ -294,14 +268,12 @@
           :map ivy-minibuffer-map
           "C-SPC" #'ivy-call-and-recenter  ; preview file
           "C-l"   #'ivy-alt-done
-          "s-z"   #'undo
-          "s-v"   #'yank
           "C-v"   #'yank)
         (:after counsel
           :map counsel-ag-map
-          [backtab]  #'+ivy/wgrep-occur      ; search/replace on results
           "C-SPC"    #'ivy-call-and-recenter ; preview
-          "s-RET"    (+ivy-do-action! #'+ivy-git-grep-other-window-action))
+          [backtab]  #'+ivy/wgrep-occur      ; search/replace on results
+          [C-return] (+ivy-do-action! #'+ivy-git-grep-other-window-action))
         (:after swiper
           :map swiper-map
           [backtab] #'+ivy/wgrep-occur))
@@ -338,16 +310,20 @@
             [right]    nil)
           (:after helm-files
             :map (helm-find-files-map helm-read-file-map)
-            [M-return] #'helm-ff-run-switch-other-window
+            [C-return] #'helm-ff-run-switch-other-window
             "C-w"      #'helm-find-files-up-one-level)
           (:after helm-locate
-            :map helm-generic-files-map [M-return] #'helm-ff-run-switch-other-window)
+            :map helm-generic-files-map
+            [C-return] #'helm-ff-run-switch-other-window)
           (:after helm-buffers
-            :map helm-buffer-map [M-return] #'helm-buffer-switch-other-window)
+            :map helm-buffer-map
+            [C-return] #'helm-buffer-switch-other-window)
           (:after helm-regexp
-            :map helm-moccur-map [M-return] #'helm-moccur-run-goto-line-ow)
+            :map helm-moccur-map
+            [C-return] #'helm-moccur-run-goto-line-ow)
           (:after helm-grep
-            :map helm-grep-map [M-return] #'helm-grep-run-other-window-action))))
+            :map helm-grep-map
+            [C-return] #'helm-grep-run-other-window-action))))
 
 ;;; :ui
 (map! (:when (featurep! :ui hl-todo)
@@ -359,7 +335,7 @@
         :map neotree-mode-map
         :n "g"         nil
         :n [tab]       #'neotree-quick-look
-        :n "RET"       #'neotree-enter
+        :n [return]    #'neotree-enter
         :n [backspace] #'evil-window-prev
         :n "c"         #'neotree-create-node
         :n "r"         #'neotree-rename-node
@@ -761,98 +737,13 @@
         :desc "org-tree-slide mode"          "p" #'+org-present/start))
 
 
-;;
-;; Keybinding fixes
-
-;; This section is dedicated to "fixing" certain keys so that they behave
-;; sensibly (and consistently with similar contexts).
-
-;; Make SPC u SPC u [...] possible (#747)
-(define-key universal-argument-map
-  (kbd (concat doom-leader-key " u")) #'universal-argument-more)
-
-(when IS-MAC
-  ;; Fix MacOS shift+tab
-  (define-key input-decode-map [S-iso-lefttab] [backtab])
-  ;; Fix frame-switching on MacOS
-  (global-set-key (kbd "M-`") #'other-frame))
-
-(defun +default|setup-input-decode-map ()
-  (define-key input-decode-map (kbd "TAB") [tab]))
-(add-hook 'tty-setup-hook #'+default|setup-input-decode-map)
-
-(after! tabulated-list
-  (define-key tabulated-list-mode-map "q" #'quit-window))
-
-(when (featurep! :feature evil +everywhere)
-  ;; Evil-collection fixes
-  (setq evil-collection-key-blacklist
-        (list "C-j" "C-k" "gd" "gf" "K" "[" "]" "gz"
-              doom-leader-key doom-localleader-key))
-
-  (define-key! 'insert
-    ;; I want C-a and C-e to be a little smarter. C-a will jump to indentation.
-    ;; Pressing it again will send you to the true bol. Same goes for C-e,
-    ;; except it will ignore comments and trailing whitespace before jumping to
-    ;; eol.
-    "C-a" #'doom/backward-to-bol-or-indent
-    "C-e" #'doom/forward-to-last-non-comment-or-eol
-    "C-u" #'doom/backward-kill-to-bol-and-indent
-    ;; textmate-esque newline insertion
-    [s-return]   #'evil-open-below
-    [S-s-return] #'evil-open-above
-    ;; Emacsien motions for insert mode
-    "C-b" #'backward-word
-    "C-f" #'forward-word
-    ;; textmate-esque deletion
-    [s-backspace] #'doom/backward-kill-to-bol-and-indent)
-
-  (define-key! evil-ex-completion-map
-    "C-s" (if (featurep! :completion ivy)
-               #'counsel-minibuffer-history
-             #'helm-minibuffer-history)
-    "C-a" #'move-beginning-of-line
-    "C-b" #'backward-word
-    "C-f" #'forward-word)
-
-  (define-key! view-mode-map :package 'view [escape] #'View-quit-all)
-
-  (define-key! 'normal Man-mode-map :package 'man "q" #'kill-this-buffer))
-
-;; Restore common editing keys (and ESC) in minibuffer
-(let ((maps `(minibuffer-local-map
-              minibuffer-local-ns-map
-              minibuffer-local-completion-map
-              minibuffer-local-must-match-map
-              minibuffer-local-isearch-map
-              read-expression-map
-              ,@(if (featurep! :completion ivy) '(ivy-minibuffer-map)))))
-  (define-key! :keymaps maps
-    "C-s" (if (featurep! :completion ivy)
-              #'counsel-minibuffer-history
-            #'helm-minibuffer-history)
-    "C-a" #'move-beginning-of-line
-    "C-w" #'backward-kill-word
-    "C-u" #'backward-kill-sentence
-    "C-b" #'backward-word
-    "C-f" #'forward-word
-    "C-z" (λ! (ignore-errors (call-interactively #'undo))))
-  (when (featurep! :feature evil +everywhere)
-    (define-key! :keymaps maps
-      [escape] #'abort-recursive-edit
-      "C-r"    #'evil-paste-from-register
-      "C-j"    #'next-line
-      "C-k"    #'previous-line
-      "C-S-j"  #'scroll-up-command
-      "C-S-k"  #'scroll-down-command)))
-
-
 ;;
 ;; Universal motion repeating keys
 
-(defvar +default-repeat-forward-key  ";")
+(defvar +default-repeat-keys (cons ";" ",")
-(defvar +default-repeat-backward-key ",")
+  "TODO")
 
+(when +default-repeat-keys
   (defmacro do-repeat! (command next-func prev-func)
     "Makes ; and , the universal repeat-keys in evil-mode. These keys can be
 customized by changing `+default-repeat-forward-key' and
@@ -861,8 +752,8 @@ customized by changing `+default-repeat-forward-key' and
       `(progn
          (defun ,fn-sym (&rest _)
            (define-key! 'motion
-           +default-repeat-forward-key #',next-func
+             (car +default-repeat-keys) #',next-func
-           +default-repeat-backward-key #',prev-func))
+             (cdr +default-repeat-keys) #',prev-func))
          (advice-add #',command :before #',fn-sym))))
 
   ;; n/N
@@ -887,4 +778,38 @@ customized by changing `+default-repeat-forward-key' and
   (do-repeat! evil-visualstar/begin-search-forward
               evil-ex-search-next evil-ex-search-previous)
   (do-repeat! evil-visualstar/begin-search-backward
-            evil-ex-search-previous evil-ex-search-next)
+              evil-ex-search-previous evil-ex-search-next))
+
+
+;;
+;; Universal evil integration
+
+(when (featurep! :feature evil +everywhere)
+  ;; Restore C-a, C-e and C-u and make them a little smarter. C-a will jump to
+  ;; indentation. Pressing it again will send you to the true bol. Same goes for
+  ;; C-e, except it will ignore comments+trailing whitespace before jumping to
+  ;; eol. C-u will act similarly to C-a.
+  (define-key!
+    "C-a" #'doom/backward-to-bol-or-indent
+    "C-e" #'doom/forward-to-last-non-comment-or-eol
+    "C-u" #'doom/backward-kill-to-bol-and-indent
+    "C-w" #'backward-kill-word)
+
+  (after! view
+    (define-key view-mode-map [escape] #'View-quit-all))
+  (after! man
+    (define-key 'normal Man-mode-map "q" #'kill-this-buffer))
+
+  ;; Minibuffer
+  (define-key! evil-ex-completion-map
+    "C-s" (if (featurep! :completion ivy)
+              #'counsel-minibuffer-history
+            #'helm-minibuffer-history))
+
+  (define-key! :keymaps +default-minibuffer-maps
+    "C-r"    #'evil-paste-from-register
+    ;; Scrolling lines
+    "C-j"    #'next-line
+    "C-k"    #'previous-line
+    "C-S-j"  #'scroll-up-command
+    "C-S-k"  #'scroll-down-command))

modules/config/default/config.el

@@ -1,5 +1,16 @@
 ;;; config/default/config.el -*- lexical-binding: t; -*-
 
+(defvar +default-minibuffer-maps
+  `(minibuffer-local-map
+    minibuffer-local-ns-map
+    minibuffer-local-completion-map
+    minibuffer-local-must-match-map
+    minibuffer-local-isearch-map
+    read-expression-map
+    ,@(if (featurep! :completion ivy) '(ivy-minibuffer-map)))
+  "A list of all the keymaps used for the minibuffer.")
+
+
 ;;
 ;; Reasonable defaults
 
@@ -16,9 +27,11 @@
         epa-pinentry-mode 'loopback))
 
 
+(when (featurep! +smartparens)
   ;; disable :unless predicates with (sp-pair "'" nil :unless nil)
   ;; disable :post-handlers with (sp-pair "{" nil :post-handlers nil)
-;; ...or specific :post-handlers with (sp-pair "{" nil :post-handlers '(:rem ("| " "SPC")))
+  ;; ...or specific :post-handlers with (sp-pair "{" nil :post-handlers '(:rem
+  ;; ("| " "SPC")))
   (after! smartparens
     ;; Autopair quotes more conservatively; if I'm next to a word/before another
     ;; quote, I likely don't want another pair.
@@ -52,9 +65,8 @@
                    "<!--" "-->" :actions '(insert) :post-handlers '(("| " "SPC")))
 
     (sp-local-pair
-   '(js2-mode typescript-mode rjsx-mode rust-mode
+     '(js2-mode typescript-mode rjsx-mode rust-mode c-mode c++-mode objc-mode
-     c-mode c++-mode objc-mode java-mode php-mode
+                java-mode php-mode css-mode scss-mode less-css-mode stylus-mode)
-     css-mode scss-mode less-css-mode stylus-mode)
      "/*" "*/"
      :actions '(insert)
      :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET") ("\n* ||\n*/[i][d-2]" "*")))
@@ -69,19 +81,91 @@
     ;;     becomes {|}
     ;;  d) refresh smartparens' :post-handlers, so SPC and RET expansions work
     ;;     even after a backspace.
-  ;;  e) properly delete smartparen pairs when they are encountered, without the
+    ;;  e) properly delete smartparen pairs when they are encountered, without
-  ;;     need for strict mode.
+    ;;     the need for strict mode.
     ;;  f) do none of this when inside a string
     (advice-add #'delete-backward-char :override #'doom/delete-backward-char)
 
     ;; Makes `newline-and-indent' smarter when dealing with comments
-  (advice-add #'newline-and-indent :around #'doom*newline-indent-and-continue-comments))
+    (advice-add #'newline-and-indent :around #'doom*newline-indent-and-continue-comments)))
+
+
+;;
+;; Keybinding fixes
+
+;; This section is dedicated to "fixing" certain keys so that they behave
+;; sensibly (and consistently with similar contexts).
+
+;; Make SPC u SPC u [...] possible (#747)
+(map! :map universal-argument-map
+      :prefix doom-leader-key     "u" #'universal-argument-more
+      :prefix doom-leader-alt-key "u" #'universal-argument-more)
+
+(defun +default|setup-input-decode-map ()
+  "Ensure TAB and [tab] are treated the same in TTY Emacs."
+  (define-key input-decode-map (kbd "TAB") [tab]))
+(add-hook 'tty-setup-hook #'+default|setup-input-decode-map)
+
+;; Restore CUA keys in minibuffer
+(define-key! :keymaps +default-minibuffer-maps
+  [escape] #'abort-recursive-edit
+  "C-v"    #'yank
+  "C-z"    (λ! (ignore-errors (call-interactively #'undo)))
+  "C-a"    #'move-beginning-of-line
+  "C-b"    #'backward-word
+  ;; A Doom convention where C-s on popups and interactive searches will invoke
+  ;; ivy/helm for their superior filtering.
+  "C-s"    (if (featurep! :completion ivy)
+               #'counsel-minibuffer-history
+             #'helm-minibuffer-history))
+
+;; Consistently use q to quit windows
+(after! tabulated-list
+  (define-key tabulated-list-mode-map "q" #'quit-window))
+
+;; OS specific fixes
+(when IS-MAC
+  ;; Fix MacOS shift+tab
+  (define-key input-decode-map [S-iso-lefttab] [backtab])
+
+  (define-key!
+    ;; Buffer-local font scaling
+    "s-+" (λ! (text-scale-set 0))
+    "s-=" #'text-scale-increase
+    "s--" #'text-scale-decrease
+    ;; Fix frame-switching on MacOS
+    "s-`" #'other-frame
+    ;; Simple window/frame navigation/manipulation
+    "s-w" #'delete-window
+    "s-W" #'delete-frame
+    "s-n" #'+default/new-buffer
+    "s-N" #'make-frame
+    ;; Textmate-esque bindings
+    "s-a" #'mark-whole-buffer
+    "s-b" #'+default/compile
+    "s-f" #'swiper
+    "s-q" (if (daemonp) #'delete-frame #'evil-quit-all)
+    ;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
+    ;; it imposes some other functionality and overhead we don't need)
+    "s-z" #'undo
+    "s-s" #'save-buffer
+    "s-c" (if (featurep 'evil) 'evil-yank 'copy-region-as-kill)
+    "s-v" #'yank
+    ;; textmate-esque newline insertion
+    [s-return]    #'evil-open-below
+    [S-s-return]  #'evil-open-above
+    ;; textmate-esque deletion
+    [s-backspace] #'doom/backward-kill-to-bol-and-indent))
 
 
 ;;
 ;; Doom's keybinding scheme
 
 (when (featurep! +bindings)
+  ;; Ensure Emacsien motions are available
+  (map! "C-b" #'backward-word
+        "C-f" #'forward-word)
+
   (if (featurep 'evil)
       (load! "+evil-bindings")
     (load! "+emacs-bindings")))