From a1fda770347ac6ded7103a765ed3f1145eed4e6f Mon Sep 17 00:00:00 2001 From: Phil Bajsicki Date: Sat, 12 Aug 2023 22:48:12 +0200 Subject: [PATCH] Literate config for Doom Emacs. Updated with timestamp shortcuts. --- .config/doom/README.org | 67 +++++++++-- .config/doom/config.el | 46 +++++++- .config/doom/init.el | 241 +++++++++------------------------------ .config/doom/packages.el | 80 ++----------- .config/fish/README.org | 2 +- 5 files changed, 167 insertions(+), 269 deletions(-) diff --git a/.config/doom/README.org b/.config/doom/README.org index 80a43d0..a192f17 100644 --- a/.config/doom/README.org +++ b/.config/doom/README.org @@ -33,7 +33,7 @@ You can extract all the source/ config files from here by running Emacs and hitt (setq doom-modeline-persp-name t) #+end_src -** Org-mode +** org-mode 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! @@ -57,6 +57,14 @@ Make .org file automatically open in org-mode. (global-set-key "\C-ch" 'counsel-org-link) (global-set-key "\C-cne" 'elgantt-open) #+end_src +*** Timestamp keybinds +Inserts timestamps in the proper format. ~'(16)~ stands for two universal arguments, keeping the command from prompting for the time. Two keybinds here, which insert an active or inactive timestamp. +#+begin_src emacs-lisp :tangle config.el +(global-set-key "\C-cia" '(lambda ()(interactive) + (org-timestamp '(16)))) +(global-set-key "\C-cii" '(lambda () (interactive) + (org-timestamp-inactive '(16)))) +#+end_src *** Theming. @@ -157,7 +165,7 @@ This lets me get desktop notifications for TODO items. #+end_src (setq find-file-visit-truename t) -** Org-roam +** org-roam *** Keybinds #+begin_src emacs-lisp :tangle config.el @@ -169,8 +177,7 @@ This lets me get desktop notifications for TODO items. (define-key org-roam-map "n" 'org-roam-capture) #+end_src -*** Org-roam - +*** org-roam #+begin_src emacs-lisp :tangle config.el (setq org-roam-v2-ack t) (setq org-roam-completion-everywhere t) @@ -180,13 +187,49 @@ This lets me get desktop notifications for TODO items. (org-roam-db-autosync-enable) (setq org-roam-capture-templates - '(("r" "default" plain + '(("n" "default" plain "%?" - :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n") - :unnarrowed t))) + :if-new (file+head "%<%Y.%m.%d.%H\:%M>-${slug}.org" "#+title: ${title}\n") + :unnarrowed t) + ("j" "journal" plain + "%?" + :if-new (file+head "journal/journal-%<%Y.%m.%d.%H\:%M>-${slug}.org" "#+title: ${title}\n") + :empty-lines 1 + :unnarrowed t) + ("t" "Therapy" plain + " +,* Sytuacja +,** Myśli +,** Emocje +,** Zachowania +,** Argumenty potwierdzające myśli +,** Argumenty podważające +,** Myśli alternatywne +,** Emocje alternatywne- +,** Zachowania alternatywne +" + :if-new (file+head "therapy/therapy-%<%Y.%m.%d.%H\:%M>-${slug}.org" "#+title: ${title}\n") + :empty-lines 1 + :unnarrowed))) #+end_src +** org-roam-ui +#+begin_src emacs-lisp :tangle config.el +(use-package! websocket + :after org-roam) -** Org-elgantt +(use-package! org-roam-ui + :after org-roam ;; or :after org +;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have +;; a hookable mode anymore, you're advised to pick something yourself +;; if you don't care about startup time, use +;; :hook (after-init . org-roam-ui-mode) + :config + (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) +#+end_src +** org-elgantt #+begin_src emacs-lisp :tangle config.el (add-to-list 'load-path "~/.emacs.d/.local/straight/repos/elgantt/") @@ -209,7 +252,7 @@ This lets me get desktop notifications for TODO items. :text-props (face (:background "red"))))))) #+end_src -** Org-agenda +** org-agenda *** Keybinds #+begin_src emacs-lisp :tangle config.el (global-set-key "\C-ca" 'org-agenda) @@ -238,13 +281,13 @@ This lets me get desktop notifications for TODO items. org-agenda-log-mode-items '(closed clock state)) #+end_src -** Yasnippets +** yasnippets #+begin_src emacs-lisp :tangle config.el (setq doom-snippets-enable-short-helpers t) #+end_src * custom.el Custom variables. Note that this file is generally set up automatically by Emacs, so I'm not exporting this block. I'm keeping the default warning commants in just for completion here. -#+begin_src +#+begin_src emacs-lisp :tangle no (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -438,6 +481,8 @@ release. You can ~unpin!~ them. Note ~(unpin! t)~ unpins all the packages and ca (package! org-roam) (package! org-ql) (package! org-wild-notifier) +(unpin! org-roam) +(package! org-roam-ui) #+end_src *** Org-depend Ensure task dependencies are met. diff --git a/.config/doom/config.el b/.config/doom/config.el index 8d64a7e..fa99cf0 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -30,6 +30,11 @@ (global-set-key "\C-ch" 'counsel-org-link) (global-set-key "\C-cne" 'elgantt-open) +(global-set-key "\C-cia" '(lambda ()(interactive) + (org-timestamp '(16)))) +(global-set-key "\C-cii" '(lambda () (interactive) + (org-timestamp-inactive '(16)))) + (setq org-todo-keywords '((sequence "INBOX(i)" @@ -117,10 +122,45 @@ (org-roam-db-autosync-enable) (setq org-roam-capture-templates - '(("r" "default" plain + '(("n" "default" plain "%?" - :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n") - :unnarrowed t))) + :if-new (file+head "%<%Y.%m.%d.%H\:%M>-${slug}.org" "#+title: ${title}\n") + :unnarrowed t) + ("j" "journal" plain + "%?" + :if-new (file+head "journal/journal-%<%Y.%m.%d.%H\:%M>-${slug}.org" "#+title: ${title}\n") + :empty-lines 1 + :unnarrowed t) + ("t" "Therapy" plain + " +* Sytuacja +** Myśli +** Emocje +** Zachowania +** Argumenty potwierdzające myśli +** Argumenty podważające +** Myśli alternatywne +** Emocje alternatywne- +** Zachowania alternatywne +" + :if-new (file+head "therapy/therapy-%<%Y.%m.%d.%H\:%M>-${slug}.org" "#+title: ${title}\n") + :empty-lines 1 + :unnarrowed))) + +(use-package! websocket + :after org-roam) + +(use-package! org-roam-ui + :after org-roam ;; or :after org +;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have +;; a hookable mode anymore, you're advised to pick something yourself +;; if you don't care about startup time, use +;; :hook (after-init . org-roam-ui-mode) + :config + (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) (add-to-list 'load-path "~/.emacs.d/.local/straight/repos/elgantt/") diff --git a/.config/doom/init.el b/.config/doom/init.el index 6bbb0a4..8f2b3fb 100644 --- a/.config/doom/init.el +++ b/.config/doom/init.el @@ -1,197 +1,66 @@ - - -;; 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 link to Doom's Module Index where all -;; of our modules are listed, including 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). -;; -;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its -;; directory (for easy access to its source code). - (doom! :input - ;;bidi ; (tfel ot) thgir etirw uoy gnipleh - ;;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 - ;; vertico ; the search engine of the future +:completion +company +ivy - :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) ; 🙂 - 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 - 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 +:ui +doom +doom-dashboard +doom-quit +(emoji +unicode) +hl-todo +ligatures +modeline +ophints +(popup +defaults) +treemacs +unicode +vi-tilde-fringe +workspaces - :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 +:editor +file-templates +fold +(format +onsave) +snippets +word-wrap - :emacs - 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 +:emacs +dired +electric +undo +vc - :term - ;;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 +:term +vterm - :checkers - syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar +:checkers +syntax - :tools - ;;ansible - ;;biblio ; Writes a PhD for you (citation needed) - ;;debugger ; FIXME stepping through code, to help you add bugs - ;;direnv - ;;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 ; 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 +:tools +(eval +overlay) +lookup +lsp +magit +pdf - :os - (:if IS-MAC macos) ; improve compatibility with macOS - ;;tty ; improve the terminal Emacs experience +:lang +common-lisp +data +emacs-lisp +(haskell +lsp) +latex +org +plantuml +raku +shipsweb +rust +yaml +zig - :lang - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - ;;(cc +lsp) ; 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 ; 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 ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;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 - ;;(graphql +lsp) ; Give queries a REST - (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 +lsp) ; 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 - ;; org-yt-url-protocol - ;; org-protocol - org-superstar - ;;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 ; Emcas 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 +guile) ; 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 - ;;zig ; C, but simpler +:config +;literate +(default +bindings +smartparens) - :email - ;;bbdb - ;;(mu4e +org +gmail) - ;;notmuch - ;;(wanderlust +gmail) - - :app - ;;calendar - ;;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 - ;;literate - (default +bindings +smartparens)) +) diff --git a/.config/doom/packages.el b/.config/doom/packages.el index c802d47..6db6180 100644 --- a/.config/doom/packages.el +++ b/.config/doom/packages.el @@ -1,89 +1,33 @@ ;; -*- no-byte-compile: t; -*- ;;; $DOOMDIR/packages.el -;; 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) - -;; 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")) - -;; 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"))) - -;; 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")) -;; 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")) - -;; 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) - (unpin! straight) (package! beacon) -(package! wc-mode) -(package! battle-haxe) -(package! typescript-mode) +(package! counsel) (package! deft) + +(package! battle-haxe) +(package! fish-mode) +(package! typescript-mode) +(package! wc-mode) + (package! ivy) (package! ivy-xref) -(package! counsel) -(package! fish-mode) - - - -;;Org-mode extensions (package! org-contacts) (package! org-download) (package! org-cliplink) (package! org-roam) (package! org-ql) (package! org-wild-notifier) - -;; Elgantt for org-mode -(package! elgantt - :recipe (:host github :repo "legalnonsense/elgantt")) - -;;: Org-depend +(unpin! org-roam) +(package! org-roam-ui) (package! org-depend :recipe ( :host github :repo "fgeller/org-mode" :files ("contrib/lisp/org-depend.el"))) + +(package! elgantt + :recipe (:host github :repo "legalnonsense/elgantt")) diff --git a/.config/fish/README.org b/.config/fish/README.org index 652d068..94eb263 100644 --- a/.config/fish/README.org +++ b/.config/fish/README.org @@ -239,7 +239,7 @@ alias .5='cd ../../../../..' alias vim='nvim' #+end_src ** emacs -Aliases for doom emacs. +Aliases for [[https://github.com/doomemacs/doomemacs][Doom Emacs]]. *** em Opens emacs in the terminal.