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

30
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-tags-column -58
org-todo-keywords '( org-todo-keywords '(
(sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") (sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
(sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)") (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)
@ -160,24 +156,6 @@
("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))

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

@ -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

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

@ -7,51 +7,51 @@
;; 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