many changes to emacs stuff working on org-ql

This commit is contained in:
Tyler Starr 2021-01-11 20:58:10 -08:00
parent 759f9abeda
commit f60c10b444
10 changed files with 183 additions and 122 deletions

View File

@ -2,7 +2,7 @@
# ~/.bashrc # ~/.bashrc
# #
export PATH=$PATH:~/.local/bin #export PATH=$PATH:~/.local/bin
alias lol="sudo sh -c 'sysctl -w abi.vsyscall32=0'" alias lol="sudo sh -c 'sysctl -w abi.vsyscall32=0'"
alias dired="emacsclient -c -nw -a '' --eval '(dired nil)'" alias dired="emacsclient -c -nw -a '' --eval '(dired nil)'"
alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg" alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"

View File

@ -1,5 +1,7 @@
let g:netrw_dirhistmax =10 let g:netrw_dirhistmax =10
let g:netrw_dirhistcnt =3 let g:netrw_dirhistcnt =5
let g:netrw_dirhist_5='/home/tstarr/.doom.d'
let g:netrw_dirhist_4='/home/tstarr/devel/python/.git'
let g:netrw_dirhist_3='/home/tstarr/.ncmpcpp' let g:netrw_dirhist_3='/home/tstarr/.ncmpcpp'
let g:netrw_dirhist_2='/home/tstarr/.config' let g:netrw_dirhist_2='/home/tstarr/.config'
let g:netrw_dirhist_1='/home/tstarr/.config/ncmpcpp' let g:netrw_dirhist_1='/home/tstarr/.config/ncmpcpp'

View File

