chore(emacs): Cleanup config

This commit is contained in:
Alexander Kobjolke 2024-04-29 22:33:58 +02:00
parent 2645d5cfe2
commit 77898172f1

View file

@ -3,12 +3,22 @@
;; Place your private configuration here! Remember, you do not need to run 'doom ;; Place your private configuration here! Remember, you do not need to run 'doom
;; sync' after modifying this file! ;; sync' after modifying this file!
(setq ak/at-work? (getenv "AK_AT_WORK"))
;; Some functionality uses this to identify you, e.g. GPG configuration, email ;; Some functionality uses this to identify you, e.g. GPG configuration, email
;; clients, file templates and snippets. ;; clients, file templates and snippets.
(setq user-full-name "Alexander Kobjolke" (setq user-full-name "Alexander Kobjolke"
user-mail-address "me@failco.de") user-mail-address "me@failco.de")
(when ak/at-work?
(setq user-mail-address "alexander.kobjolke@atlas-elektronik.com")
(add-to-list 'lsp-disabled-clients 'cmakels)
;; exclude cmake from formatting on save
(add-to-list '+format-on-save-disabled-modes
'cmake-mode))
;; Doom exposes five (optional) variables for controlling fonts in Doom. Here ;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
;; are the three important ones: ;; are the three important ones:
;; ;;
@ -33,23 +43,13 @@
;; If you use `org' and don't want your org files in the default location below, ;; 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! ;; change `org-directory'. It must be set before org loads!
(setq org-directory "~/org/" (setq org-directory "~/org/"
org-log-into-drawer t org-log-into-drawer t)
org-roam-directory (file-truename "~/org/notes"))
;; 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"))
;; exclude cmake from formatting on save
(add-to-list '+format-on-save-disabled-modes
'cmake-mode)
(defun my/org-id-update-org-roam-files ()
"Update Org-ID locations for all Org-roam files."
(interactive)
(org-id-update-id-locations (org-roam-list-files)))
(defun my/org-id-update-id-current-file () (defun my/org-id-update-id-current-file ()
"Scan the current buffer for Org-ID locations and update them." "Scan the current buffer for Org-ID locations and update them."
(interactive) (interactive)
@ -77,11 +77,9 @@
(interactive) (interactive)
(scroll-up 1)))) (scroll-up 1))))
;; disable highlight lines
;(remove-hook 'doom-first-buffer-hook #'global-hl-line-mode)
(setq haskell-process-type 'cabal-new-repl) (setq haskell-process-type 'cabal-new-repl)
(add-hook! 'org-mode-hook #'+org-init-keybinds-h)
(setq evil-snipe-override-evil-repeat-keys nil) (setq evil-snipe-override-evil-repeat-keys nil)
(setq doom-localleader-key ",") (setq doom-localleader-key ",")
(setq doom-localleader-alt-key "M-,") (setq doom-localleader-alt-key "M-,")
@ -122,31 +120,46 @@
(use-package! elfeed-web) (use-package! elfeed-web)
(when ak/at-work?
(use-package! forge
:config
(add-to-list 'forge-alist '("gitlab.atlas.de" "gitlab.atlas.de/api/v4" "gitlab.atlas.de" forge-gitlab-repository))
)
(use-package! code-review
:config
(setq code-review-auth-login-marker 'forge)
;; (setq code-review-gitlab-host "gitlab.atlas.de/api")
;; (setq code-review-gitlab-graphql-host "gitlab.atlas.de/api")
(add-hook 'code-review-mode-hook
(lambda ()
;; include *Code-Review* buffer into current workspace
(persp-add-buffer (current-buffer))))))
(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)
;; Use an ISO date format for ledger entries (use-package! ledger
(setq ledger-default-date-format "%Y-%m-%d" :config
ledger-binary-path "hledger" (setq
ledger-report-auto-width nil ;; Use an ISO date format for ledger entries
ledger-mode-should-check-version nil ledger-default-date-format "%Y-%m-%d"
ledger-init-file-name " " ledger-binary-path "hledger"
ledger-post-amount-alignment-column 58 ledger-report-auto-width nil
ledger-report-native-highlighting-arguments '("--color=always") ledger-mode-should-check-version nil
ledger-highlight-xact-under-point t) ledger-init-file-name " "
ledger-post-amount-alignment-column 58
ledger-report-native-highlighting-arguments '("--color=always")
ledger-highlight-xact-under-point t)
(setq ledger-reports (setq ledger-reports
'(("bal" "%(binary) -f %(ledger-file) bal -B") '(("bal" "%(binary) -f %(ledger-file) bal -B")
("reg" "%(binary) -f %(ledger-file) reg -B") ("reg" "%(binary) -f %(ledger-file) reg -B")
("payee" "%(binary) -f %(ledger-file) reg -B @%(payee)") ("payee" "%(binary) -f %(ledger-file) reg -B @%(payee)")
("account" "%(binary) -f %(ledger-file) reg -B %(account)"))) ("account" "%(binary) -f %(ledger-file) reg -B %(account)"))) )
;; (use-package! ormolu
;; :hook (haskell-mode . ormolu-format-on-save-mode)
;; :bind
;; (:map haskell-mode-map
(after! lsp-haskell (after! lsp-haskell
(setq lsp-haskell-formatting-provider "fourmolu") (setq lsp-haskell-formatting-provider "fourmolu")
@ -169,7 +182,7 @@
;; tweak some VI defaults ;; tweak some VI defaults
(after! evil (after! evil
(setq evil-ex-substitute-global t ; I like my s/../.. to by global by default (setq evil-ex-substitute-global t ; I like my s/../.. to be global by default
evil-move-cursor-back nil ; Don't move the block cursor when toggling insert mode evil-move-cursor-back nil ; Don't move the block cursor when toggling insert mode
evil-kill-on-visual-paste nil)) ; Don't put overwritten text in the kill ring evil-kill-on-visual-paste nil)) ; Don't put overwritten text in the kill ring
@ -180,11 +193,11 @@
:after org :after org
:demand t :demand t
:config :config
(setq org-gtd-directory "~/org") (setq org-gtd-directory org-directory)
(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
@ -211,33 +224,18 @@
: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))))
(defun ak/org-roam-node-insert-immediate (arg &rest args)
(interactive "P")
(let ((args (cons arg args))
(org-roam-capture-templates (list (append (car org-capture-templates) '(:immediate-finish t))))
)
(apply #'org-roam-node-insert args)))
(use-package! org-habit (use-package! org-habit
:after org :after org
:config (setq org-habit-show-habits t :config (setq org-habit-show-habits t
org-habit-preceding-days 35 org-habit-preceding-days 35
org-habit-following-days 7 org-habit-following-days 7))
)
)
(use-package! org-edna (use-package! org-edna
:after org-gtd :after org-gtd
:init :init
(setq org-edna-use-inheritance t) (setq org-edna-use-inheritance t)
:config :config
(org-edna-mode 1) (org-edna-mode 1))
)
(use-package! emacsql-sqlite3
:custom
(org-roam-database-connector 'sqlite3))
(use-package! nov (use-package! nov
:mode ("\\.epub\\'" . nov-mode) :mode ("\\.epub\\'" . nov-mode)
@ -293,7 +291,7 @@
(:name "Waiting for..." (:name "Waiting for..."
:todo "WAIT" :todo "WAIT"
:order 1) :order 1)
(:discard (:not (:todo ("NEXT" "START")))) (:discard (:not (:todo ("NEXT" "STRT"))))
(:name "Next actions" (:name "Next actions"
:auto-parent (:todo ("NEXT" "STRT")) :auto-parent (:todo ("NEXT" "STRT"))
:order 2 :order 2
@ -310,6 +308,7 @@
:after org :after org
:init :init
(setq org-fc-directories (concat org-directory "/cards")) (setq org-fc-directories (concat org-directory "/cards"))
(setq org-fc-source-path (concat straight-base-dir "repos/org-fc"))
) )
(use-package! vterm (use-package! vterm