From 90f899b6a5246b78c38a114f78aa3850fc4e1425 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Wed, 25 Nov 2020 14:20:11 -0500 Subject: [PATCH] Keeping up to date --- bin/clean | 4 ++++ bin/update | 8 +++++++- doom/config.el | 6 ++++++ doom/init.el | 53 ++++++++++++++++++++++++++++---------------------- 4 files changed, 47 insertions(+), 24 deletions(-) diff --git a/bin/clean b/bin/clean index 0a0b251..1999885 100755 --- a/bin/clean +++ b/bin/clean @@ -7,3 +7,7 @@ fi if command -v nix &> /dev/null; then nix-collect-garbage -d fi + +if command -v doom &> /dev/null; then + doom purge +fi diff --git a/bin/update b/bin/update index 590b81e..a4850f5 100755 --- a/bin/update +++ b/bin/update @@ -3,7 +3,7 @@ if command -v brew &> /dev/null; then brew update brew upgrade - brew cask upgrade + brew upgrade --cask fi if command -v nix &> /dev/null; then @@ -11,3 +11,9 @@ if command -v nix &> /dev/null; then nix-env -u home-manager switch fi + +if command -v doom &> /dev/null; then + doom sync + doom upgrade + doom env +fi diff --git a/doom/config.el b/doom/config.el index a16b3ec..cc31529 100644 --- a/doom/config.el +++ b/doom/config.el @@ -52,3 +52,9 @@ ;; ;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how ;; they are implemented. + +(defun doom/ediff-init-and-example () + "ediff the current `init.el' with the example in doom-emacs-dir" + (interactive) + (ediff-files (concat doom-private-dir "init.el") + (concat doom-emacs-dir "init.example.el"))) diff --git a/doom/init.el b/doom/init.el index 8f3f1c0..1abff07 100644 --- a/doom/init.el +++ b/doom/init.el @@ -4,19 +4,20 @@ ;; 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 information about all of Doom's -;; modules and what flags they support. +;; 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 g k' for non-vim users) to view its documentation. This works on +;; '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). ;; -;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its +;; 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 ; auie,ctsrnm is the superior home row :completion company ; the ultimate code completion backend @@ -28,20 +29,22 @@ ;;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 + doom-quit ; DOOM quit-message prompts when you quit Emacs + (emoji +unicode) ; 🙂 ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra 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 ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim + neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows - pretty-code ; ligatures or substitute text with pretty symbols - ;;tabs ; an tab bar for Emacs + tabs ; a tab bar for Emacs treemacs ; a project drawer, like neotree but cooler - ;;unicode ; extended unicode support for various languages + 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 @@ -60,7 +63,7 @@ ;;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 + word-wrap ; soft wrapping with language-aware indent :emacs dired ; making dired pretty [functional] @@ -70,10 +73,10 @@ vc ; version-control and Emacs, sitting in a tree :term - ;;eshell ; the elisp shell that works everywhere + 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 @@ -85,17 +88,16 @@ ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv ;;docker - ;;editorconfig ; let someone else argue about tabs vs spaces + 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 - ;;macos ; MacOS-specific commands 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 ;;rgb ; creating color strings ;;taskrunner ; taskrunner for all your projects @@ -103,6 +105,10 @@ ;;tmux ; an API for interacting with tmux ;;upload ; map local to remote projects via ssh/ftp + :os + (:if IS-MAC macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + :lang ;;agda ; types of types of types of types... ;;cc ; C/C++/Obj-C madness @@ -119,12 +125,13 @@ ;;erlang ; an elegant language for a more civilized age ;;ess ; emacs speaks statistics ;;faust ; dsp, but you get to keep your soul - ;;fsharp ; ML stands for Microsoft's Language + ;;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 +dante) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python - ;;idris ; + ;;idris ; a language you can depend on ;;json ; At least it ain't XML ;;(java +meghanada) ; the poster child for carpal tunnel syndrome (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) @@ -137,20 +144,20 @@ ;;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!" + nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel org ; organize your plain life in plain text - ;;perl ; write code no one else can comprehend - php ; perl's insecure younger brother + ;;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 ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;scheme ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor @@ -158,8 +165,8 @@ ;;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 + web ; the tubes + yaml ; JSON, but readable :email ;;(mu4e +gmail)