targets.el

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "awesome-pair"]
 	path = extensions/awesome-pair
 	url = [email protected]:manateelazycat/awesome-pair.git
+[submodule "targets"]
+	path = extensions/targets
+	url = [email protected]:noctuid/targets.el.git

modes/init-coffeescript.el

@@ -2,11 +2,8 @@
   :mode "\\.coffee\\'"
   :config
   ;; the syntax table is totally sh*t
-  (modify-syntax-entry ?* "." coffee-mode-syntax-table)
-  (modify-syntax-entry ?+ "." coffee-mode-syntax-table)
-  (modify-syntax-entry ?- "." coffee-mode-syntax-table)
-  (modify-syntax-entry ?= "." coffee-mode-syntax-table)
-  (modify-syntax-entry ?/ "." coffee-mode-syntax-table)
+  (dolist (char '(?* ?+ ?- ?= ?/ ?< ?>))
+    (modify-syntax-entry char "." coffee-mode-syntax-table))
   (modify-syntax-entry ?_ "w" coffee-mode-syntax-table)
   (jester/with-major-leader 'coffee-mode
                             "d" 'coffee-mark-defun))

modes/init-company.el

@@ -19,7 +19,7 @@
    company-dabbrev-ignore-case nil
    company-dabbrev-downcase nil
    company-minimum-prefix-length 2
-   company-idle-delay 0.3)
+   company-idle-delay 0.1)
 
   ;; clear default bindings first
   (setq company-active-map (make-sparse-keymap))

modes/init-editing-utils.el

