Reindent ThoomEmacs.org
This commit is contained in:
@@ -4,193 +4,193 @@
|
|||||||
* Prelude
|
* Prelude
|
||||||
** Package Management
|
** Package Management
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(defvar bootstrap-version)
|
(defvar bootstrap-version)
|
||||||
(let ((bootstrap-file
|
(let ((bootstrap-file
|
||||||
(expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
|
(expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
|
||||||
(bootstrap-version 6))
|
(bootstrap-version 6))
|
||||||
(unless (file-exists-p bootstrap-file)
|
(unless (file-exists-p bootstrap-file)
|
||||||
(with-current-buffer
|
(with-current-buffer
|
||||||
(url-retrieve-synchronously
|
(url-retrieve-synchronously
|
||||||
"https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
|
"https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
|
||||||
'silent 'inhibit-cookies)
|
'silent 'inhibit-cookies)
|
||||||
(goto-char (point-max))
|
(goto-char (point-max))
|
||||||
(eval-print-last-sexp)))
|
(eval-print-last-sexp)))
|
||||||
(load bootstrap-file nil 'nomessage))
|
(load bootstrap-file nil 'nomessage))
|
||||||
|
|
||||||
(straight-use-package 'use-package)
|
(straight-use-package 'use-package)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** Utility constants for checking operating system
|
** Utility constants for checking operating system
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
;; Check the system used
|
;; Check the system used
|
||||||
(defconst ON-LINUX (eq system-type 'gnu/linux))
|
(defconst ON-LINUX (eq system-type 'gnu/linux))
|
||||||
(defconst ON-MAC (eq system-type 'darwin))
|
(defconst ON-MAC (eq system-type 'darwin))
|
||||||
(defconst ON-BSD (or ON-MAC (eq system-type 'berkeley-unix)))
|
(defconst ON-BSD (or ON-MAC (eq system-type 'berkeley-unix)))
|
||||||
(defconst ON-WINDOWS (memq system-type '(cygwin windows-nt ms-dos)))
|
(defconst ON-WINDOWS (memq system-type '(cygwin windows-nt ms-dos)))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Fix PATH on macOS
|
** Fix PATH on macOS
|
||||||
Emacs on macOS doesn't naturally find shell variables like PATH, so to help it out we run a shell and load some variables from the env command.
|
Emacs on macOS doesn't naturally find shell variables like PATH, so to help it out we run a shell and load some variables from the env command.
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package exec-path-from-shell
|
(use-package exec-path-from-shell
|
||||||
:straight t
|
:straight t
|
||||||
:if (and ON-MAC (memq window-system '(mac ns)))
|
:if (and ON-MAC (memq window-system '(mac ns)))
|
||||||
:config
|
:config
|
||||||
(dolist (var '("NIX_SSL_CERT_FILE"
|
(dolist (var '("NIX_SSL_CERT_FILE"
|
||||||
"NIX_PATH"
|
"NIX_PATH"
|
||||||
"NIX_PROFILES"))
|
"NIX_PROFILES"))
|
||||||
(add-to-list 'exec-path-from-shell-variables var))
|
(add-to-list 'exec-path-from-shell-variables var))
|
||||||
(exec-path-from-shell-initialize))
|
(exec-path-from-shell-initialize))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Auto-tangle this file
|
** Auto-tangle this file
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(defun thoom/org-babel-tangle-config ()
|
(defun thoom/org-babel-tangle-config ()
|
||||||
(when (string-equal (file-truename (buffer-file-name))
|
(when (string-equal (file-truename (buffer-file-name))
|
||||||
(expand-file-name "~/.dotfiles/thoom-emacs/ThoomEmacs.org"))
|
(expand-file-name "~/.dotfiles/thoom-emacs/ThoomEmacs.org"))
|
||||||
;; Dynamic scoping to the rescue
|
;; Dynamic scoping to the rescue
|
||||||
(let ((org-confirm-babel-evaluate nil))
|
(let ((org-confirm-babel-evaluate nil))
|
||||||
(org-babel-tangle))))
|
(org-babel-tangle))))
|
||||||
|
|
||||||
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'thoom/org-babel-tangle-config)))
|
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'thoom/org-babel-tangle-config)))
|
||||||
#+end_src
|
#+end_src
|
||||||
* Basic UI Tweaks
|
* Basic UI Tweaks
|
||||||
** Theme
|
** Theme
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package doom-themes
|
(use-package doom-themes
|
||||||
:straight t
|
:straight t
|
||||||
:config
|
:config
|
||||||
;; Global settings (defaults)
|
;; Global settings (defaults)
|
||||||
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
|
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
|
||||||
doom-themes-enable-italic t) ; if nil, italics is universally disabled
|
doom-themes-enable-italic t) ; if nil, italics is universally disabled
|
||||||
(load-theme 'doom-one t)
|
(load-theme 'doom-one t)
|
||||||
|
|
||||||
;; Enable flashing mode-line on errors
|
;; Enable flashing mode-line on errors
|
||||||
(doom-themes-visual-bell-config)
|
(doom-themes-visual-bell-config)
|
||||||
;; Corrects (and improves) org-mode's native fontification.
|
;; Corrects (and improves) org-mode's native fontification.
|
||||||
(doom-themes-org-config))
|
(doom-themes-org-config))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
** Hiding Clutter
|
** Hiding Clutter
|
||||||
Disable a bunch of stuff we don't want to see.
|
Disable a bunch of stuff we don't want to see.
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(setq inhibit-startup-message t
|
(setq inhibit-startup-message t
|
||||||
use-dialog-box nil)
|
use-dialog-box nil)
|
||||||
|
|
||||||
(tool-bar-mode -1)
|
(tool-bar-mode -1)
|
||||||
(scroll-bar-mode -1)
|
(scroll-bar-mode -1)
|
||||||
|
|
||||||
;; On a Mac, the menu bar doesn't take up screen real-estate, so leave it on
|
;; On a Mac, the menu bar doesn't take up screen real-estate, so leave it on
|
||||||
(if (not ON-MAC)
|
(if (not ON-MAC)
|
||||||
(menu-bar-mode -1))
|
(menu-bar-mode -1))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** General Settings
|
** General Settings
|
||||||
Set some common settings, like global-auto-revert-mode.
|
Set some common settings, like global-auto-revert-mode.
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(setq-default scroll-error-top-bottom t)
|
(setq-default scroll-error-top-bottom t)
|
||||||
|
|
||||||
;; Revert buffers when the underlying file has changed
|
;; Revert buffers when the underlying file has changed
|
||||||
(global-auto-revert-mode 1)
|
(global-auto-revert-mode 1)
|
||||||
|
|
||||||
;; Remember recent files
|
;; Remember recent files
|
||||||
(recentf-mode 1)
|
(recentf-mode 1)
|
||||||
|
|
||||||
;; Save what you enter into minibuffer prompts
|
;; Save what you enter into minibuffer prompts
|
||||||
(setq history-length 25)
|
(setq history-length 25)
|
||||||
(savehist-mode 1)
|
(savehist-mode 1)
|
||||||
|
|
||||||
;; Visually mark the line the cursor is on
|
;; Visually mark the line the cursor is on
|
||||||
(global-hl-line-mode 1)
|
(global-hl-line-mode 1)
|
||||||
|
|
||||||
;; TODO - Decide whether to enable this
|
;; TODO - Decide whether to enable this
|
||||||
;; (defalias 'yes-or-no-p 'y-or-n-p)
|
;; (defalias 'yes-or-no-p 'y-or-n-p)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** hl-todo
|
** hl-todo
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package hl-todo
|
(use-package hl-todo
|
||||||
:straight t
|
:straight t
|
||||||
:init
|
:init
|
||||||
(global-hl-todo-mode))
|
(global-hl-todo-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Repeat Mode
|
** Repeat Mode
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(repeat-mode 1)
|
(repeat-mode 1)
|
||||||
|
|
||||||
(defmacro thoom/repeat-map (keymap-sym &rest bindings)
|
(defmacro thoom/repeat-map (keymap-sym &rest bindings)
|
||||||
"A helper macro for defining repeat maps. keymap-sym is a symbol to name the keymap with.
|
"A helper macro for defining repeat maps. keymap-sym is a symbol to name the keymap with.
|
||||||
bindings are a sequence of cons cells containing a string to be passed to kbd and a function
|
bindings are a sequence of cons cells containing a string to be passed to kbd and a function
|
||||||
for that key to be mapped to."
|
for that key to be mapped to."
|
||||||
(declare (indent 1))
|
(declare (indent 1))
|
||||||
`(progn
|
`(progn
|
||||||
(defvar ,keymap-sym
|
(defvar ,keymap-sym
|
||||||
(let ((map (make-sparse-keymap)))
|
(let ((map (make-sparse-keymap)))
|
||||||
,@(mapcar (lambda (binding) `(define-key map (kbd ,(car binding)) ',(cdr binding))) bindings)
|
,@(mapcar (lambda (binding) `(define-key map (kbd ,(car binding)) ',(cdr binding))) bindings)
|
||||||
map))
|
map))
|
||||||
(map-keymap
|
(map-keymap
|
||||||
(lambda (_key cmd)
|
(lambda (_key cmd)
|
||||||
(when (symbolp cmd)
|
(when (symbolp cmd)
|
||||||
(put cmd 'repeat-map ',keymap-sym)))
|
(put cmd 'repeat-map ',keymap-sym)))
|
||||||
,keymap-sym)))
|
,keymap-sym)))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
** Tab Bar
|
** Tab Bar
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(tab-bar-mode)
|
(tab-bar-mode)
|
||||||
|
|
||||||
;; TODO - keybindings
|
;; TODO - keybindings
|
||||||
#+end_src
|
#+end_src
|
||||||
** Custom File
|
** Custom File
|
||||||
Set a location for the custom file so it doesn't pollute this file.
|
Set a location for the custom file so it doesn't pollute this file.
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(setq custom-file (locate-user-emacs-file "custom-vars.el"))
|
(setq custom-file (locate-user-emacs-file "custom-vars.el"))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
* Emacs Server
|
* Emacs Server
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(require 'server)
|
(require 'server)
|
||||||
(unless (server-running-p) (server-start))
|
(unless (server-running-p) (server-start))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
* Keybindings
|
* Keybindings
|
||||||
** Which-key
|
** Which-key
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package which-key
|
(use-package which-key
|
||||||
:straight t
|
:straight t
|
||||||
:init
|
:init
|
||||||
(which-key-mode)
|
(which-key-mode)
|
||||||
(which-key-setup-side-window-bottom))
|
(which-key-setup-side-window-bottom))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Keybindings
|
** Keybindings
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
:bind
|
:bind
|
||||||
;; Window management
|
;; Window management
|
||||||
(("C-c w v" . split-window-right)
|
(("C-c w v" . split-window-right)
|
||||||
("C-c w s" . split-window-below)
|
("C-c w s" . split-window-below)
|
||||||
("C-S-h" . windmove-left)
|
("C-S-h" . windmove-left)
|
||||||
("C-S-j" . windmove-down)
|
("C-S-j" . windmove-down)
|
||||||
("C-S-k" . windmove-up)
|
("C-S-k" . windmove-up)
|
||||||
("C-S-l" . windmove-right)
|
("C-S-l" . windmove-right)
|
||||||
|
|
||||||
;; Tab management
|
;; Tab management
|
||||||
("C-c w t c" . tab-bar-new-tab)
|
("C-c w t c" . tab-bar-new-tab)
|
||||||
("C-c w t d" . tab-bar-close-tab)
|
("C-c w t d" . tab-bar-close-tab)
|
||||||
("C-c w t n" . tab-bar-switch-to-next-tab)
|
("C-c w t n" . tab-bar-switch-to-next-tab)
|
||||||
("C-c w t p" . tab-bar-switch-to-prev-tab)
|
("C-c w t p" . tab-bar-switch-to-prev-tab)
|
||||||
;; Common keybindings with tab switching in browsers, for use with my mouse bindings
|
;; Common keybindings with tab switching in browsers, for use with my mouse bindings
|
||||||
("C-<next>" . tab-bar-switch-to-next-tab)
|
("C-<next>" . tab-bar-switch-to-next-tab)
|
||||||
("C-<prior>" . tab-bar-switch-to-prev-tab)
|
("C-<prior>" . tab-bar-switch-to-prev-tab)
|
||||||
|
|
||||||
;; Buffer management
|
;; Buffer management
|
||||||
("C-c b d" . kill-this-buffer)
|
("C-c b d" . kill-this-buffer)
|
||||||
("C-c b b" . consult-buffer)
|
("C-c b b" . consult-buffer)
|
||||||
("C-c b p" . previous-buffer)
|
("C-c b p" . previous-buffer)
|
||||||
("C-c b n" . next-buffer)
|
("C-c b n" . next-buffer)
|
||||||
("C-c b C-c" . server-edit)
|
("C-c b C-c" . server-edit)
|
||||||
|
|
||||||
("C-o" . pop-global-mark)
|
("C-o" . pop-global-mark)
|
||||||
("M-DEL" . backward-kill-word)
|
("M-DEL" . backward-kill-word)
|
||||||
("C-:" . execute-extended-command-for-buffer)))
|
("C-:" . execute-extended-command-for-buffer)))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
* Editing
|
* Editing
|
||||||
@@ -198,363 +198,363 @@ Set a location for the custom file so it doesn't pollute this file.
|
|||||||
When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by single character increments and =h/l= to adjust by tab stops.
|
When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by single character increments and =h/l= to adjust by tab stops.
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
;; TODO - define keys to move region up and down by lines
|
;; TODO - define keys to move region up and down by lines
|
||||||
(define-key indent-rigidly-map (kbd "H") 'indent-rigidly-left)
|
(define-key indent-rigidly-map (kbd "H") 'indent-rigidly-left)
|
||||||
(define-key indent-rigidly-map (kbd "L") 'indent-rigidly-right)
|
(define-key indent-rigidly-map (kbd "L") 'indent-rigidly-right)
|
||||||
(define-key indent-rigidly-map (kbd "h") 'indent-rigidly-left-to-tab-stop)
|
(define-key indent-rigidly-map (kbd "h") 'indent-rigidly-left-to-tab-stop)
|
||||||
(define-key indent-rigidly-map (kbd "l") 'indent-rigidly-right-to-tab-stop)
|
(define-key indent-rigidly-map (kbd "l") 'indent-rigidly-right-to-tab-stop)
|
||||||
#+end_src
|
#+end_src
|
||||||
** Meow
|
** Meow
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(defmacro thoom/meow-negate (meow-command)
|
(defmacro thoom/meow-negate (meow-command)
|
||||||
`(lambda ()
|
`(lambda ()
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((current-prefix-arg -1))
|
(let ((current-prefix-arg -1))
|
||||||
(call-interactively ,meow-command))))
|
(call-interactively ,meow-command))))
|
||||||
|
|
||||||
(use-package meow
|
(use-package meow
|
||||||
:straight t
|
:straight t
|
||||||
:init
|
:init
|
||||||
;; TODO - make this unnecessary
|
;; TODO - make this unnecessary
|
||||||
(require 'meow)
|
(require 'meow)
|
||||||
|
|
||||||
;; TODO - debug this. should make org headings into meow things
|
;; TODO - debug this. should make org headings into meow things
|
||||||
(meow-thing-register 'heading 'heading 'heading)
|
(meow-thing-register 'heading 'heading 'heading)
|
||||||
(setq meow-use-clipboard t
|
(setq meow-use-clipboard t
|
||||||
meow-char-thing-table '((?\( . round)
|
meow-char-thing-table '((?\( . round)
|
||||||
(?\) . round)
|
(?\) . round)
|
||||||
(?\[ . square)
|
(?\[ . square)
|
||||||
(?\] . square)
|
(?\] . square)
|
||||||
(?\{ . curly)
|
(?\{ . curly)
|
||||||
(?\} . curly)
|
(?\} . curly)
|
||||||
(?\" . string)
|
(?\" . string)
|
||||||
(?\' . string)
|
(?\' . string)
|
||||||
(?h . heading)
|
(?h . heading)
|
||||||
(?e . symbol)
|
(?e . symbol)
|
||||||
(?w . window)
|
(?w . window)
|
||||||
(?b . buffer)
|
(?b . buffer)
|
||||||
(?p . paragraph)
|
(?p . paragraph)
|
||||||
(?l . line)
|
(?l . line)
|
||||||
(?d . defun)
|
(?d . defun)
|
||||||
(?. . sentence))
|
(?. . sentence))
|
||||||
meow-cheatsheet-layout meow-cheatsheet-layout-qwerty
|
meow-cheatsheet-layout meow-cheatsheet-layout-qwerty
|
||||||
meow-keypad-self-insert-undefined nil)
|
meow-keypad-self-insert-undefined nil)
|
||||||
|
|
||||||
(add-to-list 'meow-mode-state-list
|
(add-to-list 'meow-mode-state-list
|
||||||
'(eshell-mode . insert) t)
|
'(eshell-mode . insert) t)
|
||||||
|
|
||||||
(meow-motion-overwrite-define-key
|
(meow-motion-overwrite-define-key
|
||||||
'("j" . meow-next)
|
'("j" . meow-next)
|
||||||
'("k" . meow-prev)
|
'("k" . meow-prev)
|
||||||
'("<escape>" . ignore))
|
'("<escape>" . ignore))
|
||||||
|
|
||||||
(meow-leader-define-key
|
(meow-leader-define-key
|
||||||
;; SPC j/k will run the original command in MOTION state.
|
;; SPC j/k will run the original command in MOTION state.
|
||||||
'("j" . "H-j")
|
'("j" . "H-j")
|
||||||
'("k" . "H-k")
|
'("k" . "H-k")
|
||||||
|
|
||||||
;; Use SPC (0-9) for digit arguments.
|
;; Use SPC (0-9) for digit arguments.
|
||||||
'("1" . meow-digit-argument)
|
'("1" . meow-digit-argument)
|
||||||
'("2" . meow-digit-argument)
|
'("2" . meow-digit-argument)
|
||||||
'("3" . meow-digit-argument)
|
'("3" . meow-digit-argument)
|
||||||
'("4" . meow-digit-argument)
|
'("4" . meow-digit-argument)
|
||||||
'("5" . meow-digit-argument)
|
'("5" . meow-digit-argument)
|
||||||
'("6" . meow-digit-argument)
|
'("6" . meow-digit-argument)
|
||||||
'("7" . meow-digit-argument)
|
'("7" . meow-digit-argument)
|
||||||
'("8" . meow-digit-argument)
|
'("8" . meow-digit-argument)
|
||||||
'("9" . meow-digit-argument)
|
'("9" . meow-digit-argument)
|
||||||
'("0" . meow-digit-argument)
|
'("0" . meow-digit-argument)
|
||||||
'("/" . meow-keypad-describe-key)
|
'("/" . meow-keypad-describe-key)
|
||||||
'("?" . meow-cheatsheet))
|
'("?" . meow-cheatsheet))
|
||||||
|
|
||||||
(meow-define-keys 'insert
|
(meow-define-keys 'insert
|
||||||
'("C-g" . meow-insert-exit)
|
'("C-g" . meow-insert-exit)
|
||||||
'("C-M-g" . meow-insert-exit))
|
'("C-M-g" . meow-insert-exit))
|
||||||
|
|
||||||
(meow-normal-define-key
|
(meow-normal-define-key
|
||||||
'("0" . meow-expand-0)
|
'("0" . meow-expand-0)
|
||||||
'("9" . meow-expand-9)
|
'("9" . meow-expand-9)
|
||||||
'("8" . meow-expand-8)
|
'("8" . meow-expand-8)
|
||||||
'("7" . meow-expand-7)
|
'("7" . meow-expand-7)
|
||||||
'("6" . meow-expand-6)
|
'("6" . meow-expand-6)
|
||||||
'("5" . meow-expand-5)
|
'("5" . meow-expand-5)
|
||||||
'("4" . meow-expand-4)
|
'("4" . meow-expand-4)
|
||||||
'("3" . meow-expand-3)
|
'("3" . meow-expand-3)
|
||||||
'("2" . meow-expand-2)
|
'("2" . meow-expand-2)
|
||||||
'("1" . meow-expand-1)
|
'("1" . meow-expand-1)
|
||||||
'("-" . negative-argument)
|
'("-" . negative-argument)
|
||||||
|
|
||||||
'(";" . meow-reverse)
|
'(";" . meow-reverse)
|
||||||
'("," . meow-inner-of-thing)
|
'("," . meow-inner-of-thing)
|
||||||
'("." . meow-bounds-of-thing)
|
'("." . meow-bounds-of-thing)
|
||||||
'("[" . meow-beginning-of-thing)
|
'("[" . meow-beginning-of-thing)
|
||||||
'("]" . meow-end-of-thing)
|
'("]" . meow-end-of-thing)
|
||||||
|
|
||||||
'("a" . meow-append)
|
'("a" . meow-append)
|
||||||
'("A" . meow-open-below)
|
'("A" . meow-open-below)
|
||||||
'("b" . meow-back-word)
|
'("b" . meow-back-word)
|
||||||
'("B" . meow-back-symbol)
|
'("B" . meow-back-symbol)
|
||||||
'("c" . meow-change)
|
'("c" . meow-change)
|
||||||
;; Potential addition
|
;; Potential addition
|
||||||
'("d" . meow-delete)
|
'("d" . meow-delete)
|
||||||
'("D" . meow-backward-delete)
|
'("D" . meow-backward-delete)
|
||||||
'("e" . meow-next-word)
|
'("e" . meow-next-word)
|
||||||
'("E" . meow-next-symbol)
|
'("E" . meow-next-symbol)
|
||||||
'("f" . meow-find)
|
'("f" . meow-find)
|
||||||
`("F" . ,(thoom/meow-negate 'meow-find))
|
`("F" . ,(thoom/meow-negate 'meow-find))
|
||||||
'("g" . meow-cancel-selection)
|
'("g" . meow-cancel-selection)
|
||||||
'("G" . meow-grab)
|
'("G" . meow-grab)
|
||||||
'("h" . meow-left)
|
'("h" . meow-left)
|
||||||
'("H" . meow-left-expand)
|
'("H" . meow-left-expand)
|
||||||
'("i" . meow-insert)
|
'("i" . meow-insert)
|
||||||
'("I" . meow-open-above)
|
'("I" . meow-open-above)
|
||||||
'("j" . meow-next)
|
'("j" . meow-next)
|
||||||
'("J" . meow-next-expand)
|
'("J" . meow-next-expand)
|
||||||
'("k" . meow-prev)
|
'("k" . meow-prev)
|
||||||
'("K" . meow-prev-expand)
|
'("K" . meow-prev-expand)
|
||||||
'("l" . meow-right)
|
'("l" . meow-right)
|
||||||
'("L" . meow-right-expand)
|
'("L" . meow-right-expand)
|
||||||
'("m" . meow-join)
|
'("m" . meow-join)
|
||||||
;; Potential addition - M
|
;; Potential addition - M
|
||||||
'("n" . meow-search)
|
'("n" . meow-search)
|
||||||
;; Potential addition - N
|
;; Potential addition - N
|
||||||
'("o" . meow-block)
|
'("o" . meow-block)
|
||||||
'("O" . meow-to-block)
|
'("O" . meow-to-block)
|
||||||
'("p" . meow-yank)
|
'("p" . meow-yank)
|
||||||
'("P" . consult-yank-pop)
|
'("P" . consult-yank-pop)
|
||||||
;; Potential addition - q
|
;; Potential addition - q
|
||||||
;; Potential addition - Q
|
;; Potential addition - Q
|
||||||
'("r" . meow-replace)
|
'("r" . meow-replace)
|
||||||
'("R" . meow-swap-grab)
|
'("R" . meow-swap-grab)
|
||||||
'("s" . meow-kill)
|
'("s" . meow-kill)
|
||||||
;; Potential addition - S
|
;; Potential addition - S
|
||||||
'("t" . meow-till)
|
'("t" . meow-till)
|
||||||
`("T" . ,(thoom/meow-negate 'meow-till))
|
`("T" . ,(thoom/meow-negate 'meow-till))
|
||||||
'("u" . meow-undo)
|
'("u" . meow-undo)
|
||||||
'("U" . meow-undo-in-selection)
|
'("U" . meow-undo-in-selection)
|
||||||
'("v" . meow-visit)
|
'("v" . meow-visit)
|
||||||
`("V" . ,(thoom/meow-negate 'meow-visit))
|
`("V" . ,(thoom/meow-negate 'meow-visit))
|
||||||
'("w" . meow-mark-word)
|
'("w" . meow-mark-word)
|
||||||
'("W" . meow-mark-symbol)
|
'("W" . meow-mark-symbol)
|
||||||
'("x" . meow-line)
|
'("x" . meow-line)
|
||||||
`("X" . ,(thoom/meow-negate 'meow-line))
|
`("X" . ,(thoom/meow-negate 'meow-line))
|
||||||
'("y" . meow-save)
|
'("y" . meow-save)
|
||||||
'("Y" . meow-sync-grab)
|
'("Y" . meow-sync-grab)
|
||||||
'("z" . meow-pop-selection)
|
'("z" . meow-pop-selection)
|
||||||
;; Potential addition - Z
|
;; Potential addition - Z
|
||||||
'("'" . repeat)
|
'("'" . repeat)
|
||||||
'("/" . meow-comment)
|
'("/" . meow-comment)
|
||||||
'(":" . execute-extended-command)
|
'(":" . execute-extended-command)
|
||||||
'("=" . indent-region)
|
'("=" . indent-region)
|
||||||
'("+" . indent-rigidly))
|
'("+" . indent-rigidly))
|
||||||
|
|
||||||
(meow-global-mode 1))
|
(meow-global-mode 1))
|
||||||
#+end_src
|
#+end_src
|
||||||
** TODO Autocompletion
|
** TODO Autocompletion
|
||||||
* Org
|
* Org
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package org
|
(use-package org
|
||||||
:hook (org-mode . visual-line-mode)
|
:hook (org-mode . visual-line-mode)
|
||||||
:config
|
:config
|
||||||
;; Add structure templates
|
;; Add structure templates
|
||||||
(add-to-list 'org-modules 'org-tempo t)
|
(add-to-list 'org-modules 'org-tempo t)
|
||||||
(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
|
(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
|
||||||
|
|
||||||
(setq org-edit-src-content-indentation 0)
|
(setq org-edit-src-content-indentation 0)
|
||||||
|
|
||||||
;; Repeat map for previous/next heading
|
;; Repeat map for previous/next heading
|
||||||
(thoom/repeat-map thoom/org-previous-next-visible-heading-repeat-map
|
(thoom/repeat-map thoom/org-previous-next-visible-heading-repeat-map
|
||||||
("n" . org-next-visible-heading)
|
("n" . org-next-visible-heading)
|
||||||
("C-n" . org-next-visible-heading)
|
("C-n" . org-next-visible-heading)
|
||||||
("p" . org-previous-visible-heading)
|
("p" . org-previous-visible-heading)
|
||||||
("C-p" . org-previous-visible-heading)))
|
("C-p" . org-previous-visible-heading)))
|
||||||
|
|
||||||
(use-package org-bullets
|
(use-package org-bullets
|
||||||
:straight t
|
:straight t
|
||||||
:hook org-mode)
|
:hook org-mode)
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
* VMOCE
|
* VMOCE
|
||||||
** Vertico
|
** Vertico
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package vertico
|
(use-package vertico
|
||||||
:straight t
|
:straight t
|
||||||
:init
|
:init
|
||||||
(vertico-mode))
|
(vertico-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Marginalia
|
** Marginalia
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package marginalia
|
(use-package marginalia
|
||||||
:straight t
|
:straight t
|
||||||
;; Either bind `marginalia-cycle' globally or only in the minibuffer
|
;; Either bind `marginalia-cycle' globally or only in the minibuffer
|
||||||
:bind (:map minibuffer-local-map
|
:bind (:map minibuffer-local-map
|
||||||
("M-A" . marginalia-cycle))
|
("M-A" . marginalia-cycle))
|
||||||
|
|
||||||
:init
|
:init
|
||||||
(marginalia-mode))
|
(marginalia-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Orderless
|
** Orderless
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package orderless
|
(use-package orderless
|
||||||
:straight t
|
:straight t
|
||||||
:init
|
:init
|
||||||
;; Configure a custom style dispatcher (see the Consult wiki)
|
;; Configure a custom style dispatcher (see the Consult wiki)
|
||||||
;; (setq orderless-style-dispatchers '(+orderless-dispatch)
|
;; (setq orderless-style-dispatchers '(+orderless-dispatch)
|
||||||
;; orderless-component-separator #'orderless-escapable-split-on-space)
|
;; orderless-component-separator #'orderless-escapable-split-on-space)
|
||||||
(setq completion-styles '(orderless basic)
|
(setq completion-styles '(orderless basic)
|
||||||
completion-category-defaults nil
|
completion-category-defaults nil
|
||||||
completion-category-overrides '((file (styles partial-completion)))))
|
completion-category-overrides '((file (styles partial-completion)))))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Consult
|
** Consult
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package consult
|
(use-package consult
|
||||||
:straight t
|
:straight t
|
||||||
;; Replace bindings. Lazily loaded due by `use-package'.
|
;; Replace bindings. Lazily loaded due by `use-package'.
|
||||||
:bind (;; C-c bindings (mode-specific-map)
|
:bind (;; C-c bindings (mode-specific-map)
|
||||||
("C-c h" . consult-history)
|
("C-c h" . consult-history)
|
||||||
("C-c m" . consult-mode-command)
|
("C-c m" . consult-mode-command)
|
||||||
("C-c k" . consult-kmacro)
|
("C-c k" . consult-kmacro)
|
||||||
;; C-x bindings (ctl-x-map)
|
;; C-x bindings (ctl-x-map)
|
||||||
("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command
|
("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command
|
||||||
("C-x C-b" . consult-buffer)
|
("C-x C-b" . consult-buffer)
|
||||||
("C-x b" . consult-buffer) ;; orig. switch-to-buffer
|
("C-x b" . consult-buffer) ;; orig. switch-to-buffer
|
||||||
("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window
|
("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window
|
||||||
("C-x 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame
|
("C-x 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame
|
||||||
("C-x r b" . consult-bookmark) ;; orig. bookmark-jump
|
("C-x r b" . consult-bookmark) ;; orig. bookmark-jump
|
||||||
("C-x p b" . consult-project-buffer) ;; orig. project-switch-to-buffer
|
("C-x p b" . consult-project-buffer) ;; orig. project-switch-to-buffer
|
||||||
;; Custom M-# bindings for fast register access
|
;; Custom M-# bindings for fast register access
|
||||||
("M-#" . consult-register-load)
|
("M-#" . consult-register-load)
|
||||||
("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated)
|
("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated)
|
||||||
("C-M-#" . consult-register)
|
("C-M-#" . consult-register)
|
||||||
;; Other custom bindings
|
;; Other custom bindings
|
||||||
("M-y" . consult-yank-pop) ;; orig. yank-pop
|
("M-y" . consult-yank-pop) ;; orig. yank-pop
|
||||||
("<help> a" . consult-apropos) ;; orig. apropos-command
|
("<help> a" . consult-apropos) ;; orig. apropos-command
|
||||||
;; M-g bindings (goto-map)
|
;; M-g bindings (goto-map)
|
||||||
("M-g e" . consult-compile-error)
|
("M-g e" . consult-compile-error)
|
||||||
("M-g f" . consult-flymake) ;; Alternative: consult-flycheck
|
("M-g f" . consult-flymake) ;; Alternative: consult-flycheck
|
||||||
("M-g g" . consult-goto-line) ;; orig. goto-line
|
("M-g g" . consult-goto-line) ;; orig. goto-line
|
||||||
("M-g M-g" . consult-goto-line) ;; orig. goto-line
|
("M-g M-g" . consult-goto-line) ;; orig. goto-line
|
||||||
("M-g o" . consult-outline) ;; Alternative: consult-org-heading
|
("M-g o" . consult-outline) ;; Alternative: consult-org-heading
|
||||||
("M-g m" . consult-mark)
|
("M-g m" . consult-mark)
|
||||||
("M-g k" . consult-global-mark)
|
("M-g k" . consult-global-mark)
|
||||||
("M-g i" . consult-imenu)
|
("M-g i" . consult-imenu)
|
||||||
("M-g I" . consult-imenu-multi)
|
("M-g I" . consult-imenu-multi)
|
||||||
;; M-s bindings (search-map)
|
;; M-s bindings (search-map)
|
||||||
("M-s d" . consult-find)
|
("M-s d" . consult-find)
|
||||||
("M-s D" . consult-locate)
|
("M-s D" . consult-locate)
|
||||||
("M-s g" . consult-grep)
|
("M-s g" . consult-grep)
|
||||||
("M-s G" . consult-git-grep)
|
("M-s G" . consult-git-grep)
|
||||||
("M-s r" . consult-ripgrep)
|
("M-s r" . consult-ripgrep)
|
||||||
("M-s l" . consult-line)
|
("M-s l" . consult-line)
|
||||||
("M-s L" . consult-line-multi)
|
("M-s L" . consult-line-multi)
|
||||||
("M-s m" . consult-multi-occur)
|
("M-s m" . consult-multi-occur)
|
||||||
("M-s k" . consult-keep-lines)
|
("M-s k" . consult-keep-lines)
|
||||||
("M-s u" . consult-focus-lines)
|
("M-s u" . consult-focus-lines)
|
||||||
;; Isearch integration
|
;; Isearch integration
|
||||||
("M-s e" . consult-isearch-history)
|
("M-s e" . consult-isearch-history)
|
||||||
:map isearch-mode-map
|
:map isearch-mode-map
|
||||||
("M-e" . consult-isearch-history) ;; orig. isearch-edit-string
|
("M-e" . consult-isearch-history) ;; orig. isearch-edit-string
|
||||||
("M-s e" . consult-isearch-history) ;; orig. isearch-edit-string
|
("M-s e" . consult-isearch-history) ;; orig. isearch-edit-string
|
||||||
("M-s l" . consult-line) ;; needed by consult-line to detect isearch
|
("M-s l" . consult-line) ;; needed by consult-line to detect isearch
|
||||||
("M-s L" . consult-line-multi) ;; needed by consult-line to detect isearch
|
("M-s L" . consult-line-multi) ;; needed by consult-line to detect isearch
|
||||||
;; Minibuffer history
|
;; Minibuffer history
|
||||||
:map minibuffer-local-map
|
:map minibuffer-local-map
|
||||||
("M-s" . consult-history) ;; orig. next-matching-history-element
|
("M-s" . consult-history) ;; orig. next-matching-history-element
|
||||||
("M-r" . consult-history)) ;; orig. previous-matching-history-element
|
("M-r" . consult-history)) ;; orig. previous-matching-history-element
|
||||||
|
|
||||||
;; Enable automatic preview at point in the *Completions* buffer. This is
|
;; Enable automatic preview at point in the *Completions* buffer. This is
|
||||||
;; relevant when you use the default completion UI.
|
;; relevant when you use the default completion UI.
|
||||||
:hook (completion-list-mode . consult-preview-at-point-mode)
|
:hook (completion-list-mode . consult-preview-at-point-mode)
|
||||||
|
|
||||||
;; The :init configuration is always executed (Not lazy)
|
;; The :init configuration is always executed (Not lazy)
|
||||||
:init
|
:init
|
||||||
|
|
||||||
;; Optionally configure the register formatting. This improves the register
|
;; Optionally configure the register formatting. This improves the register
|
||||||
;; preview for `consult-register', `consult-register-load',
|
;; preview for `consult-register', `consult-register-load',
|
||||||
;; `consult-register-store' and the Emacs built-ins.
|
;; `consult-register-store' and the Emacs built-ins.
|
||||||
(setq register-preview-delay 0.5
|
(setq register-preview-delay 0.5
|
||||||
register-preview-function #'consult-register-format)
|
register-preview-function #'consult-register-format)
|
||||||
|
|
||||||
;; Optionally tweak the register preview window.
|
;; Optionally tweak the register preview window.
|
||||||
;; This adds thin lines, sorting and hides the mode line of the window.
|
;; This adds thin lines, sorting and hides the mode line of the window.
|
||||||
(advice-add #'register-preview :override #'consult-register-window)
|
(advice-add #'register-preview :override #'consult-register-window)
|
||||||
|
|
||||||
;; Use Consult to select xref locations with preview
|
;; Use Consult to select xref locations with preview
|
||||||
(setq xref-show-xrefs-function #'consult-xref
|
(setq xref-show-xrefs-function #'consult-xref
|
||||||
xref-show-definitions-function #'consult-xref)
|
xref-show-definitions-function #'consult-xref)
|
||||||
|
|
||||||
;; Configure other variables and modes in the :config section,
|
;; Configure other variables and modes in the :config section,
|
||||||
;; after lazily loading the package.
|
;; after lazily loading the package.
|
||||||
:config
|
:config
|
||||||
|
|
||||||
;; Optionally configure preview. The default value
|
;; Optionally configure preview. The default value
|
||||||
;; is 'any, such that any key triggers the preview.
|
;; is 'any, such that any key triggers the preview.
|
||||||
;; (setq consult-preview-key 'any)
|
;; (setq consult-preview-key 'any)
|
||||||
;; (setq consult-preview-key (kbd "M-."))
|
;; (setq consult-preview-key (kbd "M-."))
|
||||||
;; (setq consult-preview-key (list (kbd "<S-down>") (kbd "<S-up>")))
|
;; (setq consult-preview-key (list (kbd "<S-down>") (kbd "<S-up>")))
|
||||||
;; For some commands and buffer sources it is useful to configure the
|
;; For some commands and buffer sources it is useful to configure the
|
||||||
;; :preview-key on a per-command basis using the `consult-customize' macro.
|
;; :preview-key on a per-command basis using the `consult-customize' macro.
|
||||||
(consult-customize
|
(consult-customize
|
||||||
consult-theme
|
consult-theme
|
||||||
:preview-key '(:debounce 0.2 any)
|
:preview-key '(:debounce 0.2 any)
|
||||||
consult-ripgrep consult-git-grep consult-grep
|
consult-ripgrep consult-git-grep consult-grep
|
||||||
consult-bookmark consult-recent-file consult-xref
|
consult-bookmark consult-recent-file consult-xref
|
||||||
consult--source-bookmark consult--source-recent-file
|
consult--source-bookmark consult--source-recent-file
|
||||||
consult--source-project-recent-file
|
consult--source-project-recent-file
|
||||||
:preview-key (kbd "M-."))
|
:preview-key (kbd "M-."))
|
||||||
|
|
||||||
;; Optionally configure the narrowing key.
|
;; Optionally configure the narrowing key.
|
||||||
;; Both < and C-+ work reasonably well.
|
;; Both < and C-+ work reasonably well.
|
||||||
(setq consult-narrow-key "<") ;; (kbd "C-+")
|
(setq consult-narrow-key "<") ;; (kbd "C-+")
|
||||||
|
|
||||||
;; Optionally make narrowing help available in the minibuffer.
|
;; Optionally make narrowing help available in the minibuffer.
|
||||||
;; You may want to use `embark-prefix-help-command' or which-key instead.
|
;; You may want to use `embark-prefix-help-command' or which-key instead.
|
||||||
;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help)
|
;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help)
|
||||||
|
|
||||||
;; By default `consult-project-function' uses `project-root' from project.el.
|
;; By default `consult-project-function' uses `project-root' from project.el.
|
||||||
;; Optionally configure a different project root function.
|
;; Optionally configure a different project root function.
|
||||||
;; There are multiple reasonable alternatives to chose from.
|
;; There are multiple reasonable alternatives to chose from.
|
||||||
;;;; 1. project.el (the default)
|
;;;; 1. project.el (the default)
|
||||||
;; (setq consult-project-function #'consult--default-project--function)
|
;; (setq consult-project-function #'consult--default-project--function)
|
||||||
;;;; 2. projectile.el (projectile-project-root)
|
;;;; 2. projectile.el (projectile-project-root)
|
||||||
;; (autoload 'projectile-project-root "projectile")
|
;; (autoload 'projectile-project-root "projectile")
|
||||||
;; (setq consult-project-function (lambda (_) (projectile-project-root)))
|
;; (setq consult-project-function (lambda (_) (projectile-project-root)))
|
||||||
;;;; 3. vc.el (vc-root-dir)
|
;;;; 3. vc.el (vc-root-dir)
|
||||||
;; (setq consult-project-function (lambda (_) (vc-root-dir)))
|
;; (setq consult-project-function (lambda (_) (vc-root-dir)))
|
||||||
;;;; 4. locate-dominating-file
|
;;;; 4. locate-dominating-file
|
||||||
;; (setq consult-project-function (lambda (_) (locate-dominating-file "." ".git")))
|
;; (setq consult-project-function (lambda (_) (locate-dominating-file "." ".git")))
|
||||||
)
|
)
|
||||||
#+end_src
|
#+end_src
|
||||||
** Embark
|
** Embark
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package embark
|
(use-package embark
|
||||||
:straight t
|
:straight t
|
||||||
|
|
||||||
:bind
|
:bind
|
||||||
(("C-." . embark-act) ;; pick some comfortable binding
|
(("C-." . embark-act) ;; pick some comfortable binding
|
||||||
("C-;" . embark-dwim) ;; good alternative: M-.
|
("C-;" . embark-dwim) ;; good alternative: M-.
|
||||||
("C-h B" . embark-bindings)) ;; alternative for `describe-bindings'
|
("C-h B" . embark-bindings)) ;; alternative for `describe-bindings'
|
||||||
|
|
||||||
:init
|
:init
|
||||||
;; Optionally replace the key help with a completing-read interface
|
;; Optionally replace the key help with a completing-read interface
|
||||||
(setq prefix-help-command #'embark-prefix-help-command)
|
(setq prefix-help-command #'embark-prefix-help-command)
|
||||||
|
|
||||||
:config
|
:config
|
||||||
;; Hide the mode line of the Embark live/completions buffers
|
;; Hide the mode line of the Embark live/completions buffers
|
||||||
(add-to-list 'display-buffer-alist
|
(add-to-list 'display-buffer-alist
|
||||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
||||||
nil
|
nil
|
||||||
(window-parameters (mode-line-format . none)))))
|
(window-parameters (mode-line-format . none)))))
|
||||||
|
|
||||||
;; Consult users will also want the embark-consult package.
|
;; Consult users will also want the embark-consult package.
|
||||||
(use-package embark-consult
|
(use-package embark-consult
|
||||||
:straight t
|
:straight t
|
||||||
:after (embark consult)
|
:after (embark consult)
|
||||||
:demand t ; only necessary if you have the hook below
|
:demand t ; only necessary if you have the hook below
|
||||||
;; if you want to have consult previews as you move around an
|
;; if you want to have consult previews as you move around an
|
||||||
;; auto-updating embark collect buffer
|
;; auto-updating embark collect buffer
|
||||||
:hook
|
:hook
|
||||||
(embark-collect-mode . consult-preview-at-point-mode))
|
(embark-collect-mode . consult-preview-at-point-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
* TODO Git
|
* TODO Git
|
||||||
|
|||||||
Reference in New Issue
Block a user