national holiday

init.el

@@ -73,6 +73,14 @@
 (require 'init-vc)
 (require 'init-git)
 
+(require 'init-lisp)
+;; (require 'init-scheme)
+;; (require 'init-slime)
+;; (require 'init-clojure)
+;; (require 'init-clojure-cider)
+;; (require 'init-common-lisp)
+(require 'init-paredit)
+
 (require 'init-lsp)
 (require 'init-jump)
 ;; (require 'init-compile)
@@ -93,21 +101,13 @@
 ;; (require 'init-rails)
 ;; (require 'init-php)
 ;; (require 'init-sql)
+(require 'init-rust)
 (require 'init-yaml)
 (require 'init-docker)
 (require 'init-nginx)
 (require 'init-lua)
 (require 'init-ahk)
 (require 'init-dotenv)
-
-(require 'init-paredit)
-(require 'init-lisp)
-;; (require 'init-scheme)
-;; (require 'init-slime)
-;; (require 'init-clojure)
-;; (require 'init-clojure-cider)
-;; (require 'init-common-lisp)
-
 (require 'init-shell)
 
 (require 'init-chinese)

modes/init-dired.el

@@ -20,7 +20,8 @@
          :map ranger-mode-map
          ("s" . 'ranger-sort-criteria))
   :config
-  (ranger-override-dired-mode 1))
+  (ranger-override-dired-mode 1)
+  (push 'deer find-directory-functions))
 
 (use-package all-the-icons-dired
   :after (all-the-icons ranger)

modes/init-edit-server.el

@@ -7,10 +7,10 @@
   :config
   (edit-server-start)
   (setq edit-server-new-frame nil
-         edit-server-url-major-mode-alist
-      '(("emacs-china\\.org" . markdown-mode)
-        ("github\\.com" . markdown-mode)
-        ("stackoverflow\\.com" . markdown-mode)))
+        edit-server-url-major-mode-alist
+        '(("emacs-china\\.org" . markdown-mode)
+          ("github" . markdown-mode)
+          ("stackoverflow\\.com" . markdown-mode)))
   (jester/with-minor-leader 'edit-server-edit-mode
                             "a" 'edit-server-abort))
 

modes/init-editing-utils.el

@@ -28,10 +28,6 @@
   :custom (aggressive-indent-region-function 'evil-indent "also convert tab/space when indent")
   :hook (after-init . aggressive-indent-global-mode))
 
-(require 'recentf)
-(add-to-list 'recentf-exclude (list "/tmp/" "/ssh:" "COMMIT_EDITMSG\\'"
-                                    (recentf-expand-file-name package-user-dir)))
-
 (after-init (transient-mark-mode 1))
 
 ;;----------------------------------------------------------------------------
@@ -77,7 +73,19 @@
    :states '(operator)
    "x" 'subword-forward
    "z" 'subword-backward)
-  :commands (subword-forward subword-backward))
+
+  (evil-define-text-object jester/evil-inner-subword (count &optional beg end type)
+    "Select a subword."
+    :extend-selection nil
+    (save-excursion (let ((start (progn (subword-backward) (point)))
+                          (end (progn (subword-forward) (point))))
+                      (list start end))))
+  (general-define-key
+   :keymaps 'evil-inner-text-objects-map
+   "x" 'jester/evil-inner-subword
+   "z" 'jester/evil-inner-subword)
+
+  :commands (subword-forward subword-backward jester/evil-inner-subword))
 
 
 (use-package electric-operator
@@ -91,7 +99,6 @@
          (c-mode . electric-operator-mode)
          (php-mode . electric-operator-mode)))
 
-
 ;;----------------------------------------------------------------------------
 ;; kill back to indentation
 ;;----------------------------------------------------------------------------
@@ -360,13 +367,15 @@ Threat is as function body when from endline before )"
   "Move to paragraph end, line-wise."
   :type line
   (interactive "p")
+  (next-line)
   (forward-paragraph count)
   (previous-line))
 
 (evil-define-motion jester/backward-paragraph (count)
   "Move to paragraph start, line-wise."
   :type line
   (interactive "p")
+  (previous-line)
   (backward-paragraph count)
   (next-line))
 
@@ -379,14 +388,6 @@ Threat is as function body when from endline before )"
 ;; narrow
 ;;----------------------------------------------------------------------------
 ;; https://github.com/redguardtoo/emacs.d/blob/master/lisp/init-misc.el
-(defun line-number-at-position (pos)
-  "Returns the line number for position `POS'."
-  (save-restriction
-    (widen)
-    (save-excursion
-      (goto-char pos)
-      (+ 1 (count-lines (point-min) (line-beginning-position 1))))))
-
 (defun narrow-to-region-indirect-buffer-maybe (start end use-indirect-buffer)
   "Indirect buffer could multiple widen on same file."
   (if (region-active-p) (deactivate-mark))
@@ -395,7 +396,7 @@ Threat is as function body when from endline before )"
           (clone-indirect-buffer
            (generate-new-buffer-name
             (format "%s-indirect-:%s-:%s"
-                    (buffer-name) (line-number-at-position start) (line-number-at-position end)))
+                    (buffer-name) (line-number-at-pos start t) (line-number-at-pos end t)))
            'display)
         (narrow-to-region start end)
         (goto-char (point-min)))
@@ -442,40 +443,51 @@ If use-indirect-buffer is not nil, use `indirect-buffer' to hold the widen conte
 ;;----------------------------------------------------------------------------
 ;; do something to a comma-delimitered sentence
 ;;----------------------------------------------------------------------------
-(evil-define-text-object jester/evil-a-subsentence (count &optional beg end type)
-  "Select a subsentence(delimitered by comma)."
+(evil-define-text-object jester/evil-inner-subsentence (count &optional beg end type)
+  "Select a subsentence(delimitered by comma), without the punctuations."
   :extend-selection nil
   (list (progn
           (re-search-backward "[,.] ?")
           (forward-char)
           (when (eq (char-after (point)) ? ) (forward-char))
           (point))
-        (re-search-forward "[,.] ?")))
+        (progn (re-search-forward "[,.] ?")
+               (backward-char)
+               (when (memq (char-before) (list ?. ?,)) (backward-char))
+               (point))))
 
-(evil-define-text-object jester/evil-inner-subsentence (count &optional beg end type)
-  "Select a subsentence(delimitered by comma), without the punctuations."
+(evil-define-text-object jester/evil-a-subsentence (count &optional beg end type)
+  "Select a subsentence(delimitered by comma)."
   :extend-selection nil
   (list (progn
           (re-search-backward "[,.] ?")
-          ;; (re-search-backward "[,.] ?\\|( ?")
           (forward-char)
           (when (eq (char-after (point)) ? ) (forward-char))
           (point))
-        (progn (re-search-forward "[,.] ?")
-               (backward-char)
-               (when (memq (char-before) (list ?. ?,)) (backward-char))
-               (point))))
+        (re-search-forward "[,.] ?")))
 
-(general-define-key
- :keymaps 'evil-outer-text-objects-map
- "S" 'jester/evil-a-subsentence)
 (general-define-key
  :keymaps 'evil-inner-text-objects-map
  "S" 'jester/evil-inner-subsentence)
+(general-define-key
+ :keymaps 'evil-outer-text-objects-map
+ "S" 'jester/evil-a-subsentence)
 
 ;;----------------------------------------------------------------------------
 ;; select an argument
 ;;----------------------------------------------------------------------------
+(evil-define-text-object jester/evil-inner-arg (count &optional beg end type)
+  "Select an argument, without the punctuations."
+  :extend-selection nil
+  (list (progn
+          (re-search-backward "[,(] ?")
+          (forward-char)
+          (when (eq (char-after (point)) ? ) (forward-char))
+          (point))
+        (progn (re-search-forward "[,] ?\\| ?)")
+               (while (memq (char-before) (list ?, ?  ?\))) (backward-char))
+               (point))))
+
 (evil-define-text-object jester/evil-a-arg (count &optional beg end type)
   "Select an argument."
   :extend-selection nil
@@ -496,17 +508,5 @@ If use-indirect-buffer is not nil, use `indirect-buffer' to hold the widen conte
                         (point))))
     (list head tail)))
 
-(evil-define-text-object jester/evil-inner-arg (count &optional beg end type)
-  "Select an argument, without the punctuations."
-  :extend-selection nil
-  (list (progn
-          (re-search-backward "[,(] ?")
-          (forward-char)
-          (when (eq (char-after (point)) ? ) (forward-char))
-          (point))
-        (progn (re-search-forward "[,] ?\\| ?)")
-               (while (memq (char-before) (list ?, ?  ?\))) (backward-char))
-               (point))))
-
 
 (provide 'init-editing-utils)

modes/init-evil.el

@@ -196,17 +196,36 @@
   :demand t
   ;; :commands (evil-multiedit-match-all evil-multiedit-match-symbol-and-next evil-multiedit-match-symbol-and-prev)
   :init
+  (setq evil-multiedit-use-symbols t)
   ;; Ex command that allows you to invoke evil-multiedit with a regular expression, e.g.
   (evil-ex-define-cmd "ie[dit]" 'evil-multiedit-ex-match)
   (general-define-key
    :states '(normal visual)
-   "R" 'evil-multiedit-match-all
+   "R" 'jester/evil-multiedit-match-all
    "C-n" 'evil-multiedit-match-symbol-and-next
    "C-p" 'evil-multiedit-match-symbol-and-prev)
+  (defun jester/evil-multiedit-match-all ()
+    "Match all occurences. with prefix arg, exclude those in comments or strings."
+    (interactive)
+    (evil-multiedit-match-all)
+    (when current-prefix-arg
+      (save-excursion
+        (let ((pos))
+          (iedit-goto-first-occurrence)
+          (setq pos (point))
+          (unless (jester/in-expression-area-p)
+            (evil-multiedit-toggle-or-restrict-region))
+          (while (evil-multiedit-next)
+            (unless (jester/in-expression-area-p)
+              (evil-multiedit-toggle-or-restrict-region)))))))
   :config
-  (define-key evil-multiedit-state-map (kbd "<return>") 'evil-multiedit-toggle-or-restrict-region)
-  (define-key evil-multiedit-state-map (kbd "<S-tab>") 'evil-multiedit-prev)
-  ;; these have to be loaded before company so they don't shadow tab binding in `company-active-map'
+  (general-define-key
+   :keymaps 'evil-multiedit-state-map
+   "<return>" 'evil-multiedit-toggle-or-restrict-region
+   "<S-tab>" 'evil-multiedit-prev
+   "C-a" 'evil-multiedit--beginning-of-line
+   "C-e" 'evil-multiedit--end-of-line)
+  ;; these have to be loaded before company so they don't shadow tab bindings in `company-active-map'
   (define-key evil-multiedit-state-map (kbd "<tab>") 'evil-multiedit-next)
   (define-key evil-multiedit-insert-state-map (kbd "<tab>") 'tab-indent-or-complete)
   )
@@ -232,7 +251,9 @@
   :custom (evil-goggles-duration 0.1)
   :hook (evil-mode . evil-goggles-mode)
   :config
-  (evil-goggles-use-diff-faces))
+  ;; (evil-goggles-use-diff-faces)
+  (evil-goggles-use-diff-refine-faces)
+  )
 
 
 (push (expand-file-name "targets" jester-submodules-dir) load-path)
@@ -443,13 +464,13 @@
 
 (defun jester/evil-visual-search (forward)
   "Search the region."
-  (let ((string (buffer-substring-no-properties (region-beginning) (region-end))))
+  (let ((regex (regexp-quote (buffer-substring-no-properties (region-beginning) (region-end)))))
     (deactivate-mark)
-    (evil-push-search-history string forward)
+    (evil-push-search-history regex forward)
     ;; pushed to `regexp-search-ring'
-    (isearch-update-ring string evil-regexp-search)
+    (isearch-update-ring regex evil-regexp-search)
     (setq isearch-forward forward)
-    (evil-search string forward)))
+    (evil-search regex forward evil-regexp-search)))
 
 
 (provide 'init-evil)

modes/init-file.el

@@ -1,3 +1,9 @@
+(require 'recentf)
+(setq recentf-exclude
+      (append recentf-exclude (list "/tmp/" "/ssh:" "COMMIT_EDITMSG\\'"
+                                    ;; (recentf-expand-file-name package-user-dir)
+                                    )))
+
 (jester/with-leader
  "f f" 'find-file
  "f s" 'save-buffer

modes/init-flycheck.el

@@ -6,7 +6,17 @@
   (jester/with-leader
    "e l" 'flycheck-list-errors
    "e p" 'flycheck-previous-error
-   "e n" 'flycheck-next-error))
+   "e n" 'flycheck-next-error)
+  (general-define-key
+   :states '(motion)
+   :keymaps 'flycheck-error-list-mode-map
+   "j" 'flycheck-error-list-next-error
+   "k" 'flycheck-error-list-previous-error
+   "f" 'flycheck-error-list-set-filter
+   "F" 'flycheck-error-list-reset-filter
+   "r" 'flycheck-error-list-check-source
+   "e" 'flycheck-error-list-explain-error
+   "<return>" 'flycheck-error-list-goto-error))
 
 (use-package flycheck-posframe
   :if window-system

modes/init-gui-frames.el

@@ -29,18 +29,6 @@
 (when (fboundp 'horizontal-scroll-bar-mode)
   (horizontal-scroll-bar-mode -1))
 
-;; I generally prefer to hide the menu bar, but doing this on OS X
-;; simply makes it update unreliably in GUI frames, so we make an
-;; exception.
-(if *is-a-mac*
-    (add-hook 'after-make-frame-functions
-              (lambda (frame)
-                (set-frame-parameter frame 'menu-bar-lines
-                                     (if (display-graphic-p frame)
-                                         1 0))))
-  (when (fboundp 'menu-bar-mode)
-    (menu-bar-mode -1)))
-
 (when (fboundp 'pixel-scroll-mode)
   (pixel-scroll-mode 1))
 
@@ -50,10 +38,6 @@
 
 (setq frame-title-format "看，灰机！ ✈✈✈✈✈✈✈✈✈"
       frame-resize-pixelwise t)
-(set-frame-parameter nil 'undecorated t)
-;; (set-frame-parameter nil 'fullscreen (cond ((eq window-system 'x) 'fullboth)
-;;                                            ((eq window-system 'mac) 'maximized)
-;;                                            (t 'maximized)))
 
 ;; Non-zero values for `line-spacing' can mess up ansi-term and co,
 ;; so we zero it explicitly in those cases.
@@ -69,7 +53,8 @@
                         (t 'maximized)))
         ;; left & top are required on wsl to correctly position
         (left . (+ 0))
-        (top . (+ 0))))
+        (top . (+ 0))
+        (undecorated . t)))
 
 
 (provide 'init-gui-frames)

modes/init-javascript.el

@@ -7,7 +7,10 @@
         js2-global-externs '("$" "jQuery" "jquery" "_")
         js2-mode-show-parse-errors nil
         js2-mode-show-strict-warnings nil
-        js2-bounce-indent-p nil)
+        js2-bounce-indent-p nil
+        js-indent-align-list-continuation nil
+        js-chain-indent nil
+        js-switch-indent-offset 2)
 
   ;; "_" as word so company completes kabeb-case
   (modify-syntax-entry ?_ "w" js2-mode-syntax-table)

modes/init-jump.el

@@ -13,5 +13,4 @@
    "g d" 'evil-goto-definition)
   :commands (dumb-jump-go))
 
-
 (provide 'init-jump)