exot/.emacs.d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: exot:9b4f15f69a9d0de5a160e4a844ead0f49050ab8d
Branches Tags
exot:master
..
compare: exot:261669323379fd68eb5c5a765acd3bef305a417d
Branches Tags
exot:master

No commits in common. "9b4f15f69a9d0de5a160e4a844ead0f49050ab8d" and "261669323379fd68eb5c5a765acd3bef305a417d" have entirely different histories.
9b4f15f69a ... 2616693233

2 changed files with 15 additions and 28 deletions
Show Stats Expand all files Collapse all files

11
init.el
View File

@ -151,6 +151,7 @@
(add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)
(add-hook 'prog-mode-hook 'page-break-lines-mode)
(add-hook 'text-mode-hook 'page-break-lines-mode)
(add-hook 'prog-mode-hook 'subword-mode)
(add-hook 'prog-mode-hook 'hl-line-mode)
(add-hook 'lisp-mode-hook 'turn-on-lispy-when-available)
@ -2995,7 +2996,6 @@ With given ARG, display files in `db/important-document-path’."
(append '((company-capf company-dabbrev-code))
company-backends))))
(add-hook 'haskell-mode-hook 'flycheck-mode)
(add-hook 'haskle--mode-hook 'subword-mode)
(with-demoted-errors "Non-Fatal Error: %s"
(require 'haskell-indentation)
@ -3020,7 +3020,11 @@ With given ARG, display files in `db/important-document-path’."
:init (setq plantuml-output-type "svg"
plantuml-default-exec-mode 'jar
plantuml-jar-path "/usr/share/plantuml/plantuml.jar"
plantuml-indent-level 2))
plantuml-indent-level 2)
:config (progn
(add-hook 'plantuml-mode-hook
#'(lambda ()
(subword-mode -1)))))
(use-package python
:config (progn
@ -3029,8 +3033,7 @@ With given ARG, display files in `db/important-document-path’."
(add-hook 'python-mode-hook #'highlight-indentation-mode)
(add-hook 'python-mode-hook #'company-mode)
(add-hook 'python-mode-hook #'lsp-deferred)
(add-hook 'python-mode-hook #'subword-mode)))
(add-hook 'python-mode-hook #'lsp-deferred)))
;; https://ddavis.io/posts/emacs-python-lsp/
(use-package pyvenv

32
site-lisp/db-org.el
View File

@ -9,7 +9,6 @@
;;; Code:
(require 'subr-x)
(require 'dash)
(require 'cl-lib)
(require 'org)
(require 'org-agenda)
@ -395,26 +394,11 @@ entries.
When ORG-QL-MATCH, an org-ql sexp, is given, filter the list of
tasks in range by this expression. When ORG-QL-MATCH is not
given, default to `(todo)'.
START-DATE and END-DATE must be strings formatted such that
`org-read-date' can parse a date from them. In particular,
everything understood by `parse-time-string' should be fine.
When START-DATE or END-DATE (or both) are nil, no constraints are
imposed on the respective time range."
(unless (or (null start-date)
(stringp start-date))
(user-error "START-DATE must be nil or a string, but it's %s" start-date))
(unless (or (null end-date)
(stringp end-date))
(user-error "END-DATE must be nil or a string, but it's %s" end-date))
(let* ((start-date-expr (--when-let (and start-date (org-read-date nil nil start-date))
(list :from it)))
(end-date-expr (--when-let (and end-date (org-read-date nil nil end-date))
(list :to it)))
given, default to `(todo)'."
(let* (;; Allow Org syntax for dates; the result should be understandable by
;; `parse-time-string' and thus `org-ql-query' should be fine with that.
(start-date (org-read-date nil nil start-date))
(end-date (org-read-date nil nil end-date))
(tasks (org-ql-query
:from (org-agenda-files)
:select '(cons
@ -422,9 +406,9 @@ imposed on the respective time range."
(org-entry-get (point) "Effort"))
:where `(and ,(or org-ql-match '(todo))
;; Is this redundant? Could we just stick with `ts-active'?
(or (scheduled ,@start-date-expr ,@end-date-expr)
(deadline ,@start-date-expr ,@end-date-expr)
(ts-active ,@start-date-expr ,@end-date-expr)))))
(or (scheduled :from ,start-date :to ,end-date)
(deadline :from ,start-date :to ,end-date)
(ts-active :from ,start-date :to ,end-date)))))
(total-time (->> tasks
(-map #'(lambda (task)
(let ((effort (cdr task)))