From d583d02cd518f6baadc49b48dd00806d4746234f Mon Sep 17 00:00:00 2001 From: Tim McCarthy Date: Fri, 5 Apr 2024 12:14:14 -0700 Subject: [PATCH] More config tweaks --- thoom-emacs/init.el | 565 ++---------------------- thoom-emacs/modules/thoom-completion.el | 14 +- thoom-emacs/thoom-emacs.el | 110 ----- 3 files changed, 56 insertions(+), 633 deletions(-) delete mode 100644 thoom-emacs/thoom-emacs.el diff --git a/thoom-emacs/init.el b/thoom-emacs/init.el index 5934cf0..0e9cca8 100644 --- a/thoom-emacs/init.el +++ b/thoom-emacs/init.el @@ -1,69 +1,20 @@ -(defvar bootstrap-version) -(let ((bootstrap-file - (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) - (bootstrap-version 6)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage)) -(straight-use-package 'use-package) +(defvar thoom/dir (file-name-directory load-file-name) + "The root dir of the Thoom Emacs distribution.") +(defvar thoom/modules-dir (expand-file-name "modules" thoom/dir) + "This directory houses all of the built-in Prelude modules.") +(add-to-list 'load-path thoom/modules-dir) -;; Check the system used -(defconst ON-LINUX (eq system-type 'gnu/linux)) -(defconst ON-MAC (eq system-type 'darwin)) -(defconst ON-BSD (or ON-MAC (eq system-type 'berkeley-unix))) -(defconst ON-WINDOWS (memq system-type '(cygwin windows-nt ms-dos))) +;; Set a location for the custom file so it doesn't pollute this file. +(setq custom-file (locate-user-emacs-file "custom-vars.el")) -(use-package exec-path-from-shell - :straight t - :if (and ON-MAC (memq window-system '(mac ns))) - :config - (dolist (var '("NIX_SSL_CERT_FILE" - "NIX_PATH" - "NIX_PROFILES")) - (add-to-list 'exec-path-from-shell-variables var)) - (exec-path-from-shell-initialize)) - -(defun thoom/org-babel-tangle-config () - (when (string-equal (file-truename (buffer-file-name)) - (expand-file-name "~/.dotfiles/thoom-emacs/ThoomEmacs.org")) - ;; Dynamic scoping to the rescue - (let ((org-confirm-babel-evaluate nil)) - (org-babel-tangle)))) - -(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'thoom/org-babel-tangle-config))) - -(use-package doom-themes - :straight t - :config - ;; Global settings (defaults) - (setq doom-themes-enable-bold t ; if nil, bold is universally disabled - doom-themes-enable-italic t) ; if nil, italics is universally disabled - (load-theme 'doom-one t) - - ;; Enable flashing mode-line on errors - (doom-themes-visual-bell-config) - ;; Corrects (and improves) org-mode's native fontification. - (doom-themes-org-config)) - -(set-frame-parameter (selected-frame) 'alpha '(99 98)) -(add-to-list 'default-frame-alist '(alpha 99 98)) - -(setq inhibit-startup-message t - use-dialog-box nil) - -(tool-bar-mode -1) -(scroll-bar-mode -1) - -;; On a Mac, the menu bar doesn't take up screen real-estate, so leave it on -(if (not ON-MAC) - (menu-bar-mode -1)) +;; Elpaca package manager +(require 'thoom-elpaca) +(require 'thoom-os) +(require 'thoom-completion) +(require 'thoom-theme) +;; When scrolling by page and hitting top/bottom, move cursor to top/bottom of buffer (setq-default scroll-error-top-bottom t) ;; Revert buffers when the underlying file has changed @@ -79,6 +30,12 @@ ;; Visually mark the line the cursor is on (global-hl-line-mode 1) +;; Enable repeat mode. Keymaps are defined through use-package's :repeat-map directive. +(repeat-mode 1) + +(tab-bar-mode) +;; TODO - keybindings + ;; TODO - Decide whether to enable this ;; (defalias 'yes-or-no-p 'y-or-n-p) @@ -88,292 +45,43 @@ (setq-default sentence-end-double-space nil) (use-package hl-todo - :straight t + :ensure t :init (global-hl-todo-mode)) -(repeat-mode 1) - -(tab-bar-mode) - -;; TODO - keybindings - -(setq custom-file (locate-user-emacs-file "custom-vars.el")) - -(require 'server) -(unless (server-running-p) (server-start)) +;; TODO https://github.com/jdtsmith/outli (use-package which-key - :straight t + :ensure t :init (which-key-mode) (which-key-setup-side-window-bottom)) -(use-package emacs - :bind - ;; Window management - (("C-c w v" . split-window-right) - ("C-c w s" . split-window-below) - ("C-S-h" . windmove-left) - ("C-S-j" . windmove-down) - ("C-S-k" . windmove-up) - ("C-S-l" . windmove-right) +;; Dired +;; (use-package dired +;; :bind (:map dired-mode-map +;; ("h" . dired-up-directory) +;; ("l" . dired-find-file))) - ;; Tab management - ("C-c w t c" . tab-bar-new-tab) - ("C-c w t r" . tab-rename) - ("C-c w t d" . tab-bar-close-tab) - ("C-c w t n" . tab-bar-switch-to-next-tab) - ("C-c w t p" . tab-bar-switch-to-prev-tab) - ;; Mac keybindings for tab management - ("s-t" . tab-bar-new-tab) - ("s-}" . tab-bar-switch-to-next-tab) - ("s-{" . tab-bar-switch-to-prev-tab) - ;; Common keybindings with tab switching in browsers, for use with my mouse bindings - ("C-" . tab-bar-switch-to-next-tab) - ("C-" . tab-bar-switch-to-prev-tab) +;; Treesitter +;; TODO https://github.com/renzmann/treesit-auto - ;; Buffer management - ("C-c b d" . kill-this-buffer) - ("C-c b b" . consult-buffer) - ("C-c b p" . previous-buffer) - ("C-c b n" . next-buffer) - ("C-c b C-c" . server-edit) +;; LSP +;; TODO https://github.com/blahgeek/emacs-lsp-booster - ;; File management - ("C-c f f" . find-file) - ("C-c f r" . consult-recent-file) - ("C-c f j" . dired-jump) +;; TODO Use right-option as regular option on Mac +;; (setq ns-alternate-modifier 'meta) +;; (setq ns-right-alternate-modifier 'none) - ;; TODO - C-c g p for open project in magit +;; TODO https://github.com/stsquad/emacs_chrome - ("C-o" . pop-global-mark) - ("M-DEL" . backward-kill-word) - ("C-:" . execute-extended-command-for-buffer)) - :init - ;; mark-page is not very useful, and shadows project.el bindings in Meow keypad - (unbind-key "C-x C-p")) +;; TODO https://github.com/astoff/devdocs.el -(use-package dired - :bind (:map dired-mode-map - ("h" . dired-up-directory) - ("l" . dired-find-file))) +;; TODO https://github.com/casouri/vundo +; +;; TODO https://karthinks.com/software/avy-can-do-anything/ -;; 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 "L") 'indent-rigidly-right) -(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) - -(defmacro thoom/meow-negate (meow-command) - `(lambda () - (interactive) - (let ((current-prefix-arg -1)) - (call-interactively ,meow-command)))) - -(use-package meow - :straight t - :init - ;; TODO - make this unnecessary - (require 'meow) - - ;; TODO - debug this. should make org headings into meow things - (meow-thing-register 'heading 'heading 'heading) - (setq meow-use-clipboard t - meow-char-thing-table '((?\( . round) - (?\) . round) - (?\[ . square) - (?\] . square) - (?\{ . curly) - (?\} . curly) - (?\" . string) - (?\' . string) - (?h . heading) - (?e . symbol) - (?w . window) - (?b . buffer) - (?p . paragraph) - (?l . line) - (?d . defun) - (?. . sentence)) - meow-cheatsheet-layout meow-cheatsheet-layout-qwerty - meow-keypad-self-insert-undefined nil) - - (add-to-list 'meow-mode-state-list '(eshell-mode . insert) t) - (add-hook 'git-commit-mode-hook 'meow-insert) - - (meow-motion-overwrite-define-key - '("j" . meow-next) - '("k" . meow-prev) - '("J" . meow-next-expand) - '("K" . meow-prev-expand) - '(":" . execute-extended-command) - '("" . ignore)) - - (meow-leader-define-key - ;; SPC j/k will run the original command in MOTION state. - '("j" . "H-j") - '("k" . "H-k") - - ;; 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-define-keys 'insert - '("C-g" . meow-insert-exit) - '("C-M-g" . meow-insert-exit)) - - (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) - ;; Potential addition <, > - - '("a" . meow-append) - '("A" . meow-open-below) - '("b" . meow-back-word) - '("B" . meow-back-symbol) - '("c" . meow-change) - ;; Potential addition - '("d" . meow-delete) - '("D" . meow-backward-delete) - '("e" . meow-next-word) - '("E" . meow-next-symbol) - '("f" . meow-find) - `("F" . ,(thoom/meow-negate 'meow-find)) - '("g g" . meow-cancel-selection) - '("g d" . xref-find-definitions) - '("g u" . xref-find-references) - '("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) - ;; Potential addition - M - '("n" . meow-search) - ;; Potential addition - N - '("o" . meow-block) - '("O" . meow-to-block) - '("p" . meow-yank) - '("P" . consult-yank-pop) - '("q" . meow-cancel-selection) - ;; Potential addition - Q - '("r" . meow-replace) - '("R" . meow-swap-grab) - '("s" . meow-kill) - ;; Potential addition - S - '("t" . meow-till) - `("T" . ,(thoom/meow-negate 'meow-till)) - '("u" . meow-undo) - '("U" . meow-undo-in-selection) - '("v" . meow-visit) - `("V" . ,(thoom/meow-negate 'meow-visit)) - '("w" . meow-mark-word) - '("W" . meow-mark-symbol) - '("x" . meow-line) - `("X" . ,(thoom/meow-negate 'meow-line)) - '("y" . meow-save) - '("Y" . meow-sync-grab) - '("z" . meow-pop-selection) - ;; Potential addition - Z - '("'" . repeat) - '("/" . meow-comment) - '(":" . execute-extended-command) - '("=" . indent-region) - '("+" . indent-rigidly)) - - (meow-global-mode 1)) - -(use-package corfu - :straight t - ;; Optional customizations - ;; :custom - ;; (corfu-cycle t) ;; Enable cycling for `corfu-next/previous' - ;; (corfu-auto t) ;; Enable auto completion - ;; (corfu-separator ?\s) ;; Orderless field separator - ;; (corfu-quit-at-boundary nil) ;; Never quit at completion boundary - ;; (corfu-quit-no-match nil) ;; Never quit, even if there is no match - ;; (corfu-preview-current nil) ;; Disable current candidate preview - ;; (corfu-preselect-first nil) ;; Disable candidate preselection - ;; (corfu-on-exact-match nil) ;; Configure handling of exact matches - ;; (corfu-echo-documentation nil) ;; Disable documentation in the echo area - ;; (corfu-scroll-margin 5) ;; Use scroll margin - - ;; Enable Corfu only for certain modes. - ;; :hook ((prog-mode . corfu-mode) - ;; (shell-mode . corfu-mode) - ;; (eshell-mode . corfu-mode)) - - ;; Recommended: Enable Corfu globally. - ;; This is recommended since Dabbrev can be used globally (M-/). - ;; See also `corfu-excluded-modes'. - :init - (global-corfu-mode)) - -(use-package emacs - :init - (setq tab-always-indent 'complete)) - -(use-package dumb-jump - :straight t - :config - (add-hook 'xref-backend-functions #'dumb-jump-xref-activate) - (setq xref-show-definitions-function #'xref-show-definitions-completing-read)) - -(use-package org - :hook (org-mode . visual-line-mode) - :bind (:map - org-mode-map - ("C-x C-o c" . thoom-org-clear-all) - :repeat-map - thoom/org-previous-next-visible-heading-repeat-map - ("n" . org-next-visible-heading) - ("C-n" . org-next-visible-heading) - ("p" . org-previous-visible-heading) - ("C-p" . org-previous-visible-heading)) - :config - ;; Add structure templates - (add-to-list 'org-modules 'org-tempo t) - (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp")) - - (setq org-edit-src-content-indentation 0)) - -(use-package org-bullets - :straight t - :hook org-mode) - -(defun thoom-org-clear-all () +(defun thoom/org-clear-all () (interactive) (goto-char 0) (org-map-entries @@ -382,196 +90,21 @@ (flush-lines "CLOSED") (message "Entries cleared.")) -(use-package vertico - :straight (:files (:defaults "extensions/*")) - :init - (vertico-mode) - - :bind (:map vertico-map - ("C-j" . vertico-next) - ("C-k" . vertico-previous))) - -(use-package vertico-directory - :after vertico - :bind (:map vertico-map - ("C-h" . vertico-directory-delete-word) - ("C-l" . vertico-directory-enter))) - -(use-package marginalia - :straight t - ;; Either bind `marginalia-cycle' globally or only in the minibuffer - :bind (:map minibuffer-local-map - ("M-A" . marginalia-cycle)) - - :init - (marginalia-mode)) - -(use-package orderless - :straight t - :init - ;; Configure a custom style dispatcher (see the Consult wiki) - ;; (setq orderless-style-dispatchers '(+orderless-dispatch) - ;; orderless-component-separator #'orderless-escapable-split-on-space) - (setq completion-styles '(orderless basic) - completion-category-defaults nil - completion-category-overrides '((file (styles partial-completion))))) - -(use-package consult - :straight t - ;; Replace bindings. Lazily loaded due by `use-package'. - :bind (;; C-c bindings (mode-specific-map) - ("C-c h" . consult-history) - ("C-c m" . consult-mode-command) - ("C-c k" . consult-kmacro) - ;; C-x bindings (ctl-x-map) - ("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command - ("C-x C-b" . consult-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 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame - ("C-x r b" . consult-bookmark) ;; orig. bookmark-jump - ("C-x p b" . consult-project-buffer) ;; orig. project-switch-to-buffer - ;; Custom M-# bindings for fast register access - ("M-#" . consult-register-load) - ("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated) - ("C-M-#" . consult-register) - ;; Other custom bindings - ("M-y" . consult-yank-pop) ;; orig. yank-pop - (" a" . consult-apropos) ;; orig. apropos-command - ;; M-g bindings (goto-map) - ("M-g e" . consult-compile-error) - ("M-g f" . consult-flymake) ;; Alternative: consult-flycheck - ("M-g 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 m" . consult-mark) - ("M-g k" . consult-global-mark) - ("M-g i" . consult-imenu) - ("M-g I" . consult-imenu-multi) - ;; M-s bindings (search-map) - ("M-s d" . consult-find) - ("M-s D" . consult-locate) - ("M-s g" . consult-grep) - ("M-s G" . consult-git-grep) - ("M-s r" . consult-ripgrep) - ("M-s l" . consult-line) - ("M-s L" . consult-line-multi) - ("M-s m" . consult-multi-occur) - ("M-s k" . consult-keep-lines) - ("M-s u" . consult-focus-lines) - ;; Isearch integration - ("M-s e" . consult-isearch-history) - :map isearch-mode-map - ("M-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-multi) ;; needed by consult-line to detect isearch - ;; Minibuffer history - :map minibuffer-local-map - ("M-s" . consult-history) ;; orig. next-matching-history-element - ("M-r" . consult-history)) ;; orig. previous-matching-history-element - - ;; Enable automatic preview at point in the *Completions* buffer. This is - ;; relevant when you use the default completion UI. - :hook (completion-list-mode . consult-preview-at-point-mode) - - ;; The :init configuration is always executed (Not lazy) - :init - - ;; Optionally configure the register formatting. This improves the register - ;; preview for `consult-register', `consult-register-load', - ;; `consult-register-store' and the Emacs built-ins. - (setq register-preview-delay 0.5 - register-preview-function #'consult-register-format) - - ;; Optionally tweak the register preview window. - ;; This adds thin lines, sorting and hides the mode line of the window. - (advice-add #'register-preview :override #'consult-register-window) - - ;; Use Consult to select xref locations with preview - (setq xref-show-xrefs-function #'consult-xref - xref-show-definitions-function #'consult-xref) - - ;; Configure other variables and modes in the :config section, - ;; after lazily loading the package. +(use-package dumb-jump + :ensure t :config - - ;; Optionally configure preview. The default value - ;; is 'any, such that any key triggers the preview. - ;; (setq consult-preview-key 'any) - ;; (setq consult-preview-key (kbd "M-.")) - ;; (setq consult-preview-key (list (kbd "") (kbd ""))) - ;; For some commands and buffer sources it is useful to configure the - ;; :preview-key on a per-command basis using the `consult-customize' macro. - (consult-customize - consult-theme - :preview-key '(:debounce 0.2 any) - consult-ripgrep consult-git-grep consult-grep - consult-bookmark consult-recent-file consult-xref - consult--source-bookmark consult--source-recent-file - consult--source-project-recent-file - :preview-key (kbd "M-.")) - - ;; Optionally configure the narrowing key. - ;; Both < and C-+ work reasonably well. - (setq consult-narrow-key "<") ;; (kbd "C-+") - - ;; Optionally make narrowing help available in the minibuffer. - ;; 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) - - ;; By default `consult-project-function' uses `project-root' from project.el. - ;; Optionally configure a different project root function. - ;; There are multiple reasonable alternatives to chose from. - ;;;; 1. project.el (the default) - ;; (setq consult-project-function #'consult--default-project--function) - ;;;; 2. projectile.el (projectile-project-root) - ;; (autoload 'projectile-project-root "projectile") - ;; (setq consult-project-function (lambda (_) (projectile-project-root))) - ;;;; 3. vc.el (vc-root-dir) - ;; (setq consult-project-function (lambda (_) (vc-root-dir))) - ;;;; 4. locate-dominating-file - ;; (setq consult-project-function (lambda (_) (locate-dominating-file "." ".git"))) - ) - -(use-package embark - :straight t - - :bind - (("C-." . embark-act) ;; pick some comfortable binding - ("C-;" . embark-dwim) ;; good alternative: M-. - ("C-h B" . embark-bindings)) ;; alternative for `describe-bindings' - - :init - ;; Optionally replace the key help with a completing-read interface - (setq prefix-help-command #'embark-prefix-help-command) - - :config - ;; Hide the mode line of the Embark live/completions buffers - (add-to-list 'display-buffer-alist - '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*" - nil - (window-parameters (mode-line-format . none))))) - -;; Consult users will also want the embark-consult package. -(use-package embark-consult - :straight t - :after (embark consult) - :demand t ; only necessary if you have the hook below - ;; if you want to have consult previews as you move around an - ;; auto-updating embark collect buffer - :hook - (embark-collect-mode . consult-preview-at-point-mode)) + (add-hook 'xref-backend-functions #'dumb-jump-xref-activate) + (setq xref-show-definitions-function #'xref-show-definitions-completing-read)) (use-package magit - :straight t + :ensure t :custom (magit-save-repository-buffers 'dontask) :bind (("C-x g" . magit-status) - :map magit-mode-map - (":" . execute-extended-command) - ("x" . magit-discard))) + :map magit-mode-map + (":" . execute-extended-command) + ("x" . magit-discard))) (use-package direnv - :straight t + :ensure t :config (direnv-mode)) diff --git a/thoom-emacs/modules/thoom-completion.el b/thoom-emacs/modules/thoom-completion.el index 36bdc99..d95fcc5 100644 --- a/thoom-emacs/modules/thoom-completion.el +++ b/thoom-emacs/modules/thoom-completion.el @@ -6,11 +6,11 @@ :init (vertico-mode)) -;; (use-package vertico-directory -;; :after vertico -;; :bind (:map vertico-map -;; ("C-h" . vertico-directory-delete-word) -;; ("C-l" . vertico-directory-enter))) +(use-package vertico-directory + :after vertico + :bind (:map vertico-map + ("C-h" . vertico-directory-delete-word) + ("C-l" . vertico-directory-enter))) (use-package marginalia @@ -42,8 +42,8 @@ ("C-c k" . consult-kmacro) ;; C-x bindings (ctl-x-map) ("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command - ("C-x C-b" . consult-buffer) - ("C-x b" . consult-buffer) ;; orig. switch-to-buffer + ;;("C-x C-b" . consult-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 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame ("C-x r b" . consult-bookmark) ;; orig. bookmark-jump diff --git a/thoom-emacs/thoom-emacs.el b/thoom-emacs/thoom-emacs.el deleted file mode 100644 index fbd460d..0000000 --- a/thoom-emacs/thoom-emacs.el +++ /dev/null @@ -1,110 +0,0 @@ - -(defvar thoom/dir (file-name-directory load-file-name) - "The root dir of the Thoom Emacs distribution.") -(defvar thoom/modules-dir (expand-file-name "modules" thoom/dir) - "This directory houses all of the built-in Prelude modules.") -(add-to-list 'load-path thoom/modules-dir) - -;; Set a location for the custom file so it doesn't pollute this file. -(setq custom-file (locate-user-emacs-file "custom-vars.el")) - -;; Elpaca package manager -(require 'thoom-elpaca) -(require 'thoom-os) -(require 'thoom-completion) -(require 'thoom-theme) - -;; When scrolling by page and hitting top/bottom, move cursor to top/bottom of buffer -(setq-default scroll-error-top-bottom t) - -;; Revert buffers when the underlying file has changed -(global-auto-revert-mode 1) - -;; Remember recent files -(recentf-mode 1) - -;; Save what you enter into minibuffer prompts -(setq history-length 25) -(savehist-mode 1) - -;; Visually mark the line the cursor is on -(global-hl-line-mode 1) - -;; Enable repeat mode. Keymaps are defined through use-package's :repeat-map directive. -(repeat-mode 1) - -(tab-bar-mode) -;; TODO - keybindings - -;; TODO - Decide whether to enable this -;; (defalias 'yes-or-no-p 'y-or-n-p) - -;; tabs are for monsters -(setq-default indent-tabs-mode nil) -(setq-default tab-width 4) -(setq-default sentence-end-double-space nil) - -(use-package hl-todo - :ensure t - :init - (global-hl-todo-mode)) - -;; TODO https://github.com/jdtsmith/outli - -(use-package which-key - :ensure t - :init - (which-key-mode) - (which-key-setup-side-window-bottom)) - -;; Dired -;; (use-package dired -;; :bind (:map dired-mode-map -;; ("h" . dired-up-directory) -;; ("l" . dired-find-file))) - -;; Treesitter -;; TODO https://github.com/renzmann/treesit-auto - -;; LSP -;; TODO https://github.com/blahgeek/emacs-lsp-booster - -;; TODO Use right-option as regular option on Mac -;; (setq ns-alternate-modifier 'meta) -;; (setq ns-right-alternate-modifier 'none) - -;; TODO https://github.com/stsquad/emacs_chrome - -;; TODO https://github.com/astoff/devdocs.el - -;; TODO https://github.com/casouri/vundo -; -;; TODO https://karthinks.com/software/avy-can-do-anything/ - -(defun thoom/org-clear-all () - (interactive) - (goto-char 0) - (org-map-entries - (lambda () - (org-todo ""))) - (flush-lines "CLOSED") - (message "Entries cleared.")) - -(use-package dumb-jump - :ensure t - :config - (add-hook 'xref-backend-functions #'dumb-jump-xref-activate) - (setq xref-show-definitions-function #'xref-show-definitions-completing-read)) - -(use-package magit - :ensure t - :custom (magit-save-repository-buffers 'dontask) - :bind (("C-x g" . magit-status)) - :map magit-mode-map - (":" . execute-extended-command) - ("x" . magit-discard)) - -(use-package direnv - :ensure t - :config - (direnv-mode))