@@ -53,7 +53,6 @@
   :commands er/expand-region
   :init
   (general-define-key
-   :states '(insert emacs)
    "<C-backspace>" 'er/expand-region))
 
 
@@ -265,8 +264,7 @@ otherwise move to before semicolon."
 
 (general-define-key
  :states '(insert emacs)
- :keymaps '(web-mode-map js2-mode-map)
- "C-t" 'jester/insert-this.
+ :keymaps '(web-mode-map js2-mode-map coffee-mode-map)
  "C-t" 'jester/insert-this.)
 ;; TODO
 ;; foo             "1 xx"  ->      foo {

modes/init-evil.el

@@ -141,8 +141,11 @@
    :states '(normal visual motion operator)
    "M" 'evilmi-jump-items)
   (general-define-key
-   :keymaps '(evil-inner-text-objects-map evil-outer-text-objects-map)
+   :keymaps '(evil-inner-text-objects-map)
    "m" 'evilmi-inner-text-object)
+  (general-define-key
+   :keymaps '(evil-outer-text-objects-map)
+   "m" 'evilmi-outer-text-object)
 
   :config
   (global-evil-matchit-mode 1))
@@ -193,6 +196,42 @@
   :init
   (evil-ediff-init))
 
+
+(push (expand-file-name "targets" jester-submodules-dir) load-path)
+(require 'targets)
+;; not needed if `targets-setup'?
+;; (general-define-key
+;;  :keymaps 'evil-visual-state-map
+;;  "I" nil
+;;  "A" nil)
+
+;; setup has to come before custom bindings
+(targets-setup t
+ :next-key "N"
+ :last-key "L"
+ :remote-key "M")
+
+(targets-define-composite-to pair-delimiter
+  (("(" ")" pair)
+   ("[" "]" pair)
+   ("{" "}" pair)
+   ("<" ">" pair))
+  :bind t
+  :next-key "N"
+  :last-key "L"
+  :remote-key "M"
+  :keys "o")
+
+(targets-define-composite-to quote
+  (("\"" "\"" quote)
+   ("'" "'" quote)
+   ("`" "`" quote))
+  :bind t
+  :next-key "N"
+  :last-key "L"
+  :remote-key "M"
+  :keys "'")
+
 ;;----------------------------------------------------------------------------
 ;; Set initial states for modes.
 ;;----------------------------------------------------------------------------

modes/init-face.el

@@ -91,7 +91,7 @@
   :config
   (general-define-key
    :states '(normal visual motion)
-   :keymaps '(prog-mode-map markdown-mode-map)
+   :keymaps '(prog-mode-map)
    "<tab>" 'jester/symbol-overlay-put
    ;; "<C-i>" 'symbol-overlay-put
    "M-n" 'symbol-overlay-jump-next

modes/init-ivy.el

@@ -26,6 +26,7 @@
    "f r" 'counsel-recentf
    "t s" 'counsel-load-theme
    "s j" 'counsel-imenu
+   "." 'counsel-imenu
    "s b" 'swiper-all
    "s B" (lambda! (swiper-all (jester/region-or-symbol)))
    "i u" 'counsel-unicode-char)
@@ -35,7 +36,7 @@
    "M-x" 'counsel-M-x
    "M-y" 'counsel-yank-pop
    "C-s" 'swiper
-   "C-S-s" (lambda! (swiper (jester/region-or-symbol)))
+   "C-S-s" (lambda! (swiper (regexp-quote (jester/region-or-symbol))))
    "C-h C-f" 'counsel-describe-face)
 
   (dolist (that-ivy-map

modes/init-misc.el

@@ -12,6 +12,8 @@
 (use-package evil-anzu
   :after anzu
   :demand t)
+;; use this in place of anzu when Emacs 27 is here
+;; (setq isearch-lazy-count t)
 
 (global-auto-revert-mode 1)
 (setq auto-revert-check-vc-info t)
@@ -40,5 +42,8 @@
 ;; never ring the bell
 (setq ring-bell-function 'ignore)
 
+;; make CJK smoother on Windows
+(setq inhibit-compacting-font-caches t)
+
 
 (provide 'init-misc)

modes/init-org.el

@@ -290,7 +290,9 @@ typical word processor."
    :keymaps 'org-mode-map
    ;; "g o" 'org-todo
    "H" 'org-shiftleft
-   "L" 'org-shiftright))
+   "L" 'org-shiftright)
+  (jester/with-major-leader 'org-mode-map
+   "t t" 'org-todo))
 
 (use-package org-bullets
   :hook (org-mode . org-bullets-mode)
@@ -300,7 +302,12 @@ typical word processor."
         org-agenda-files '("~/org")))
 
 (use-package evil-org
-  :hook (org-mode . evil-org-mode))
+  :hook (org-mode . evil-org-mode)
+  :config
+  (general-define-key
+   :states '(insert)
+   :keymaps 'evil-org-mode-map
+   "C-d" 'backward-char))
 
 
 (provide 'init-org)

modes/init-utils.el

@@ -63,8 +63,11 @@
 (defun jester/region-or-symbol ()
   "Get active region or symbol at point."
   (if (region-active-p)
-      (buffer-substring-no-properties
-       (region-beginning) (region-end))
+      (let ((beg (region-beginning))
+            (end (region-end)))
+        (deactivate-mark)
+        (buffer-substring-no-properties
+         beg end))
     (thing-at-point 'symbol t)))
 
 ;;----------------------------------------------------------------------------

modes/init-web.el

@@ -10,7 +10,8 @@
    :keymaps 'evil-inner-text-objects-map
    "a" 'jester/evil-inner-attribute)
   (jester/with-major-leader 'web-mode-map
-                            "r" 'web-mode-element-rename)
+                            "r" 'web-mode-element-rename
+                            "f" 'web-mode-fold-or-unfold)
 
   (setq
    web-mode-style-padding 0
@@ -30,6 +31,7 @@
   (modify-syntax-entry ?_ "w" web-mode-syntax-table)
   (modify-syntax-entry ?- "w" web-mode-syntax-table)
   (modify-syntax-entry ?# "_" web-mode-syntax-table)
+  (modify-syntax-entry ?+ "." web-mode-syntax-table)
 
   (define-key web-mode-map (kbd "TAB") nil)
   (define-key web-mode-map (kbd "<tab>") nil)

snippets/coffee-mode/jqt

@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: jqt
+# key: jqt
+# --
+$(this)