From 440c98d6d7c8f0f09f14380985fdabf63caba59e Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Wed, 28 Oct 2020 21:17:48 -0300 Subject: Upgraded doom emacs --- .doom.d/config.el | 83 +++++++++++++++++----------------------- .doom.d/init.el | 106 +++++++++++++++++++++++++++------------------------- .doom.d/logo.png | Bin 36156 -> 0 bytes .doom.d/packages.el | 60 ++++++++++++++--------------- 4 files changed, 118 insertions(+), 131 deletions(-) delete mode 100644 .doom.d/logo.png (limited to '.doom.d') diff --git a/.doom.d/config.el b/.doom.d/config.el index b4829d19..aadc0259 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -1,17 +1,11 @@ -;; -;; | '__/ _ \ / _` / __| Roger González -;; | | | (_) | (_| \__ \ https://rogs.me -;; |_| \___/ \__, |___/ https://git.rogs.me -;; |___/ -;; ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- ;; Place your private configuration here! Remember, you do not need to run 'doom -;; refresh' after modifying this file! +;; sync' after modifying this file! -;; These are used for a number of things, particularly for GPG configuration, -;; some email clients, file templates and snippets. +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. (setq user-full-name "Roger Gonzalez" user-mail-address "roger@rogs.me") @@ -20,56 +14,55 @@ ;; ;; + `doom-font' ;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode' +;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. ;; ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd ;; font string. You generally only need these two: -;; test +;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) (setq doom-font (font-spec :family "Source Code Pro Medium" :size 15) - doom-variable-pitch-font (font-spec :family "sans")) + doom-variable-pitch-font (font-spec :family "sans") + doom-big-font (font-spec :family "Source Code Pro Medium" :size 24)) + +(after! doom-themes + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) +(custom-set-faces! + '(font-lock-comment-face :slant italic) + '(font-lock-keyword-face :slant italic)) ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the -;; `load-theme' function. These are the defaults. -(setq doom-theme 'doom-material) 4 +;; `load-theme' function. This is the default: -;; If you intend to use org, it is recommended you change this! -(setq org-directory "~/org") +(setq doom-theme 'doom-material) -;; If you want to change the style of line numbers, change this to `relative' or -;; `nil' to disable it: +;; 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/") + +;; 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 'relative) ;; Here are some additional functions/macros that could help you configure Doom: ;; ;; - `load!' for loading external *.el files relative to this one -;; - `use-package' for configuring packages +;; - `use-package!' for configuring packages ;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', where Emacs -;; looks when you load packages with `require' or `use-package'. +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. ;; - `map!' for binding new keys ;; ;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c g k'). +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). ;; This will open documentation for it, including demos of how they are used. ;; -;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. - -;; Set emacs logo as the default image -(setq - +doom-dashboard-banner-file (expand-file-name "logo.png" doom-private-dir)) - -;; Saves emacs backups in other folder -(setq - backup-by-copying t ; don't clobber symlinks - backup-directory-alist '(("." . "~/.emacs_backups")) ; don't litter my fs tree - delete-old-versions t - kept-new-versions 6 - kept-old-versions 2 - version-control t) ; use versioned backups - ;; WhiteSpace Cleanup (global-whitespace-cleanup-mode) @@ -177,7 +170,7 @@ ;; C: Delegate it ;; D: Just an idea (setq org-highest-priority ?A) - (setq org-lowest-priority ?D) + (setq org-lowest-priority ?D) (setq org-default-priority ?B) (setq org-priority-faces '((?A . (:foreground "white" :background "dark red" :weight bold)) (?B . (:foreground "white" :background "dark green" :weight bold)) @@ -195,7 +188,7 @@ ("ps" "Scheduled" entry (file+headline "~/org/personal.org" "Captured") (file "~/org/templates/scheduled-task.txt")) - ("pl" "Logbook entry for Personal" entry (file+datetree "logbook-personal.org") "** %U - %^{Activity} :LOG:") + ("pl" "Logbook entry for Personal" entry (file+datetree "logbook-personal.org") "** %U - %^{Activity} :LOG:") ;; Massive templates ("m" "Templates for Massive") ("mc" "Templates for CocaCola") @@ -211,7 +204,7 @@ ("mck" "New Kafein mistake" entry (file+datetree "~/org/Massive/CocaCola/kafein-errors.org") (file "~/org/templates/kafein-errors.txt")) - ("ml" "Logbook entry for Massive" entry (file+datetree "logbook-work.org") "** %U - %^{Activity} :LOG:") + ("ml" "Logbook entry for Massive" entry (file+datetree "logbook-work.org") "** %U - %^{Activity} :LOG:") ;; Tarmac templates ("t" "Templates for Tarmac") ("tv" "Templates for Volition") @@ -227,7 +220,7 @@ ("tve" "New EOD email" entry (file+datetree "~/org/Tarmac/Volition/eod-emails.org") (file "~/org/templates/tarmac-eod-email-template.txt")) - ("tl" "Logbook entry for Tarmac" entry (file+datetree "~/org/Tarmac/logbook-tarmac.org") "** %U - %^{Activity} :LOG:") + ("tl" "Logbook entry for Tarmac" entry (file+datetree "~/org/Tarmac/logbook-tarmac.org") "** %U - %^{Activity} :LOG:") ))) ;; Enforce ordered tasks (setq org-enforce-todo-dependencies t) @@ -265,11 +258,3 @@ (setq lsp-pyls-plugins-pycodestyle-enabled nil) (setq lsp-pyls-configuration-sources "pep8") (add-hook 'before-save-hook 'lsp-format-buffer)) - -;; Setting up pyvenv. On each project, run add-dir-local-variable and specify the virtualenv location -;; https://blog.allardhendriksen.nl/posts/tracking-project-virtual-environments-with-pyvenv-tracking-mode/ -(use-package pyvenv - :ensure t - :init - (pyvenv-mode 1) - (pyvenv-tracking-mode 1)) diff --git a/.doom.d/init.el b/.doom.d/init.el index 4a387558..30002fbd 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -1,48 +1,48 @@ -;; -;; | '__/ _ \ / _` / __| Roger González -;; | | | (_) | (_| \__ \ https://rogs.me -;; |_| \___/ \__, |___/ https://git.rogs.me -;; |___/ -;; -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- ;;; init.el -*- lexical-binding: t; -*- -;; Copy this file to ~/.doom.d/init.el or ~/.config/doom/init.el ('doom install' -;; 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 ; auie,ctsrnm is the superior home row :completion 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 + ivy ; a search engine for love and life :ui ;;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) ; 🙂 ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra - ;;indent-guides ; highlighted indent columns + 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 the current line after jumping + 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 ; tame sudden yet inevitable temporary windows - +all ; catch all popups that start with an asterix - +defaults) ; default popup rules - ;;pretty-code ; replace bits of code with pretty symbols - ;;tabs ; an tab bar for Emacs + (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 @@ -55,7 +55,7 @@ (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 + ;; (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 @@ -63,19 +63,25 @@ ;;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] electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management + ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree :term - eshell ; a consistent, cross-platform shell (WIP) - ;;shell ; a terminal REPL for Emacs - ;;term ; terminals in Emacs - vterm ; another terminals in Emacs + ;; 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 ; tasing you for every semicolon you forget + ;;spell ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make :tools ;;ansible @@ -85,27 +91,26 @@ ;;editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) - flycheck ; tasing you for every semicolon you forget - ;;flyspell ; tasing you for misspelling mispelling ;;gist ; interacting with github gists - (lookup ; helps you navigate your code and documentation - +docsets) ; ...or in Dash docsets locally + lookup ; navigate your code and its documentation lsp - ;;macos ; MacOS-specific commands (magit +forge) ; 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) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + :lang ;;agda ; types of types of types of types... - ;;assembly ; assembly for fun or debugging ;;cc ; C/C++/Obj-C madness ;;clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all @@ -113,19 +118,23 @@ ;;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 ;;elixir ; 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 ;;faust ; dsp, but you get to keep your soul - ;;fsharp ; ML stands for Microsoft's Language - ;;go ; the hipster dialect + ;;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)))))) + (javascript +lsp) ; 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 @@ -137,31 +146,27 @@ ;;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 - +dragndrop ; drag & drop files/images into org buffers - +hugo ; use Emacs for hugo blogging - ;;+jupyter ; ipython/jupyter support for babel - ;;+pandoc ; export-with-pandoc support - ;;+pomodoro ; be fruitful with the tomato technique - +present) ; using org-mode for presentations - ;;perl ; write code no one else can comprehend + 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) ; beautiful is better than ugly + (python +lsp) ; 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 ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;;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 + ;;sml ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - web ; the tubes + ;;web ; the tubes + yaml ; JSON, but readable :email ;;(mu4e +gmail) @@ -173,7 +178,6 @@ ;;irc ; how neckbeards socialize ;;(rss +org) ; emacs as an RSS reader ;;twitter ; twitter client https://twitter.com/vnought - ;;write ; emacs for writers (fiction, notes, papers, etc.) :config ;;literate diff --git a/.doom.d/logo.png b/.doom.d/logo.png deleted file mode 100644 index 9015b248..00000000 Binary files a/.doom.d/logo.png and /dev/null differ diff --git a/.doom.d/packages.el b/.doom.d/packages.el index 41dab231..a9b8dbad 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -1,59 +1,57 @@ -;; -;; | '__/ _ \ / _` / __| Roger González -;; | | | (_) | (_| \__ \ https://rogs.me -;; |_| \___/ \__, |___/ https://git.rogs.me -;; |___/ -;; -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- ;; -*- no-byte-compile: t; -*- ;;; $DOOMDIR/packages.el -;; This is where you install packages, by declaring them with the `package!' -;; macro, then running 'doom refresh' on the command line. You'll need to -;; restart Emacs for your changes to take effect! Or at least, run M-x -;; `doom/reload'. -;; -;; WARNING: Don't disable core packages listed in ~/.emacs.d/core/packages.el. -;; Doom requires these, and disabling them may have terrible side effects. -;; -;; Here are a couple examples: +;; 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'. + ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: - ;(package! some-package) +;(package! some-package) -;; To install a package directly from a particular repo, you'll need to specify -;; a `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: ;; https://github.com/raxod502/straight.el#the-recipe-format - ;(package! another-package - ; :recipe (:host github :repo "username/repo")) +;(package! another-package +; :recipe (:host github :repo "username/repo")) ;; If the package you are trying to install does not contain a PACKAGENAME.el ;; file, or is located in a subdirectory of the repo, you'll need to specify ;; `:files' in the `:recipe': - ;(package! this-package - ; :recipe (:host github :repo "username/repo" - ; :files ("some-file.el" "src/lisp/*.el"))) +;(package! this-package +; :recipe (:host github :repo "username/repo" +; :files ("some-file.el" "src/lisp/*.el"))) -;; If you'd like to disable a package included with Doom, for whatever reason, -;; you can do so here with the `:disable' property: - ;(package! builtin-package :disable t) +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;(package! builtin-package :disable t) ;; You can override the recipe of a built in package without having to specify ;; all the properties for `:recipe'. These will inherit the rest of its recipe ;; from Doom or MELPA/ELPA/Emacsmirror: - ;(package! builtin-package :recipe (:nonrecursive t)) - ;(package! builtin-package-2 :recipe (:repo "myfork/package")) +;(package! builtin-package :recipe (:nonrecursive t)) +;(package! builtin-package-2 :recipe (:repo "myfork/package")) ;; Specify a `:branch' to install a package from a particular branch or tag. ;; This is required for some packages whose default branch isn't 'master' (which ;; our package manager can't deal with; see raxod502/straight.el#279) - ;(package! builtin-package :recipe (:branch "develop")) +;(package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;(package! builtin-package :pin "1a2b3c4d5e") +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) +; (package! whitespace-cleanup-mode) (package! prettier-js) (package! aggressive-indent) -(package! yaml-mode) (package! emojify) (package! ghub+) (package! lsp-python-ms :disable t) -- cgit v1.2.3