From a6282662b5196f86fdefb68e1e6e2d1f8143d033 Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Fri, 11 Sep 2020 02:04:04 -0400 Subject: [PATCH] [emacs] Move org files and clean up init --- emacs/.config/doom/config.org | 24 ++++++++-------- emacs/.config/doom/custom.el | 21 ++++++++++++++ emacs/.config/doom/init.el | 53 ++++++++++++++++++++--------------- 3 files changed, 62 insertions(+), 36 deletions(-) create mode 100644 emacs/.config/doom/custom.el diff --git a/emacs/.config/doom/config.org b/emacs/.config/doom/config.org index af2da5e..caa1cdf 100644 --- a/emacs/.config/doom/config.org +++ b/emacs/.config/doom/config.org @@ -18,11 +18,10 @@ I change my default theme almost as often as the weather. I tend to revert back to Doom One most of the time, but I like the Kaolin themes, as well as Nimbus for it's retro charm. Nimbus just doesn't look great when I'm tired though. #+BEGIN_SRC emacs-lisp -(setq doom-font (font-spec :family "Iosevka" :size 14 :weight 'semi-light) - doom-variable-pitch-font (font-spec :family "Source Serif Pro" :size 16) - doom-big-font (font-spec :family "Iosevka" :size 18)) - -(setq doom-theme 'doom-peacock) +(setq doom-theme 'doom-old-hope + doom-font (font-spec :family "JetBrains Mono NL" :size 14 :weight 'semi-light) + doom-big-font (font-spec :family "JetBrains Mono NL" :size 18) + doom-variable-pitch-font (font-spec :family "Overpass" :size 16)) #+END_SRC ** Borders Barring the unfortunate end of X11 development and my eventual transition to @@ -180,7 +179,7 @@ A handful of mods here clean up org mode. Line numbers don’t mean much when yo (add-hook 'org-mode-hook #'doom-disable-line-numbers-h) (after! org - (setq org-directory (expand-file-name "~/org/") + (setq org-directory (expand-file-name "~/var/org/") org-agenda-files (list org-directory) org-pretty-entities t org-agenda-dim-blocked-tasks nil @@ -191,7 +190,7 @@ A handful of mods here clean up org mode. Line numbers don’t mean much when yo org-fontify-quote-and-verse-blocks t org-ellipsis "…" org-capture-templates - '(("i" "Send to inbox" entry (file+headline "~/org/inbox.org" "Inbox") + '(("i" "Send to inbox" entry (file "~/var/org/inbox.org") "* TODO %?\n")) org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "MAYBE(m)" "|" "DONE(d)" "WONTDO(w)")) @@ -208,8 +207,7 @@ A handful of mods here clean up org mode. Line numbers don’t mean much when yo (setq git-gutter:disabled-modes '(org-mode image-mode))) ;; Refiling -(setq org-refile-targets '(("~/org/inbox.org" :maxlevel . 9) - ("~/gtd/someday.org" :level . 9))) +(setq org-refile-targets '(("~/var/org/inbox.org" :maxlevel . 9))) (setq org-outline-path-complete-in-steps nil) ; Refile in a single go (setq org-refile-use-outline-path t) ; Show full paths for refiling @@ -217,7 +215,7 @@ A handful of mods here clean up org mode. Line numbers don’t mean much when yo ** Key bindings I add only two custom mappings to the default org mode maps, a shortcut to my Inbox file and a quick way to save all open org mode files. #+BEGIN_SRC emacs-lisp -(setq +inbox-file "~/org/inbox.org") +(setq +inbox-file "~/var/org/inbox.org") (defun +open-inbox-file () (interactive) "Opens the inbox file" @@ -246,13 +244,13 @@ I add only two custom mappings to the default org mode maps, a shortcut to my In ** Org-roam I am absolutely in love with [[https://org-roam.readthedocs.io/en/develop/][Org-roam]]. Everything about it makes taking notes easier. I just need to level up with Zettels and web publishing of my notes. #+BEGIN_SRC emacs-lisp -(setq org-roam-directory "~/org/") +(setq org-roam-directory "~/var/org/") #+END_SRC ** Org-fc Trying a new space-repetition framework. #+BEGIN_SRC emacs-lisp -(setq org-fc-directories "~/org/") +(setq org-fc-directories "~/var/org/") (require 'org-fc-hydra) #+END_SRC @@ -306,7 +304,7 @@ I use notmuch to read and write email from within Emacs. ; Use w3m to parse HTML email (setq mm-text-html-renderer 'w3m) -(setq w3m-fill-column 72) +(setq w3m-fill-column 88) ; Kill email message buffers when you close them (setq message-kill-buffer-on-exit t) diff --git a/emacs/.config/doom/custom.el b/emacs/.config/doom/custom.el new file mode 100644 index 0000000..f613da2 --- /dev/null +++ b/emacs/.config/doom/custom.el @@ -0,0 +1,21 @@ +;;; custom.el --- -*- lexical-binding: t; -*- + +;; Copyright (C) 2020 Colin Powell + +;; Author: Colin Powell +;; Keywords: +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(doom-big-font-mode t) + '(package-selected-packages + (quote + (caddyfile-mode wordgen w3m vterm-toggle ponylang-mode jq-mode jq-format hackernews elfeed-protocol dired-ranger csv-mode csv counsel-jq blacken)))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(default ((t (:background "#151619"))))) diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el index 806fdc3..325e93f 100644 --- a/emacs/.config/doom/init.el +++ b/emacs/.config/doom/init.el @@ -19,10 +19,13 @@ ;;japanese :completion - company ; the ultimate code completion backend - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - (ivy +fuzzy +icons) ; a search engine for love and life + (company ; the ultimate code completion backend + +childframe) + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + (ivy ; a search engine for love and life + +fuzzy + +icons) :ui ;;deft ; notational velocity for Emacs @@ -33,19 +36,21 @@ hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra ;;indent-guides ; highlighted indent columns + ligatures ; ;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 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 + (popup + +all + +defaults) ; tame sudden yet inevitable temporary windows ;;tabs ; an 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 + (window-select +numbers) ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces zen ; distraction-free coding or writing @@ -53,21 +58,21 @@ (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 + (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 + ;;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 ; making dired pretty [functional] + (dired +icons) ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes + (ibuffer +icons) ; interactive buffer management + (undo +tree) ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree :term @@ -90,9 +95,10 @@ ;;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 + (lookup ; navigate your code and its documentation + +dictionary + +docsets) lsp - ;;macos ; MacOS-specific commands magit ; a git porcelain for Emacs make ; run make tasks from Emacs pass ; password manager for nerds @@ -143,6 +149,7 @@ ;;ocaml ; an objective camel (org ; organize your plain life in plain text +hugo + +dragndrop +gnuplot +ipython ; ipython support for babel +journal @@ -160,17 +167,17 @@ ;;racket ; a DSL for DSLs rest ; Emacs as a REST client rst ; ReST in peace - (ruby +rails +lsp) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (ruby +rails +lsp) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + (rust +lsp) ; 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 + 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 - yaml ; JSON, but readable + web ; the tubes + yaml ; JSON, but readable :email ;;(mu4e +gmail)