emacs: Merge dregil and thrall's config files

home/alex/programs/emacs/doom/config.el

@@ -79,15 +79,11 @@
 (setq doom-localleader-alt-key "M-,")
 
 (use-package! org
-  :config
-  (setq org-log-into-drawer t
-        org-tags-column -58
+  :config (setq org-log-into-drawer t
                 org-todo-keywords '(
                   (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 org-cite-global-bibliography (list (concat org-directory "references.bib")))
@@ -160,24 +156,6 @@
   ("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)
   (interactive "P")
   (let ((args (cons arg args))

home/alex/programs/emacs/doom/init.el

@@ -66,7 +66,7 @@
        word-wrap         ; soft wrapping with language-aware indent
 
        :emacs
-       (dired +ranger +icons)             ; making dired pretty [functional]
+       (dired +dirvish +icons)             ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
        (ibuffer +icons)         ; interactive buffer management
        undo              ; persistent, smarter undo for your inevitable mistakes
@@ -150,7 +150,6 @@
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        nix               ; I hereby declare "nix geht mehr!"
-       ;; A
        ;;ocaml             ; an objective camel
        (org +roam2 +pandoc +present +gnuplot +noter)               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother