diff --git a/home.org b/home.org index 455f3ae..187485e 100644 --- a/home.org +++ b/home.org @@ -1058,101 +1058,101 @@ its own devil-mode-only repeat maps that don't interfere when using normal modif ;; Use SPC (0-9) for digit arguments. '("1" . meow-digit-argument) '("2" . meow-digit-argument) - '("3" . meow-digit-argument) - '("4" . meow-digit-argument) - '("5" . meow-digit-argument) - '("6" . meow-digit-argument) - '("7" . meow-digit-argument) - '("8" . meow-digit-argument) - '("9" . meow-digit-argument) - '("0" . meow-digit-argument) - '("/" . meow-keypad-describe-key) - '("?" . meow-cheatsheet)) - (meow-normal-define-key - '("0" . meow-expand-0) - '("9" . meow-expand-9) - '("8" . meow-expand-8) - '("7" . meow-expand-7) - '("6" . meow-expand-6) - '("5" . meow-expand-5) - '("4" . meow-expand-4) - '("3" . meow-expand-3) - '("2" . meow-expand-2) - '("1" . meow-expand-1) - '("-" . negative-argument) - '(";" . meow-reverse) - '("," . meow-inner-of-thing) - '("." . meow-bounds-of-thing) - '("[" . meow-beginning-of-thing) - '("]" . meow-end-of-thing) - '("a" . meow-append) - '("A" . meow-open-below) - '("b" . meow-back-word) - '("B" . meow-back-symbol) - '("c" . meow-change) - '("d" . meow-delete) - '("D" . meow-backward-delete) - '("e" . meow-next-word) - '("E" . meow-next-symbol) - '("f" . meow-find) - '("g" . meow-cancel-selection) - '("G" . meow-grab) - '("h" . meow-left) - '("H" . meow-left-expand) - '("i" . meow-insert) - '("I" . meow-open-above) - '("j" . meow-next) - '("J" . meow-next-expand) - '("k" . meow-prev) - '("K" . meow-prev-expand) - '("l" . meow-right) - '("L" . meow-right-expand) - '("m" . meow-join) - '("n" . meow-search) - '("o" . meow-block) - '("O" . meow-to-block) - '("p" . meow-yank) - '("q" . meow-quit) - '("Q" . meow-goto-line) - '("r" . meow-replace) - '("R" . meow-swap-grab) - '("s" . meow-kill) - '("t" . meow-till) - '("u" . meow-undo) - '("U" . meow-undo-in-selection) - '("v" . meow-visit) - '("w" . meow-mark-word) - '("W" . meow-mark-symbol) - '("x" . meow-line) - '("X" . meow-goto-line) - '("y" . meow-save) - '("Y" . meow-sync-grab) - '("z" . meow-pop-selection) - '("'" . repeat) - '("" . ignore))) + ;; '("3" . meow-digit-argument) + ;; '("4" . meow-digit-argument) + ;; '("5" . meow-digit-argument) + ;; '("6" . meow-digit-argument) + ;; '("7" . meow-digit-argument) + ;; '("8" . meow-digit-argument) + ;; '("9" . meow-digit-argument) + ;; '("0" . meow-digit-argument) + ;; '("/" . meow-keypad-describe-key) + ;; '("?" . meow-cheatsheet)) + ;; (meow-normal-define-key + ;; '("0" . meow-expand-0) + ;; '("9" . meow-expand-9) + ;; '("8" . meow-expand-8) + ;; '("7" . meow-expand-7) + ;; '("6" . meow-expand-6) + ;; '("5" . meow-expand-5) + ;; '("4" . meow-expand-4) + ;; '("3" . meow-expand-3) + ;; '("2" . meow-expand-2) + ;; '("1" . meow-expand-1) + ;; '("-" . negative-argument) + ;; '(";" . meow-reverse) + ;; '("," . meow-inner-of-thing) + ;; '("." . meow-bounds-of-thing) + ;; '("[" . meow-beginning-of-thing) + ;; '("]" . meow-end-of-thing) + ;; '("a" . meow-append) + ;; '("A" . meow-open-below) + ;; '("b" . meow-back-word) + ;; '("B" . meow-back-symbol) + ;; '("c" . meow-change) + ;; '("d" . meow-delete) + ;; '("D" . meow-backward-delete) + ;; '("e" . meow-next-word) + ;; '("E" . meow-next-symbol) + ;; '("f" . meow-find) + ;; '("g" . meow-cancel-selection) + ;; '("G" . meow-grab) + ;; '("h" . meow-left) + ;; '("H" . meow-left-expand) + ;; '("i" . meow-insert) + ;; '("I" . meow-open-above) + ;; '("j" . meow-next) + ;; '("J" . meow-next-expand) + ;; '("k" . meow-prev) + ;; '("K" . meow-prev-expand) + ;; '("l" . meow-right) + ;; '("L" . meow-right-expand) + ;; '("m" . meow-join) + ;; '("n" . meow-search) + ;; '("o" . meow-block) + ;; '("O" . meow-to-block) + ;; '("p" . meow-yank) + ;; '("q" . meow-quit) + ;; '("Q" . meow-goto-line) + ;; '("r" . meow-replace) + ;; '("R" . meow-swap-grab) + ;; '("s" . meow-kill) + ;; '("t" . meow-till) + ;; '("u" . meow-undo) + ;; '("U" . meow-undo-in-selection) + ;; '("v" . meow-visit) + ;; '("w" . meow-mark-word) + ;; '("W" . meow-mark-symbol) + ;; '("x" . meow-line) + ;; '("X" . meow-goto-line) + ;; '("y" . meow-save) + ;; '("Y" . meow-sync-grab) + ;; '("z" . meow-pop-selection) + ;; '("'" . repeat) + ;; '("" . ignore))) - (require 'meow) - (meow-setup) - (meow-global-mode) + ;; (require 'meow) + ;; (meow-setup) + ;; (meow-global-mode) #+END_SRC #+BEGIN_SRC elisp - ;; (require 'god-mode) + (require 'god-mode) (require 'which-key) - ;; (bind-keys :map god-local-mode-map - ;; ("i" . (lambda () (interactive) (god-mode-all -1))) - ;; ("z" . repeat)) - ;; (bind-keys ("" . (lambda () (interactive) (god-mode-all 1)))) + (bind-keys :map god-local-mode-map + ("i" . (lambda () (interactive) (god-mode-all -1))) + ("z" . repeat)) + (bind-keys ("" . (lambda () (interactive) (god-mode-all 1)))) (defun my-god-mode-update-cursor-type () (setq cursor-type (cond (org-present-mode nil) - ((or (and nil god-local-mode) buffer-read-only + ((or (and (featurep 'god-mode) god-local-mode) buffer-read-only (and meow-mode (not (eq 'insert meow--current-state)))) 'box) (t 'bar)))) (add-hook 'post-command-hook 'my-god-mode-update-cursor-type) - ;; (which-key-enable-god-mode-support) + (which-key-enable-god-mode-support) #+END_SRC Avy allows jumping to any place on the screen with just a few keystrokes. I've stolen most of these @@ -1326,7 +1326,7 @@ available? It seems to work for now anyway... (and (not (and (treesit-available-p) (treesit-parser-list))) (nth 8 (syntax-ppss))) (re-search-forward "\\s-*\\s<" (line-end-position) t)) (fill-paragraph argument (region-active-p)) - (beginning-of-defun)/ + (beginning-of-defun) (let ((start (point))) (end-of-defun) (indent-region start (point) nil)))))) @@ -1416,8 +1416,10 @@ for completion. That makes it really annoying to use; don't use yasnippet with e *** Typescript #+BEGIN_SRC elisp - (push '("\\.tsx?\\'" . typescript-mode) auto-mode-alist) + (push '("\\.ts\\'" . typescript-mode) auto-mode-alist) (push '(typescript-mode . typescript-ts-mode) major-mode-remap-alist) + (push '("\\.tsx\\'" . tsx-mode) auto-mode-alist) + (push '(tsx-mode . tsx-ts-mode) major-mode-remap-alist) (setopt typescript-ts-mode-indent-offset 4) (with-eval-after-load 'typescript-ts-mode (defun my-tsx-ts-mode--indent-compatibility-b893426 () @@ -1919,7 +1921,7 @@ for completion. That makes it really annoying to use; don't use yasnippet with e #+BEGIN_SRC elisp (autoload 'claude-code-command-map "claude-code" :type 'keymap) - (keymap-global-set "C-c c" 'claude-code-command-map) + (keymap-global-set "C-c c" claude-code-command-map) #+END_SRC * Theme I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.