From 066701153178bd01accfe9ae6283b786845fdfab Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Thu, 4 Jan 2024 17:00:44 +0800 Subject: [PATCH] feat: emacs - format elisp via 'M-x pp-buffer' --- .../base/desktop/editors/emacs/doom/config.el | 31 ++-- home/base/desktop/editors/emacs/doom/init.el | 136 ++++++++++-------- .../desktop/editors/emacs/doom/packages.el | 16 ++- 3 files changed, 101 insertions(+), 82 deletions(-) diff --git a/home/base/desktop/editors/emacs/doom/config.el b/home/base/desktop/editors/emacs/doom/config.el index 8ea1e5f8..8baa800d 100644 --- a/home/base/desktop/editors/emacs/doom/config.el +++ b/home/base/desktop/editors/emacs/doom/config.el @@ -35,18 +35,13 @@ ;; other doom's official themes: ;; https://github.com/doomemacs/themes (setq doom-theme 'doom-one) - ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type t) - (setq warning-minimum-level :error) - ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/org/") - - ;; Whenever you reconfigure a package, make sure to wrap your config in an ;; `after!' block, otherwise Doom's defaults may override your settings. E.g. ;; @@ -81,42 +76,40 @@ ;; accept completion from copilot and fallback to company (use-package! copilot - :hook (prog-mode . copilot-mode) - :bind (:map copilot-completion-map - ("" . 'copilot-accept-completion) - ("TAB" . 'copilot-accept-completion) - ("C-TAB" . 'copilot-accept-completion-by-word) - ("C-" . 'copilot-accept-completion-by-word)) + :hook + (prog-mode . copilot-mode) + :bind + (:map copilot-completion-map + ("" . 'copilot-accept-completion) + ("TAB" . 'copilot-accept-completion) + ("C-TAB" . 'copilot-accept-completion-by-word) + ("C-" . 'copilot-accept-completion-by-word)) :config (copilot-mode +1)) - (use-package super-save :ensure t :config (super-save-mode +1)) - (after! super-save (setq super-save-auto-save-when-idle t) (setq super-save-all-buffers t) (setq super-save-delete-trailing-whitespace t)) - (use-package wakatime-mode :ensure t) - ;; fully enable tree-sitter highlighting (after! tree-sitter (setq +tree-sitter-hl-enabled-modes t)) - ;; fix: https://github.com/jrblevin/markdown-mode/issues/380 ;; even add this one, editing a large markdown table is still very slow. ;; so avoid editing large markdown file in emacs, use neovim instead... (after! markdown-mode (global-font-lock-mode 0)) - ;; use alejandra to format nix files (use-package lsp-nix :ensure lsp-mode - :after (lsp-mode) + :after + (lsp-mode) :demand t :custom - (lsp-nix-nil-formatter ["alejandra"])) + (lsp-nix-nil-formatter + ["alejandra"])) diff --git a/home/base/desktop/editors/emacs/doom/init.el b/home/base/desktop/editors/emacs/doom/init.el index 253d9eaf..f3c7d0c2 100644 --- a/home/base/desktop/editors/emacs/doom/init.el +++ b/home/base/desktop/editors/emacs/doom/init.el @@ -13,52 +13,57 @@ ;; ;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its ;; directory (for easy access to its source code). - (doom! :input ;;bidi ; (tfel ot) thgir etirw uoy gnipleh - chinese ; TODO: use (chinese +rime) + chinese ; TODO: use (chinese +rime) ;;japanese ;;layout ; auie,ctsrnm is the superior home row :completion - (company +childframe) ; the ultimate code completion backend + (company +childframe) + ; the ultimate code completion backend ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... ;;ivy ; a search engine for love and life - vertico ; the search engine of the future + vertico ; the search engine of the future :ui ;;deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs ;;doom-quit ; DOOM quit-message prompts when you quit Emacs - (emoji +unicode) ; 🙂 - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - indent-guides ; highlighted indent columns - ligatures ; ligatures and symbols to make your code pretty again - modeline ; snazzy, Atom-inspired modeline, plus API - ophints ; highlight the region an operation acts on - (popup +defaults) ; tame sudden yet inevitable temporary windows - tabs ; a tab bar for Emacs - treemacs ; a project drawer, like neotree but cooler - unicode ; extended unicode support for various languages - (vc-gutter +pretty) ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB + (emoji +unicode) + ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + indent-guides ; highlighted indent columns + ligatures ; ligatures and symbols to make your code pretty again + modeline ; snazzy, Atom-inspired modeline, plus API + ophints ; highlight the region an operation acts on + (popup +defaults) + ; tame sudden yet inevitable temporary windows + tabs ; a tab bar for Emacs + treemacs ; a project drawer, like neotree but cooler + unicode ; extended unicode support for various languages + (vc-gutter +pretty) + ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB ;;window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces + workspaces ; tab emulation, persistence & separate workspaces ;;zen ; distraction-free coding or writing :editor - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - (format +onsave) ; automated prettiness + (evil +everywhere) + ; come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + (format +onsave) + ; automated prettiness ;;lispy ; vim for lisp, for people who don't like vim ;;multiple-cursors ; editing in many places at once ;;objed ; text object editing for the innocent ;;parinfer ; turn lisp into python, sort of ;;rotate-text ; cycle region at point between text candidates - snippets ; my elves. They type so I don't have to + snippets ; my elves. They type so I don't have to ;;word-wrap ; soft wrapping with language-aware indent :emacs @@ -72,12 +77,13 @@ ;;eshell ; the elisp shell that works everywhere ;;shell ; simple shell REPL for Emacs ;;term ; basic terminal emulator for Emacs - vterm ; the best terminal emulation in Emacs + vterm ; the best terminal emulation in Emacs :checkers - syntax ; tasing you for every semicolon you forget - (spell +flyspell) ; tasing you for misspelling mispelling - grammar ; tasing grammar mistake every you make + syntax ; tasing you for every semicolon you forget + (spell +flyspell) + ; tasing you for misspelling mispelling + grammar ; tasing grammar mistake every you make :tools ;;ansible @@ -88,38 +94,42 @@ (docker +lsp) editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) - lookup ; navigate your code and its documentation - lsp ; M-x vscode - magit ; a git porcelain for Emacs + (eval +overlay) + ; run code, run (also, repls) + lookup ; navigate your code and its documentation + lsp ; M-x vscode + magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds - pdf ; pdf enhancements + pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders - (terraform +lsp) ; infrastructure as code + (terraform +lsp) + ; infrastructure as code ;;tmux ; an API for interacting with tmux - tree-sitter ; syntax and parsing, sitting in a tree... + tree-sitter ; syntax and parsing, sitting in a tree... ;;upload ; map local to remote projects via ssh/ftp :os - (:if IS-MAC macos) ; improve compatibility with macOS - tty ; improve the terminal Emacs experience + (:if IS-MAC macos) + ; improve compatibility with macOS + tty ; improve the terminal Emacs experience :lang ;;agda ; types of types of types of types... ;;beancount ; mind the GAAP - (cc +lsp +tree-sitter) ; C > C++ == 1 + (cc +lsp +tree-sitter) + ; C > C++ == 1 ;;clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs ;;crystal ; ruby at the speed of c ;;csharp ; unity, .NET, and mono shenanigans - data ; config/data formats + data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall ;;elixir ; erlang done right ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses + emacs-lisp ; drown in parentheses ;;erlang ; an elegant language for a more civilized age ;;ess ; emacs speaks statistics ;;factor @@ -128,45 +138,59 @@ ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for - (go +lsp +tree-sitter) ; the hipster dialect + (go +lsp +tree-sitter) + ; the hipster dialect ;;(graphql +lsp) ; Give queries a REST ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on - (json +lsp +tree-sitter) ; At least it ain't XML - (java +lsp +tree-sitter) ; the poster child for carpal tunnel syndrome - (javascript +lsp +tree-sitter) ; all(hope(abandon(ye(who(enter(here)))))) + (json +lsp +tree-sitter) + ; At least it ain't XML + (java +lsp +tree-sitter) + ; the poster child for carpal tunnel syndrome + (javascript +lsp +tree-sitter) + ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) - (latex +lsp) ; writing papers in Emacs has never been so fun + (latex +lsp) + ; writing papers in Emacs has never been so fun ;;lean ; for folks with too much to prove ;;ledger ; be audit you can be - (lua +lsp +tree-sitter) ; one-based indices? one-based indices - (markdown +grip) ; writing docs for people to ignore + (lua +lsp +tree-sitter) + ; one-based indices? one-based indices + (markdown +grip) + ; writing docs for people to ignore ;;nim ; python + lisp at the speed of c - (nix +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" + (nix +lsp +tree-sitter) + ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - org ; organize your plain life in plain text + org ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp +tree-sitter +pyright) ; beautiful is better than ugly + (python +lsp +tree-sitter +pyright) + ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever - racket ; a DSL for DSLs + racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 ;;rest ; Emacs as a REST client ;;rst ; ReST in peace ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +lsp +tree-sitter) + ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good - (scheme +guile) ; a fully conniving family of lisps - (sh +lsp +tree-sitter) ; she sells {ba,z,fi}sh shells on the C xor + (scheme +guile) + ; a fully conniving family of lisps + (sh +lsp +tree-sitter) + ; she sells {ba,z,fi}sh shells on the C xor ;;sml ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - (web +lsp +tree-sitter) ; support for various web languages, including HTML5, CSS, SASS/SCSS, Pug/Jade/Slim, and more - (yaml +lsp +tree-sitter) ; JSON, but readable + (web +lsp +tree-sitter) + ; support for various web languages, including HTML5, CSS, SASS/SCSS, Pug/Jade/Slim, and more + (yaml +lsp +tree-sitter) + ; JSON, but readable ;;zig ; C, but simpler :email diff --git a/home/base/desktop/editors/emacs/doom/packages.el b/home/base/desktop/editors/emacs/doom/packages.el index 95713d77..c90cf2ac 100644 --- a/home/base/desktop/editors/emacs/doom/packages.el +++ b/home/base/desktop/editors/emacs/doom/packages.el @@ -4,16 +4,18 @@ ;; To install a package with Doom you must declare them here and run 'doom sync' ;; on the command line, then restart Emacs for the changes to take effect -- or ;; use 'M-x doom/reload'. - (package! copilot - :recipe (:host github :repo "copilot-emacs/copilot.el" :files ("*.el" "dist"))) - + :recipe + (:host github :repo "copilot-emacs/copilot.el" :files + ("*.el" "dist"))) (package! super-save - :recipe (:host github :repo "bbatsov/super-save" :files ("*.el" "dist"))) - + :recipe + (:host github :repo "bbatsov/super-save" :files + ("*.el" "dist"))) (package! wakatime-mode - :recipe (:host github :repo "wakatime/wakatime-mode" :files ("*.el" "dist"))) - + :recipe + (:host github :repo "wakatime/wakatime-mode" :files + ("*.el" "dist"))) ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: ;; (package! some-package)