jakalx/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emacs: Merge dregil and thrall's config files

Browse source
This commit is contained in:
Alexander Kobjolke 2024-02-03 22:33:45 +01:00
parent 16fcc510f6
commit 96b07843d2
3 changed files with 60 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

98
home/alex/programs/emacs/doom/config.el
View file

@ -37,7 +37,7 @@
;; do not create a new workspace for each emacsclient ;; do not create a new workspace for each emacsclient
(after! persp-mode (after! persp-mode
  (setq persp-emacsclient-init-frame-behaviour-override "main"))   (setq persp-emacsclient-init-frame-behaviour-override "main"))
(defun my/org-id-update-org-roam-files () (defun my/org-id-update-org-roam-files ()
"Update Org-ID locations for all Org-roam files." "Update Org-ID locations for all Org-roam files."
@ -79,18 +79,14 @@
(setq doom-localleader-alt-key "M-,") (setq doom-localleader-alt-key "M-,")
(use-package! org (use-package! org
:config :config (setq org-log-into-drawer t
(setq org-log-into-drawer t org-todo-keywords '(
org-tags-column -58 (sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
org-todo-keywords '( (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
(sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") )))
(sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
))
(require 'org-attach-git)
)
(setq ak/bibliography (list (concat org-directory "references.bib"))) (setq ak/bibliography (list (concat org-directory "references.bib")))
;(setq org-cite-global-bibliography (list (concat org-directory "references.bib"))) ;(setq org-cite-global-bibliography (list (concat org-directory "references.bib")))
(setq! bibtex-completion-bibliography ak/bibliography) (setq! bibtex-completion-bibliography ak/bibliography)
(setq! citar-bibliography ak/bibliography) (setq! citar-bibliography ak/bibliography)
@ -128,61 +124,43 @@
;; Org GTD support ;; Org GTD support
(use-package! org-gtd (use-package! org-gtd
:after org :after org
:demand t :demand t
:config :config
(setq org-gtd-directory "~/org") (setq org-gtd-directory "~/org")
(setq org-gtd-default-file-name "actionable") (setq org-gtd-default-file-name "actionable")
(setq org-edna-use-inheritance t) (setq org-edna-use-inheritance t)
;(setq org-gtd-areas-of-focus '("house" "haskell" "foss")) ;(setq org-gtd-areas-of-focus '("house" "haskell" "foss"))
;(setq org-gtd-organize-hooks '(org-gtd-set-area-of-focus org-set-tags-command)) ;(setq org-gtd-organize-hooks '(org-gtd-set-area-of-focus org-set-tags-command))
(org-edna-mode) (org-edna-mode)
(map! :leader (map! :leader
:desc "Capture" "X" #'org-gtd-capture :desc "Capture" "X" #'org-gtd-capture
(:prefix ("d" . "org-gtd") (:prefix ("d" . "org-gtd")
:desc "Capture" "c" #'org-gtd-capture :desc "Capture" "c" #'org-gtd-capture
:desc "Engage" "e" #'org-gtd-engage-grouped-by-context :desc "Engage" "e" #'org-gtd-engage-grouped-by-context
:desc "Process inbox" "p" #'org-gtd-process-inbox :desc "Process inbox" "p" #'org-gtd-process-inbox
:desc "Show all next" "n" #'org-gtd-show-all-next :desc "Show all next" "n" #'org-gtd-show-all-next
(:prefix ("r" . "Review") (:prefix ("r" . "Review")
:desc "Stuck projects" "p" #'org-gtd-review-stuck-projects :desc "Stuck projects" "p" #'org-gtd-review-stuck-projects
:desc "Stuck actions" "a" #'org-gtd-review-stuck-single-action-items :desc "Stuck actions" "a" #'org-gtd-review-stuck-single-action-items
:desc "Stuck habits" "h" #'org-gtd-review-stuck-habit-items :desc "Stuck habits" "h" #'org-gtd-review-stuck-habit-items
) )
)) ))
(map! :map org-gtd-clarify-map (map! :map org-gtd-clarify-map
:desc "Organize this item" "C-c C-c" #'org-gtd-organize) :desc "Organize this item" "C-c C-c" #'org-gtd-organize)
:bind :bind
(("C-c d c" . #'org-gtd-capture) (("C-c d c" . #'org-gtd-capture)
("C-c d e" . #'org-gtd-engage-grouped-by-context) ("C-c d e" . #'org-gtd-engage-grouped-by-context)
("C-c d p" . #'org-gtd-process-inbox) ("C-c d p" . #'org-gtd-process-inbox)
("C-c d n" . #'org-gtd-show-all-next) ("C-c d n" . #'org-gtd-show-all-next)
("C-c d r p" . #'org-gtd-review-stuck-projects)) ("C-c d r p" . #'org-gtd-review-stuck-projects))
) )
(use-package! org-review
:after org
:demand t)
;; (setq org-agenda-custom-commands
;; '(("R" "Review projects" tags-todo "-CANCELLED/"
;; ((org-agenda-overriding-header "Reviews Scheduled")
;; (org-agenda-skip-function 'org-review-agenda-skip)
;; (org-agenda-cmp-user-defined 'org-review-compare)
;; (org-agenda-sorting-strategy '(user-defined-down))))))
;;
;; (add-hook 'org-agenda-mode-hook
;; (lambda ()
;; (local-set-key (kbd "C-c C-r")
;; 'org-review-insert-last-review)))
(defun ak/org-roam-node-insert-immediate (arg &rest args) (defun ak/org-roam-node-insert-immediate (arg &rest args)
(interactive "P") (interactive "P")
(let ((args (cons arg args)) (let ((args (cons arg args))
(org-roam-capture-templates (list (append (car org-capture-templates) '(:immediate-finish t)))) (org-roam-capture-templates (list (append (car org-capture-templates) '(:immediate-finish t))))
) )
(apply #'org-roam-node-insert args))) (apply #'org-roam-node-insert args)))
(use-package! org-habit (use-package! org-habit

7
home/alex/programs/emacs/doom/init.el
View file

@ -27,7 +27,7 @@
(vertico +icons) ; the search engine of the future (vertico +icons) ; the search engine of the future
:ui :ui
;deft ; notational velocity for Emacs ;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs 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
@ -35,7 +35,7 @@
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
;;hydra ;;hydra
;;indent-guides ; highlighted indent columns ;;indent-guides ; highlighted indent columns
;(ligatures +extra) ; ligatures and symbols to make your code pretty again ;(ligatures +extra) ; ligatures and symbols to make your code pretty again
;;minimap ; show a map of the code on the side ;;minimap ; show a map of the code on the side
modeline ; snazzy, Atom-inspired modeline, plus API modeline ; snazzy, Atom-inspired modeline, plus API
nav-flash ; blink cursor line after big motions nav-flash ; blink cursor line after big motions
@ -66,7 +66,7 @@
word-wrap ; soft wrapping with language-aware indent word-wrap ; soft wrapping with language-aware indent
:emacs :emacs
(dired +ranger +icons) ; making dired pretty [functional] (dired +dirvish +icons) ; making dired pretty [functional]
electric ; smarter, keyword-based electric-indent electric ; smarter, keyword-based electric-indent
(ibuffer +icons) ; interactive buffer management (ibuffer +icons) ; interactive buffer management
undo ; persistent, smarter undo for your inevitable mistakes undo ; persistent, smarter undo for your inevitable mistakes
@ -150,7 +150,6 @@
markdown ; writing docs for people to ignore markdown ; writing docs for people to ignore
;;nim ; python + lisp at the speed of c ;;nim ; python + lisp at the speed of c
nix ; I hereby declare "nix geht mehr!" nix ; I hereby declare "nix geht mehr!"
;; A
;;ocaml ; an objective camel ;;ocaml ; an objective camel
(org +roam2 +pandoc +present +gnuplot +noter) ; organize your plain life in plain text (org +roam2 +pandoc +present +gnuplot +noter) ; organize your plain life in plain text
;;php ; perl's insecure younger brother ;;php ; perl's insecure younger brother

38
home/alex/programs/emacs/doom/packages.el
View file

@ -7,57 +7,57 @@
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
;(package! some-package) ;(package! some-package)
;; To install a package directly from a remote git repo, you must specify a ;; To install a package directly from a remote git repo, you must specify a
;; `:recipe'. You'll find documentation on what `:recipe' accepts here: ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
;; https://github.com/raxod502/straight.el#the-recipe-format ;; https://github.com/raxod502/straight.el#the-recipe-format
;(package! another-package ;(package! another-package
; :recipe (:host github :repo "username/repo")) ; :recipe (:host github :repo "username/repo"))
;; If the package you are trying to install does not contain a PACKAGENAME.el ;; 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 ;; file, or is located in a subdirectory of the repo, you'll need to specify
;; `:files' in the `:recipe': ;; `:files' in the `:recipe':
;(package! this-package ;(package! this-package
; :recipe (:host github :repo "username/repo" ; :recipe (:host github :repo "username/repo"
; :files ("some-file.el" "src/lisp/*.el"))) ; :files ("some-file.el" "src/lisp/*.el")))
;; If you'd like to disable a package included with Doom, you can do so here ;; If you'd like to disable a package included with Doom, you can do so here
;; with the `:disable' property: ;; with the `:disable' property:
;(package! builtin-package :disable t) ;(package! builtin-package :disable t)
;; You can override the recipe of a built in package without having to specify ;; 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 ;; all the properties for `:recipe'. These will inherit the rest of its recipe
;; from Doom or MELPA/ELPA/Emacsmirror: ;; from Doom or MELPA/ELPA/Emacsmirror:
;(package! builtin-package :recipe (:nonrecursive t)) ;(package! builtin-package :recipe (:nonrecursive t))
;(package! builtin-package-2 :recipe (:repo "myfork/package")) ;(package! builtin-package-2 :recipe (:repo "myfork/package"))
;; Specify a `:branch' to install a package from a particular branch or tag. ;; 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 ;; 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) ;; 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. ;; Use `:pin' to specify a particular commit to install.
;(package! builtin-package :pin "1a2b3c4d5e") ;(package! builtin-package :pin "1a2b3c4d5e")
;; Doom's packages are pinned to a specific commit and updated from release to ;; Doom's packages are pinned to a specific commit and updated from release to
;; release. The `unpin!' macro allows you to unpin single packages... ;; release. The `unpin!' macro allows you to unpin single packages...
;(unpin! pinned-package) ;(unpin! pinned-package)
;; ...or multiple packages ;; ...or multiple packages
;(unpin! pinned-package another-pinned-package) ;(unpin! pinned-package another-pinned-package)
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;(unpin! t) ;(unpin! t)
;(package! this-package ;(package! this-package
; :recipe (:host github :repo "username/repo" ; :recipe (:host github :repo "username/repo"
; :files ("some-file.el" "src/lisp/*.el"))) ; :files ("some-file.el" "src/lisp/*.el")))
(package! ormolu) (package! ormolu)
(package! org-gtd (package! org-gtd
:recipe (:host github :repo "Trevoke/org-gtd.el" :branch "master")) :recipe (:host github :repo "Trevoke/org-gtd.el" :branch "master"))
(package! org-fc (package! org-fc
:recipe (:host sourcehut :repo "l3kn/org-fc" :branch "main")) :recipe (:host sourcehut :repo "l3kn/org-fc" :branch "main"))
(package! org-edna) (package! org-edna)
(package! org-review (package! org-review
:recipe (:host github :repo "jakalx/org-review" :branch "master")) :recipe (:host github :repo "jakalx/org-review" :branch "master"))