@ -12,10 +12,10 @@
(setq org-agenda-files (append org-capture org-agenda org-todo)) (setq org-agenda-files (append org-capture org-agenda org-todo))
(setq org-default-notes-file org-note) (setq org-default-notes-file org-note)
(setq org-todo-keywords (setq org-todo-keywords
(quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)") (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)")
(sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|"
"CANCELLED(c@/!)")))) "CANCELLED(c@/!)"))))
(setq org-tag-alist (setq org-tag-alist
'((:startgroup) '((:startgroup)
@ -28,66 +28,66 @@
("habit" . ?h) ("habit" . ?h)
("recurring" . ?r))) ("recurring" . ?r)))
(setq org-capture-todo (concat org-directory "gtd/capture/inbox.org")) (setq org-capture-todo (concat org-directory "gtd/capture/inbox.org"))
(setq org-capture-note (concat org-directory "gtd/capture/note.org")) (setq org-capture-note (concat org-directory "gtd/capture/note.org"))
(setq org-capture-templates (setq org-capture-templates
(doct '(("personal" :keys "p" (doct '(("personal" :keys "p"
:children (("todo" :keys "t" :children (("todo" :keys "t"
:file org-capture-todo :file org-capture-todo
:template ("* TODO %? :@home:" "%U")) :template ("* TODO %? :@home:" "%U"))
("question" :keys "q" ("question" :keys "q"
:file org-capture-todo :file org-capture-todo
:template ("* TODO Find out %? :question:@home:" :template ("* TODO Find out %? :question:@home:"
"%U")) "%U"))
("habit" :keys "h" ("habit" :keys "h"
:file org-capture-todo :file org-capture-todo
:template ("* NEXT %? :habit:@home:" "%U" :template ("* NEXT %? :habit:@home:" "%U"
"SCHEDULED: %(format-time-string "SCHEDULED: %(format-time-string
\"%<<%Y-%m-%d %a .+1d/3d>>\")" \"%<<%Y-%m-%d %a .+1d/3d>>\")"
":PROPERTIES:" ":STYLE: habit" ":PROPERTIES:" ":STYLE: habit"
":REPEAT_TO_STATE: NEXT" ":END:")) ":REPEAT_TO_STATE: NEXT" ":END:"))
("meeting" :keys "m" ("meeting" :keys "m"
:children (("reoccuring" :keys "r" :children (("reoccuring" :keys "r"
:file org-capture-todo :file org-capture-todo
:template ("* NEXT %? :meeting:@home:" :template ("* NEXT %? :meeting:@home:"
"%U" "SCHEDULED: "%U" "SCHEDULED:
%(format-time-string %(format-time-string
\"%<<%Y-%m-%d %a +7d>>\")" \"%<<%Y-%m-%d %a +7d>>\")"
":PROPERTIES:" ":PROPERTIES:"
":REPEAT_TO_STATE: NEXT" ":REPEAT_TO_STATE: NEXT"
":END:")))) ":END:"))))
("note" :keys "n" ("note" :keys "n"
:file org-capture-note :file org-capture-note
:template ("* %? :note:@home:" "%U")))) :template ("* %? :note:@home:" "%U"))))
("work" :keys "w" ("work" :keys "w"
:children (("todo" :keys "t" :children (("todo" :keys "t"
:file org-capture-todo :file org-capture-todo
:template ("* TODO %? :@work:" "%U")) :template ("* TODO %? :@work:" "%U"))
("question" :keys "q" ("question" :keys "q"
:file org-capture-todo :file org-capture-todo
:template ("* TODO Find out %? :question:@work:" :template ("* TODO Find out %? :question:@work:"
"%U")) "%U"))
("habit" :keys "h" ("habit" :keys "h"
:file org-capture-todo :file org-capture-todo
:template ("* NEXT %? :habit:@work:" "%U" :template ("* NEXT %? :habit:@work:" "%U"
"SCHEDULED: %(format-time-string "SCHEDULED: %(format-time-string
\"%<<%Y-%m-%d %a .+1d/3d>>\")" \"%<<%Y-%m-%d %a .+1d/3d>>\")"
":PROPERTIES:" ":STYLE: habit" ":PROPERTIES:" ":STYLE: habit"
":REPEAT_TO_STATE: NEXT" ":END:")) ":REPEAT_TO_STATE: NEXT" ":END:"))
("meeting" :keys "m" ("meeting" :keys "m"
:children (("reoccuring" :keys "r" :children (("reoccuring" :keys "r"
:file org-capture-todo :file org-capture-todo
:template ("* NEXT %? :meeting:@work:" :template ("* NEXT %? :meeting:@work:"
"%U" "SCHEDULED: "%U" "SCHEDULED:
%(format-time-string %(format-time-string
\"%<<%Y-%m-%d %a +7d>>\")" \"%<<%Y-%m-%d %a +7d>>\")"
":PROPERTIES:" ":PROPERTIES:"
":REPEAT_TO_STATE: NEXT" ":REPEAT_TO_STATE: NEXT"
":END:")))) ":END:"))))
("note" :keys "n" ("note" :keys "n"
:file org-capture-note :file org-capture-note
:template ("* %? :note:@work:" "%U"))))))) :template ("* %? :note:@work:" "%U")))))))
(setq org-refile-targets (quote ((nil :maxlevel . 3) (setq org-refile-targets (quote ((nil :maxlevel . 3)
(org-agenda-files :maxlevel . 3)))) (org-agenda-files :maxlevel . 3))))
@ -96,25 +96,19 @@
(setq org-super-agenda-header-map (make-sparse-keymap)) (setq org-super-agenda-header-map (make-sparse-keymap))
(setq org-agenda-custom-commands (defun ts/org-daily-agenda ()
'(("d" "Daily Agenda" "launch an agenda-like view at the specified date."
((agenda "" ((org-agenda-span 'day) (interactive)
(org-super-agenda-groups (org-ql-search (org-agenda-files)
'((:name "LATE" '(and (or (ts-active :on today)
:face (:underline t) (deadline auto)
:deadline past) (scheduled :to today))
(:name "TODAY" (not (done)))
:time-grid t :title "Daily Agenda"
:scheduled today :super-groups '((:name "Home"
:deadline today) :tag "@home")
(:name "SOON" (:name "Work"
:time-grid t :tag "@work"))))
:scheduled "+7"
:deadline "+7")))))
(todo "" ((org-agenda-overriding-header "")
(org-super-agenda-groups
'((:name "OPEN PROJECTS"
:children t)))))))))
(after! org-agenda (after! org-agenda
(org-super-agenda-mode))) ; Close the after! org expression from (org-super-agenda-mode))) ; Close the after! org expression from

