From 7313b6ccb010575c1d213bd94c78f95d6e72afbb Mon Sep 17 00:00:00 2001 From: James Patrick Date: Sat, 20 Mar 2021 19:29:40 -0400 Subject: [PATCH 1/8] bankruptcy of enabled modules. --- emacs/init.el | 317 ++++++++++++++++++++++---------------------------- 1 file changed, 141 insertions(+), 176 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 5867cd1..0e3cddb 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1,221 +1,186 @@ ;;; init.el -*- lexical-binding: t; -*- -;; This file controls what Doom modules are enabled and what order they load in. -;; Remember to run 'doom sync' 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 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. - +childframe) ; Use company-box. - ;;(helm ; because sometimes I prefer what I know. - ;; +fuzzy) ; woh typse aynthing write teh first time. - ;;ido ; the other *other* search engine... - (ivy ; a search engine for love and life - +fuzzy ; Enables fuzzy completion for Ivy searches. - +icons ; Enables file icons for stuff. - +childframe ; display in a floating child frame, above Emacs. - +prescient) ; He who knows the past + 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 :ui - deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emaclints - doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;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 + ;;fill-column ; a `fill-column' indicator + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra - ;;indent-guides ; highlighted indent columns - (ligatures ; replace bits of code with pretty symbols - (:if IS-MAC +hasklig) ; Firacode doesn't work on OSX. Fallback to hasklig. - (:if IS-LINUX +fira) ; Fira is kind of what I'm used to. - ) - ;;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 - ;;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 - ;;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 - workspaces ; tab emulation, persistence & separate workspaces - ;;zen ; distraction-free coding or writing + ;;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 + 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) ; 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 + (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 ; making dired pretty [functional] - +ranger ; bringing the goodness of ranger to dired - +icons) ; colorful icons for dired-mode - electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management - (undo +tree ) ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree + dired ; 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 ; 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 + 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 ; FIXME stepping through code, to help you add bugs + ;;ansible + ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv - (docker +lsp) - 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 ; helps you navigate your code and documentation - +dictionary - +docsets ; ...or in Dash docsets locally - +offline - +xwidget) - lsp - ;;macos ; MacOS-specific commands - (magit ; a git porcelain for Emacs - +forge) - ;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 ; for running taskβ„’ - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;upload ; map local to remote projects via ssh/ftp + ;;docker + ;;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 + 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) ; 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 - ;;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 - ;;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 - ;;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 ; - json ; At least it ain't XML - ;;(java +lsp) ; the poster child for carpal tunnel syndrome - (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 + ;;agda ; types of types of types of types... + ;;cc ; C/C++/Obj-C madness + ;;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 + ;;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 + ;;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 ; 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 ;;factor - ;;ledger ; an accounting system in Emacs - ;;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 - +journal ; Enables org-journal integration. - +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 - +pretty - ;;+roam ; Enables org-roam integration. - ) - ;;perl ; write code no one else can comprehend - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - (python ; beautiful is better than ugly - +lsp - +poetry) - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - (ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - +lsp ; LSP really do make things easier huh? - +rails ; ruby != rails but rails == ruby - (:if IS-MAC +rbenv) ; - (:if IS-LINUX +chruby) ; - ) - ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;scheme ; a fully conniving family of lisps - (sh +lsp) ; she sells {ba,z,fi}sh shells on the C xor + ;;ledger ; an accounting system in Emacs + ;;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 ; 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 - yaml ; JSON, but readable + ;;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 :email - mu4e + ;;(mu4e +gmail) ;;notmuch ;;(wanderlust +gmail) :app ;;calendar - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought + ;;emms + ;;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. + ;;literate (default +bindings +smartparens)) From 3bb0ae8e9816cc91455deecdc766c3baf3b4daca Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:45:01 -0400 Subject: [PATCH 2/8] Corrected Lexical binding string --- emacs/+mail.el | 2 +- emacs/+org.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/+mail.el b/emacs/+mail.el index 907b6ab..ddd188b 100644 --- a/emacs/+mail.el +++ b/emacs/+mail.el @@ -1,4 +1,4 @@ -;;; init.el -*- lexical-binding: t; -*- +;;; +mail.el -*- lexical-binding: t; -*- ; I use ProtonMail with my domainname via ProtonBridge synced via mbsync to mu. diff --git a/emacs/+org.el b/emacs/+org.el index 768137f..19ac2a4 100644 --- a/emacs/+org.el +++ b/emacs/+org.el @@ -1,4 +1,4 @@ -;;; init.el -*- lexical-binding: t; -*- +;;; +org.el -*- lexical-binding: t; -*- (require 'org) (custom-set-variables '(org-directory "~/org/")) From 65e012d8801d86891bd328393dfcd456a2765e08 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:45:32 -0400 Subject: [PATCH 3/8] Enabling the systems that I want. --- emacs/init.el | 79 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 0e3cddb..21c3ce7 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -20,13 +20,18 @@ ;;layout ; auie,ctsrnm is the superior home row :completion - company ; the ultimate code completion backend + (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 + (ivy ; a search engine for love and life + +prescient + +icons + +childframe + ) :ui - ;;deft ; notational velocity for Emacs + 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 @@ -34,28 +39,28 @@ ;;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 cursor line after big motions + 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 + 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 + 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 + (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 @@ -66,7 +71,8 @@ ;;word-wrap ; soft wrapping with language-aware indent :emacs - dired ; making dired pretty [functional] + (dired ; making dired pretty [functional] + +icons) electric ; smarter, keyword-based electric-indent ;;ibuffer ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes @@ -76,33 +82,38 @@ ;;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 + (spell ; tasing you for misspelling mispelling + +hunspell + +everywhere) + grammar ; tasing grammar mistake every you make :tools - ;;ansible - ;;debugger ; FIXME stepping through code, to help you add bugs + ansible + 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 + (lookup ; navigate your code and its documentation + +docsets + +dictionary) + (lsp + +peek) magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs - ;;pass ; password manager for nerds + 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 + rgb ; creating color strings + taskrunner ; taskrunner for all your projects ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux + tmux ; an API for interacting with tmux ;;upload ; map local to remote projects via ssh/ftp :os @@ -117,7 +128,7 @@ ;;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 ;;elixir ; erlang done right ;;elm ; care for a cup of TEA? @@ -132,7 +143,8 @@ ;;(haskell +dante) ; 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 + (json ; At least it ain't XML + +lsp) ;;(java +meghanada) ; the poster child for carpal tunnel syndrome ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB @@ -146,7 +158,13 @@ ;;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 + (org ; organize your plain life in plain text + +dragndrop + +journal + +pandoc + +pomodoro + +pretty ;weirdly expensive + ) ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional @@ -156,17 +174,22 @@ ;;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'}"} + (ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + +lsp + +rails + (:if IS-MAC +rbenv) + (:if IS-LINUX +chruby) + ) ;;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 + (sh +lsp) ; 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) From 76fa17427f2def5410cc0220238dcb1ba1382f46 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:47:25 -0400 Subject: [PATCH 4/8] Updating the org UI to try and make it better looking. Mixed Mode is loaded from the zen doom module, but there's a fair amount of general weirdness with the ZEN mode so there might be some rough edges. --- emacs/+org.el | 59 +++++++++++++++++++++++++++++++++++++++++++++++ emacs/config.el | 11 ++++----- emacs/packages.el | 7 ++++-- 3 files changed, 69 insertions(+), 8 deletions(-) diff --git a/emacs/+org.el b/emacs/+org.el index 19ac2a4..5fb54ce 100644 --- a/emacs/+org.el +++ b/emacs/+org.el @@ -38,3 +38,62 @@ ;; org-journal-file-format (customize-set-variable 'org-journal-date-format "%A, %d %B %Y") + + +;;; Making OrgMode it better looking +; User Mix Pitch Mode for orgmode +(add-hook! 'org-mode-hook #'+org-pretty-mode #'mixed-pitch-mode) + + +; Add Padding +(add-hook 'org-mode-hook (lambda () + "Add padding left and right margins to orgmode" + (display-line-numbers-mode -1) + ;(text-scale-set 2) + (setq left-margin-width 2) + (setq right-margin-width 2) + (set-window-buffer nil (current-buffer)))) + +(custom-set-faces! + '(default :height 1) + '(org-document-title :height 2.2)) + +(setq org-agenda-deadline-faces + '((1.001 . error) + (1.0 . org-warning) + (0.5 . org-upcoming-deadline) + (0.0 . org-upcoming-distant-deadline))) + +;; Use appear to make org syntax easier to not fuck up. +;(use-package! org-appear +; :hook (org-mode . org-appear-mode) +; :config +; (setq org-appear-autoemphasis t +; org-appear-autosubmarkers t +; org-appear-autolinks nil) +; ;; for proper first-time setup, `org-appear--set-elements' +; ;; needs to be run after other hooks have acted. +; (run-at-time nil nil #'org-appear--set-elements)) + +;; Added Org-mode +(add-hook 'org-mode-hook (lambda () + "Beautify Org Checkbox Symbol" + (push '("[ ]" . "☐") prettify-symbols-alist) + (push '("[X]" . "β˜‘" ) prettify-symbols-alist) + (push '("[-]" . "⊟" ) prettify-symbols-alist) + (prettify-symbols-mode))) + + + +;;; Org-Agenda Options +(use-package! org-super-agenda + :commands (org-super-agenda-mode)) +(after! org-agenda + (org-super-agenda-mode)) + +(setq org-agenda-skip-scheduled-if-done t + org-agenda-skip-deadline-if-done t + org-agenda-include-deadlines t + org-agenda-block-separator nil + org-agenda-tags-column 100 ;; from testing this seems to be a good value + org-agenda-compact-blocks t) diff --git a/emacs/config.el b/emacs/config.el index c782477..08d0bf3 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -3,12 +3,11 @@ ;; Use "," as leader. (setq doom-localleader-key ",") -;; Firacode is broken with Emacs-plus on osx. Fallback to Hasklig. -(if IS-MAC - (setq doom-font (font-spec :family "Hasklig" :size 12)) - (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12)) - ) -;; +;; Firacode is broken with Emacs-plus on osx. Fallback to Hasklig +(setq doom-font (font-spec :family "Hasklig" :size 12) + doom-variable-pitch-font (font-spec :family "ETbembo" :size 16) + doom-big-font (font-spec :family "Hasklig" :size 16)) + ;; Set font (pcase (system-name) ("zuk" diff --git a/emacs/packages.el b/emacs/packages.el index ef145a8..7d05bfb 100644 --- a/emacs/packages.el +++ b/emacs/packages.el @@ -2,8 +2,11 @@ ;;; ~/.doom.d/packages.el (package! vimrc-mode) -(package! graphviz-dot-mode) - +(package! graphviz-dot-mode :pin "3642a0a5f4...") +(package! systemd :pin "b6ae63a236...") +(package! org-super-agenda :pin "f5e80e4d0d...") +(package! selectric-mode :pin "1840de71f7...") +(package! spray :pin "74d9dcfa2e...") (package! postcss-sorting) ;;; Examples: ;; (package! pretty-mode) From 9bd27bc4be7cf15465a576fedab32caf8d365bc6 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:51:25 -0400 Subject: [PATCH 5/8] Better Spellchecking --- emacs/+org.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs/+org.el b/emacs/+org.el index 5fb54ce..7f6636a 100644 --- a/emacs/+org.el +++ b/emacs/+org.el @@ -27,9 +27,14 @@ ;; recursive search for deft (setq deft-recursive t) + ; Enable word wrap (add-hook 'org-mode-hook #'visual-line-mode) +; Enable spell checking +(add-hook 'org-mode-hook 'turn-on-flyspell) + + ;Custom bullets (setq org-superstar-headline-bullets-list '("⁜" "☰" "☱" "☲" "☳" "☴" "☡" "☢" "☷")) From bad2de65e2480fcdf94edcc6e47cdacea858e394 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:51:49 -0400 Subject: [PATCH 6/8] Tweaking the delay for suggestions from company. --- emacs/+company.el | 8 ++++++++ emacs/config.el | 1 + 2 files changed, 9 insertions(+) create mode 100644 emacs/+company.el diff --git a/emacs/+company.el b/emacs/+company.el new file mode 100644 index 0000000..b88a2af --- /dev/null +++ b/emacs/+company.el @@ -0,0 +1,8 @@ +;;; +company.el -*- lexical-binding: t; -*- + +;; Make company a little faster to respond. +(after! company + (setq company-idle-delay 0.5 + company-minimum-prefix-length 2) + (setq company-show-numbers t) + (add-hook 'evil-normal-state-entry-hook #'company-abort)) ;; make aborting less annoying. diff --git a/emacs/config.el b/emacs/config.el index 08d0bf3..6523353 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -21,3 +21,4 @@ (load! "+mail") (load! "+org") +(load! "+company") From 1f7b9cd28e7d05be63c7a9e2c45e17643a4fa0b8 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:52:30 -0400 Subject: [PATCH 7/8] Don't tell me if a file is UTF8. Everything's UTF8 Do let me know when things aren't UTF8 though. --- emacs/+modeline.el | 12 ++++++++++++ emacs/config.el | 1 + 2 files changed, 13 insertions(+) create mode 100644 emacs/+modeline.el diff --git a/emacs/+modeline.el b/emacs/+modeline.el new file mode 100644 index 0000000..1821bbe --- /dev/null +++ b/emacs/+modeline.el @@ -0,0 +1,12 @@ +;;; +modeline.el -*- lexical-binding: t; -*- + +;; Only let us know when the encoding is NOT LF UTF-8. +(defun doom-modeline-conditional-buffer-encoding () + "We expect the encoding to be LF UTF-8, so only show the modeline when this is not the case" + (setq-local doom-modeline-buffer-encoding + (unless (and (memq (plist-get (coding-system-plist buffer-file-coding-system) :category) + '(coding-category-undecided coding-category-utf-8)) + (not (memq (coding-system-eol-type buffer-file-coding-system) '(1 2)))) + t))) + +(add-hook 'after-change-major-mode-hook #'doom-modeline-conditional-buffer-encoding) diff --git a/emacs/config.el b/emacs/config.el index 6523353..108214d 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -22,3 +22,4 @@ (load! "+mail") (load! "+org") (load! "+company") +(load! "+modeline") From 0ee113afd9c4d767edfcddc9d9dc3395eb601324 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 2 Apr 2021 15:53:52 -0400 Subject: [PATCH 8/8] Make the name buffer names a little better --- emacs/+window.el | 17 +++++++++++++++++ emacs/config.el | 1 + 2 files changed, 18 insertions(+) create mode 100644 emacs/+window.el diff --git a/emacs/+window.el b/emacs/+window.el new file mode 100644 index 0000000..7fe745e --- /dev/null +++ b/emacs/+window.el @@ -0,0 +1,17 @@ +;;; window.org.el -*- lexical-binding: t; -*- + +(setq doom-fallback-buffer-name "Doom" + +doom-dashboard-name "Doom Dashboard") + +(setq frame-title-format + '("" + (:eval + (if (s-contains-p org-roam-directory (or buffer-file-name "")) + (replace-regexp-in-string + ".*/[0-9]*-?" "☰ " + (subst-char-in-string ?_ ? buffer-file-name)) + "%b")) + (:eval + (let ((project-name (projectile-project-name))) + (unless (string= "-" project-name) + (format (if (buffer-modified-p) " β™’ %s" " ♦ %s") project-name)))))) diff --git a/emacs/config.el b/emacs/config.el index 108214d..de947fd 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -23,3 +23,4 @@ (load! "+org") (load! "+company") (load! "+modeline") +(load! "+window")