config/doom: update package init

2022-09-22 09:57:37 +02:00 · 2022-09-22 09:57:37 +02:00 · 48df706c70
parent bee6b4cd5d
commit 48df706c70
4 changed files with 37 additions and 18 deletions
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@ -85,7 +85,7 @@ Version 2019-11-04 2021-02-16"
 (defun xf/org-journal-current ()
  (interactive)
  (org-journal-open-current-journal-file)
-  (end-of-buffer)
+  (goto-char (point-max))
  )

 ;; rebing C-u - https://emacs.stackexchange.com/a/58320
@ -94,6 +94,8 @@ Version 2019-11-04 2021-02-16"
 (global-set-key (kbd "C-*") 'universal-argument)
 (define-key universal-argument-map (kbd "C-*") 'universal-argument-more)

+; TODO map C-c C-c to save and quit if unmapped
+
 ;; https://emacs.stackexchange.com/questions/21335/prevent-folding-org-files-opened-by-ediff
 (with-eval-after-load 'outline
  (add-hook 'ediff-prepare-buffer-hook 'outline-show-all))
@ -106,6 +108,7 @@ Version 2019-11-04 2021-02-16"
      "C-="     'doom/reset-font-size
      "C-+"     'doom/increase-font-size
      "C--"     'doom/decrease-font-size
+      "C-u"     'evil-scroll-up
      :leader
      "u"       'evil-prev-buffer
      "i"       'evil-next-buffer
@ -114,6 +117,7 @@ Version 2019-11-04 2021-02-16"
      "#"       'xah/open-in-external-app
      "-"       'evil-quick-diff
      "_"       'ediff
+      "wO"      'delete-other-windows
      "os"      'eshell
      "oj"      'xf/org-journal-current
      "njo"     'xf/org-journal-current
@ -322,9 +326,6 @@ Version 2019-11-04 2021-02-16"
  (setq org-startup-folded 'show2levels
        org-display-remote-inline-images 'cache)

-  (add-variable-watcher 'org-display-custom-times (lambda (symbol val op wh) (cl-flet ((wrapper (if val (-cut concat "<" <> ">") 'identity))) (setq org-time-stamp-custom-formats `(,(wrapper "%d.%m.%Y %a") . ,(wrapper "%d.%m.%Y %a %H:%M"))))))
-  (setq org-display-custom-times 't)
-
  ; TODO customize org-log-note-headings

  ;; Automated logging for todos - https://stackoverflow.com/questions/12262220/add-created-date-property-to-todos-in-org-mode/52815573#52815573
@ -435,6 +436,13 @@ Version 2019-11-04 2021-02-16"
                      (org-agenda-overriding-header "ALL normal priority tasks:"))))
           ((org-agenda-compact-blocks t)))))

+  (use-package! dash
+    :defer t
+    :config
+    (add-variable-watcher 'org-display-custom-times (lambda (symbol val op wh) (cl-flet ((wrapper (if val (-cut concat "<" <> ">") 'identity))) (setq org-time-stamp-custom-formats `(,(wrapper "%d.%m.%Y %a") . ,(wrapper "%d.%m.%Y %a %H:%M"))))))
+    (setq org-display-custom-times 't)
+    )
+
 )

 (after! org-fancy-priorities
@ -866,6 +874,12 @@ Version 2019-11-04 2021-02-16"
      )
  )

+(use-package vc-fossil
+  ;; Keep from loading unnecessarily at startup.
+  :defer t
+  ;; This allows VC to load vc-fossil when needed.
+  :init (add-to-list 'vc-handled-backends 'Fossil))
+
 (use-package! chordpro-mode
  :mode "\\.cho"
  :config
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@ -85,7 +85,7 @@
       :tools
       ;;ansible
       ;;debugger          ; FIXME stepping through code, to help you add bugs
-       ;;direnv
+       direnv
       ;;docker
       editorconfig      ; let someone else argue about tabs vs spaces
       ;;ein             ; tame Jupyter notebooks with emacs
@ -118,7 +118,7 @@
       ;;csharp            ; unity, .NET, and mono shenanigans
       ;;data              ; config/data formats
       ;;(dart +flutter)   ; paint ui and not much else
-       ;;elixir            ; erlang done right
+       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
@ -127,7 +127,7 @@
       ;;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
+       (go +lsp)         ; the hipster dialect
       (haskell +lsp)      ; a language that's lazier than I am
       ;;hy                ; readability of scheme w/ speed of python
       ;;idris             ;
@ -140,13 +140,13 @@
       ;;lean
       ;;factor
       ;;ledger            ; an accounting system in Emacs
-       lua               ; one-based indices? one-based indices
+       ;;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!"
+       ;;nix               ; I hereby declare "nix geht mehr!"
       ;;ocaml             ; an objective camel
       (org +pretty +dragndrop +journal +roam2 +pomodoro +noter +present +pandoc) ; organize your plain life in plain text
-       php               ; perl's insecure younger brother
+       ;;php               ; perl's insecure younger brother
       plantuml          ; diagrams for confusing people more
       ;;purescript        ; javascript, but functional
       ;;python            ; beautiful is better than ugly
@ -155,7 +155,7 @@
       ;;raku              ; the artist formerly known as perl6
       ;;rest              ; Emacs as a REST client
       rst               ; ReST in peace
-       (ruby +rails +lsp +tree-sitter +rbenv)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       (ruby +rails +tree-sitter +rbenv) ; +lsp      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
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@ -49,22 +49,27 @@
 (package! kill-or-bury-alive) ; https://github.com/mrkkrp/kill-or-bury-alive
 (package! recompile-on-save)

+(package! vc-fossil)
+
 ;;; Prettification
 (package! dired+)
 (package! xterm-color)

 ;;; ORG
-(package! ox-context
-  :recipe (:host github :repo "Jason-S-Ross/ox-context" :branch "develop"))
-(package! ox-bb
-  :recipe (:host github :repo "mmitch/ox-bb"))
+(unpin! org-journal)
 (package! org-journal
-  :recipe (:host github :repo "xeruf/org-journal"))
+  :recipe (:host github :repo "toemacs/org-journal")
+  )

 (package! websocket)
 (package! org-roam-ui
  :recipe (:host github :repo "org-roam/org-roam-ui" :files ("*.el" "out")))

+(package! ox-context
+  :recipe (:host github :repo "Jason-S-Ross/ox-context" :branch "develop"))
+(package! ox-bb
+  :recipe (:host github :repo "mmitch/ox-bb"))
+
 ;;; Editing

 (package! evil-tutor) ; dark vim tutor
@ -91,8 +96,6 @@
 (package! pkgbuild-mode) ; AUR PKGBUILDs
 (package! adoc-mode) ; Asciidoc, a md alternative

-(package! direnv) ; directory-local environment for haskell-nix things
-
 (package! chordpro-mode
  :recipe (:host github :repo "toemacs/chordpro-mode")) ; chord sheets

--- a/.config/doom/user.el##user.janek
+++ b/.config/doom/user.el##user.janek
@ -5,6 +5,8 @@
 (setq user-full-name "Janek"
      user-mail-address "27jf@pm.me")

+(setq git-commit-summary-max-length 70)
+
 (let ((box (expand-file-name "2-box/" user-data-dir)))
  (if (file-exists-p box)
      (setq org-directory box