From d32515c5d3255970534db68ccfe4d09673248f7f Mon Sep 17 00:00:00 2001 From: mokou Date: Wed, 17 Nov 2021 17:14:37 +0100 Subject: [PATCH] Update emacs config --- dot_doom.d/config.el | 6 - dot_doom.d/init.el | 299 +++++++++++++++++++++---------------------- 2 files changed, 147 insertions(+), 158 deletions(-) diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el index 53ca944..1183e59 100644 --- a/dot_doom.d/config.el +++ b/dot_doom.d/config.el @@ -35,12 +35,6 @@ (add-hook 'typescript-mode-hook 'prettier-js-mode) (add-hook 'typescript-tsx-mode-hook 'prettier-js-mode) -;; Make Monky communicate via cmdserver -(setq monky-process-type 'cmdserver) - -;; Map SPC-g-h to monky-status -(map! :map magit-mode-map :leader "g h" 'monky-status) - ;; Enable Mercurial support for git-gutter (setq git-gutter:handled-backends '(git hg)) diff --git a/dot_doom.d/init.el b/dot_doom.d/init.el index 9e386c2..ed839da 100644 --- a/dot_doom.d/init.el +++ b/dot_doom.d/init.el @@ -1,195 +1,190 @@ ;;; init.el -*- lexical-binding: t; -*- -;; Copy this file to ~/.doom.d/init.el or ~/.config/doom/init.el ('doom -;; quickstart' will do this for you). The `doom!' block below controls what -;; modules are enabled and in what order they will be loaded. Remember to run -;; 'doom refresh' after modifying it. +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a "Module Index" link where you'll find +;; a comprehensive list of Doom's modules and what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). ;; -;; More information about these modules (and what flags they support) can be -;; found in modules/README.org. +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). (doom! :input ;;chinese ;;japanese - ;;(layout +azerty +bepo) + ;;layout ; auie,ctsrnm is the superior home row :completion - (company +childframe) - ;;helm - ;;ido - ;;ivy - (vertico +icons) + company ; 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 :ui - ;;deft - doom - doom-dashboard - ;;doom-quit - (emoji +github +unicode) - hl-todo + ;;deft ; notational velocity 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 ;;hydra - indent-guides - ligatures - minimap - (modeline +light) - nav-flash - ;;neotree - ophints - (popup +defaults) - ;;tabs - ;;treemacs - ;;unicode - vc-gutter - vi-tilde-fringe - window-select - workspaces - ;;zen + indent-guides ; highlighted indent columns + ligatures ; ligatures and symbols to make your code pretty again + minimap ; show a map of the code on the side + (modeline +light) ; snazzy, Atom-inspired modeline, plus API + nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + 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 ; 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 + ;;zen ; distraction-free coding or writing :editor - (evil +everywhere) - ;; file-templates - fold - ;;(format +onsave) - ;;god - ;;lispy - ;;multiple-cursors - ;;objed - ;;parinfer - rotate-text - snippets - ;;word-wrap + (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 + ;;god ; run Emacs commands without modifier keys + ;;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 + ;;word-wrap ; soft wrapping with language-aware indent :emacs - (dired - +ranger - +icons - ) - electric - ;;ibuffer - undo - vc + (dired +icons) ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree :term - ;;eshell - ;;shell - ;;term - ;;vterm + ;;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 :checkers - syntax - ;;spell - ;;grammar + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make :tools ;;ansible - ;;debugger + ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv docker - editorconfig - ;;ein - eval - ;;gist - (lookup - +docsets) - (lsp +peek) - magit - ;;make - ;;pass - ;;pdf - ;;prodigy - rgb - ;;taskrunner - ;;terraform - ;;tmux - ;;upload + editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + ;;gist ; interacting with github gists + lookup ; navigate your code and its documentation + (lsp +peek) ; M-x vscode + magit ; a git porcelain for Emacs + make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;upload ; map local to remote projects via ssh/ftp :os - (:if IS-MAC macos) - tty + (:if IS-MAC macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience :lang - ;;agda - ;;beancount - ;;cc - ;;clojure - ;;common-lisp - ;;coq - ;;crystal - ;;csharp - ;;dart - data - (elixir +lsp) - ;;elm - emacs-lisp - ;;erlang - ;;ess + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + ;;cc ; 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 + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + (elixir +lsp) ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics ;;factor - ;;faust - ;;fsharp - ;;fstar - ;;gdscript - ;;(go +lsp) - ;;(haskell +lsp) - ;;hy - ;;idris - ;;(java +meghanada) - (javascript +lsp) - json - ;;julia - ;;kotlin - ;;latex - ;;lean - ;;factor - ;;ledger - ;;lua - markdown - ;;nim - ;;nix - ;;ocaml - ;;(org +brain +dragndrop +gnuplot +hugo +ipython +journal +jupyter +noter +pandoc +pomodoro +present +pretty +roam) - ;;php - ;;plantuml - ;;purescript - ;;python - ;;qt - ;;racket - ;;raku - ;;rest - ;;ruby - (rust +lsp) - ;;scala - ;;scheme - sh + ;;faust ; dsp, but you get to keep your soul + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(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 ; At least it ain't XML + ;;(java +meghanada) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + ;;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 ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;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) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor ;;sml - ;;solidity - ;;swift - ;;terra - web - yaml - ;;zig + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + web ; the tubes + yaml ; JSON, but readable + ;;zig ; C, but simpler :email - ;;(mu4e +gmail) + ;;(mu4e +org +gmail) ;;notmuch ;;(wanderlust +gmail) - ;; Applications are complex and opinionated modules that transform Emacs - ;; toward a specific purpose. They may have additional dependencies and - ;; should be loaded late. :app ;;calendar ;;emms - ;;everywhere - ;;irc - ;;(rss +org) - ;;twitter + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought :config - ;; For literate config users. This will tangle+compile a config.org - ;; literate config in your `doom-private-dir' whenever it changes. ;;literate - - ;; The default module sets reasonable defaults for Emacs. It also - ;; provides a Spacemacs-inspired keybinding scheme and a smartparens - ;; config. Use it as a reference for your own modules. (default +bindings +smartparens)) +