View File

@ -1,13 +0,0 @@
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes
'("d6603a129c32b716b3d3541fc0b6bfe83d0e07f1954ee64517aa62c9405a3441" "e6ff132edb1bfa0645e2ba032c44ce94a3bd3c15e3929cdf6c049802cf059a2a" default)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)

View File

@ -215,7 +215,7 @@ Load modules with external configs.
;;fstar ; (dependent) types and (monadic) effects and Z3 ;;fstar ; (dependent) types and (monadic) effects and Z3
;;gdscript ; the language you waited for ;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect ;;(go +lsp) ; the hipster dialect
;;(haskell +dante) ; a language that's lazier than I am (haskell +dante) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python ;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on ;;idris ; a language you can depend on
;;json ; At least it ain't XML ;;json ; At least it ain't XML
@ -375,7 +375,7 @@ Allowable tags: @work, @home, note, question, habit
:template ("* NEXT %? :meeting:@home:" :template ("* NEXT %? :meeting:@home:"
"%U" "SCHEDULED: "%U" "SCHEDULED:
%(format-time-string %(format-time-string
\"%<<%Y-%m-%d %a +7d>>\")" \"%<<%Y-%m-%d %a +7d>>\")"
":PROPERTIES:" ":PROPERTIES:"
":REPEAT_TO_STATE: NEXT" ":REPEAT_TO_STATE: NEXT"
":END:")))) ":END:"))))
@ -394,7 +394,7 @@ Allowable tags: @work, @home, note, question, habit
:file org-capture-todo :file org-capture-todo
:template ("* NEXT %? :habit:@work:" "%U" :template ("* NEXT %? :habit:@work:" "%U"
"SCHEDULED: %(format-time-string "SCHEDULED: %(format-time-string
\"%<<%Y-%m-%d %a .+1d/3d>>\")" \"%<<%Y-%m-%d %a .+1d/3d>>\")"
":PROPERTIES:" ":STYLE: habit" ":PROPERTIES:" ":STYLE: habit"
":REPEAT_TO_STATE: NEXT" ":END:")) ":REPEAT_TO_STATE: NEXT" ":END:"))
("meeting" :keys "m" ("meeting" :keys "m"
@ -433,28 +433,95 @@ I use the awesome [[https://github.com/alphapapa/org-super-agenda][super-org-age
(setq org-super-agenda-header-map (make-sparse-keymap)) (setq org-super-agenda-header-map (make-sparse-keymap))
(setq org-agenda-custom-commands (defun ts/org-daily-agenda ()
'(("d" "Daily Agenda" "launch an agenda-like view at the specified date."
((agenda "" ((org-agenda-span 'day) (interactive)
(org-super-agenda-groups (org-ql-search (org-agenda-files)
'((:name "LATE" '(and (or (ts-active :on today)
:face (:underline t) (deadline auto)
:deadline past) (scheduled :to today))
(:name "TODAY" (not (done)))
:time-grid t :title "Daily Agenda"
:scheduled today :super-groups '((:name "Home"
:deadline today) :tag "@home")
(:name "SOON" (:name "Work"
:time-grid t :tag "@work"))))
:scheduled "+7"
:deadline "+7")))))
(todo "" ((org-agenda-overriding-header "")
(org-super-agenda-groups
'((:name "OPEN PROJECTS"
:children t)))))))))
(after! org-agenda (after! org-agenda
(org-super-agenda-mode))) ; Close the after! org expression from (org-super-agenda-mode))) ; Close the after! org expression from
; Org File Paths ; Org File Paths
#+End_src #+End_src
* [packages.el]
#+begin_src emacs-lisp :tangle "packages.el"
;; -*- no-byte-compile: t; -*-
;;; $DOOMDIR/packages.el
;; To install a package with Doom you must declare them here and run 'doom sync'
;; on the command line, then restart Emacs for the changes to take effect -- or
;; use 'M-x doom/reload'.
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
;(package! some-package)
;; To install a package directly from a remote git repo, you must specify a
;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
;; https://github.com/raxod502/straight.el#the-recipe-format
;(package! another-package
; :recipe (:host github :repo "username/repo"))
;; 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
;; `:files' in the `:recipe':
;(package! this-package
; :recipe (:host github :repo "username/repo"
; :files ("some-file.el" "src/lisp/*.el")))
;; If you'd like to disable a package included with Doom, you can do so here
;; with the `:disable' property:
;(package! builtin-package :disable t)
;; 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
;; from Doom or MELPA/ELPA/Emacsmirror:
;(package! builtin-package :recipe (:nonrecursive t))
;(package! builtin-package-2 :recipe (:repo "myfork/package"))
;; 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
;; our package manager can't deal with; see raxod502/straight.el#279)
;(package! builtin-package :recipe (:branch "develop"))
;; Use `:pin' to specify a particular commit to install.
;(package! builtin-package :pin "1a2b3c4d5e")
;; Doom's packages are pinned to a specific commit and updated from release to
;; release. The `unpin!' macro allows you to unpin single packages...
;(unpin! pinned-package)
;; ...or multiple packages
;(unpin! pinned-package another-pinned-package)
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;(unpin! t)
(package! doct)
(package! org-ql)
(package! org-super-agenda)
(package! org-super-agenda :recipe
(:host github
:repo "starr-dusT/org-super-agenda"
:branch "master"))
(package! org-ql :recipe
(:host github
:repo "starr-dusT/org-ql"
:branch "master"))
#+end_src

View File

@ -129,7 +129,7 @@
;;fstar ; (dependent) types and (monadic) effects and Z3 ;;fstar ; (dependent) types and (monadic) effects and Z3
;;gdscript ; the language you waited for ;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect ;;(go +lsp) ; the hipster dialect
;;(haskell +dante) ; a language that's lazier than I am (haskell +dante) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python ;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on ;;idris ; a language you can depend on
;;json ; At least it ain't XML ;;json ; At least it ain't XML

View File

@ -50,4 +50,15 @@
;(unpin! t) ;(unpin! t)
(package! doct) (package! doct)
(package! org-ql)
(package! org-super-agenda) (package! org-super-agenda)
(package! org-super-agenda :recipe
(:host github
:repo "starr-dusT/org-super-agenda"
:branch "master"))
(package! org-ql :recipe
(:host github
:repo "starr-dusT/org-ql"
:branch "master"))

View File

@ -1,5 +1,5 @@
# Speed up scrolling for the document viewer # Speed up scrolling for the document viewer
"^firefox$" "^brave-browser$"
None, Up, Button4, 4 None, Up, Button4, 4
None, Down, Button5, 4 None, Down, Button5, 4

View File

@ -200,7 +200,7 @@ myKeys home =
, ("M-v", namedScratchpadAction myScratchPads "scr-mpv") , ("M-v", namedScratchpadAction myScratchPads "scr-mpv")
-- Spawn firefox -- Spawn firefox
, ("M-o f" , spawn "firefox") , ("M-o b" , spawn "brave")
-- Spawn lutris -- Spawn lutris
, ("M-o l" , spawn "lutris") , ("M-o l" , spawn "lutris")
-- Spawn steam -- Spawn steam

View File

@ -325,7 +325,7 @@ myKeys home =
#+begin_src haskell #+begin_src haskell
-- Spawn firefox -- Spawn firefox
, ("M-o f" , spawn "firefox") , ("M-o b" , spawn "brave")
-- Spawn lutris -- Spawn lutris
, ("M-o l" , spawn "lutris") , ("M-o l" , spawn "lutris")
-- Spawn steam -- Spawn steam