Compare commits

...

6 Commits

5 changed files with 111 additions and 92 deletions

View File

@ -2,11 +2,11 @@
"nodes": {
"emacs-overlay": {
"locked": {
"lastModified": 1637515331,
"narHash": "sha256-fLfycI+PrBeRaP8CRdlxj3Kkqib+YlPdQIFCUAoj56w=",
"lastModified": 1638120343,
"narHash": "sha256-c6BIJXvB2aPuLpKg5pVjNKL0e7ow/X5262xGr3Bv3sg=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "86ceb863bc9cca9150666acce49ee2fe50e73cb0",
"rev": "61086e380b33e3104c556a02533f03808d0d81ff",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
]
},
"locked": {
"lastModified": 1637516270,
"narHash": "sha256-qTffAQ0kWA2qXMJUVMDsgXVbzMNI0BfR78vB/4QFA+o=",
"lastModified": 1638130066,
"narHash": "sha256-BdrVURx4wUUagLbXJXnJ816Xl2IicDp12Sw6OKZn4ug=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "15ae861e1bfad90e0d14106551544e9e07cbcb10",
"rev": "3ec7f6fb43ff77cff429aba1a2541d28cc44d37c",
"type": "github"
},
"original": {
@ -37,11 +37,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1637155076,
"narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=",
"lastModified": 1637841632,
"narHash": "sha256-QYqiKHdda0EOnLGQCHE+GluD/Lq2EJj4hVTooPM55Ic=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2",
"rev": "73369f8d0864854d1acfa7f1e6217f7d6b6e3fa1",
"type": "github"
},
"original": {
@ -52,11 +52,11 @@
},
"nur": {
"locked": {
"lastModified": 1637526496,
"narHash": "sha256-kutOuCotz6YJlFJKbkLD22Z8eHjvVh0Z4llnBBMZbQE=",
"lastModified": 1638130652,
"narHash": "sha256-KWzH0WfKPvIWaZevZS4s9VAw+Oml4kBKwlKzXnVTMMQ=",
"owner": "nix-community",
"repo": "NUR",
"rev": "801de698dcd0f84a4498683254294562c1a5d5cb",
"rev": "3d36428144905febd610c2828fbe8564ae59ccbe",
"type": "github"
},
"original": {

View File

@ -94,6 +94,7 @@ in {
graphviz
zotero
bibtool
biber
R
gcc_latest
@ -117,6 +118,9 @@ in {
cabal-install
hlint
lazygit
lazydocker
virt-manager
virt-viewer
];
@ -266,7 +270,7 @@ in {
programs.texlive = {
enable = true;
extraPackages = tpkgs: {
inherit (tpkgs) scheme-medium wrapfig capt-of multirow;
inherit (tpkgs) scheme-medium collection-latexextra biblatex;
};
};

View File

@ -293,7 +293,7 @@ The environment variable ~SSH_AUTH_SOCK~ needs to be set for git to work within
(setq org-refile-targets `((,jc/agenda-files-all . (:maxlevel . 3))
(,jc/spark-file . (:maxlevel . 2))
(nil . (:maxlevel . 3)))
org-refile-use-outline-path nil))
org-refile-use-outline-path t))
#+end_src
** Capture
@ -583,81 +583,92 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
#+begin_src emacs-lisp
(setq org-ql-views
`(("Working: Contexts"
:title "Tasks by context"
:buffers-files org-agenda-files
:query (and (not (or (done) (todo "ONHOLD" "WAITING" "DELEGATED")) )
(not (scheduled :from tomorrow))
(tags "email" "phone" "online"))
:sort todo
:super-groups ((:auto-tags t)))
("Working: Kanban"
:title "Kanban"
:buffers-files org-agenda-files
:query (and (todo "DOING" "HOT" "WARM" "COOL" "TODO" "WAITING")
(not (or (scheduled :from tomorrow)
(property "Project" "t")
(children))))
:super-groups org-super-agenda-groups)
("Working: Focus"
:title "Focus"
:buffers-files org-agenda-files
:query (and (todo "DOING" "HOT")
(not (or (scheduled :from tomorrow)
(property "Project" "t")
(children))))
:super-groups org-super-agenda-groups)
("Working: People agendas"
:title "Agendas"
:buffers-files org-agenda-files
:query (and (todo "DELEGATED" "WAITING" "DISCUSS")
(tags "BlaM" "BluM" "RK"))
:super-groups ((:auto-tags t)))
("Process: Inbox"
:buffers-files ,(f-expand "Todo/inbox.org" jc/notes-dir))
("Review: Recently closed"
:title "Closed in the last 2 weeks"
:buffers-files ,(list jc/agenda-file-work jc/agenda-file-work-archive)
:query (closed :from -14)
:super-groups ((:auto-ts t)))
("Review: Projects"
:buffers-files org-agenda-files
:query (and (todo)
(or (tags "project")
(children)))
:super-groups ((:name "Progressing"
:order 15
:children ("TODO" "COOL" "WARM" "HOT" "DOING"))
(:name "Discussion needed"
:order 4
:children ("DISCUSS"))
(:name "Waiting"
:order 10
:children ("WAITING" "DELEGATED"))
(:name "On hold"
:order 10
:children ("ONHOLD"))
(:name "Stalled"
:order 0
:anything t)))
("Review: Strategic areas"
:buffers-files org-agenda-files
:query (property "Track")
:super-groups ((:name "Progressing"
:order 5
:children ("TODO" "COOL" "WARM" "HOT" "DOING"))
(:name "Discussion needed"
:order 4
:children ("DISCUSS"))
(:name "Waiting"
:order 10
:children ("WAITING" "DELEGATED"))
(:name "On hold"
:order 10
:children ("ONHOLD"))
(:name "Stalled"
:order 0
:anything t)))))
(let ((kanban-query '(and (todo "DOING" "HOT" "WARM" "COOL" "TODO" "WAITING")
(not (or (scheduled :from tomorrow)
(property "Project" "t")
(children))))))
`(("Working: Contexts"
:title "Tasks by context"
:buffers-files org-agenda-files
:query (and (not (or (done) (todo "ONHOLD" "WAITING" "DELEGATED")) )
(not (scheduled :from tomorrow))
(tags "email" "phone" "online"))
:sort todo
:super-groups ((:auto-tags t)))
("Kanban: work"
:title "Kanban: work"
:buffers-files (,jc/agenda-file-work)
:query ,kanban-query
:super-groups org-super-agenda-groups)
("Kanban: home"
:title "Kanban: home"
:buffers-files (,jc/agenda-file-home)
:query ,kanban-query
:super-groups org-super-agenda-groups)
("Focus: work"
:title "Focus"
:buffers-files (,jc/agenda-file-work)
:query (and (todo "DOING" "HOT")
(not (or (scheduled :from tomorrow)
(property "Project" "t")
(children))))
:super-groups org-super-agenda-groups)
("Working: People agendas"
:title "Agendas"
:buffers-files (,jc/agenda-file-work)
:query (and (todo "DELEGATED" "WAITING" "DISCUSS")
(tags "BlaM" "BluM" "RK"))
:super-groups ((:auto-tags t)))
("Process: Inbox"
:buffers-files ,(f-expand "Todo/inbox.org" jc/notes-dir))
("Review: Recently closed"
:title "Closed in the last 2 weeks"
:buffers-files ,(list jc/agenda-file-work jc/agenda-file-work-archive)
:query (closed :from -14)
:super-groups ((:auto-ts t)))
("Review: Projects"
:buffers-files org-agenda-files
:query (and (todo)
(or (tags "project")
(children)))
:super-groups ((:name "Progressing"
:order 15
:children ("TODO" "COOL" "WARM" "HOT" "DOING"))
(:name "Discussion needed"
:order 4
:children ("DISCUSS"))
(:name "Waiting"
:order 10
:children ("WAITING" "DELEGATED"))
(:name "On hold"
:order 10
:children ("ONHOLD"))
(:name "Stalled"
:order 0
:anything t)))
("Review: Strategic areas"
:buffers-files org-agenda-files
:query (property "Track")
:super-groups ((:name "Progressing"
:order 5
:children ("TODO" "COOL" "WARM" "HOT" "DOING"))
(:name "Discussion needed"
:order 4
:children ("DISCUSS"))
(:name "Waiting"
:order 10
:children ("WAITING" "DELEGATED"))
(:name "On hold"
:order 10
:children ("ONHOLD"))
(:name "Stalled"
:order 0
:anything t))))))
(map! :leader :desc "Org-ql views" :n "oq" #'org-ql-view)
#+end_src
@ -676,12 +687,15 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
(org-ql-search (list jc/agenda-file-home) '(todo)
:super-groups org-super-agenda-groups)
"home tasks")
("hk"
(org-ql-view "Kanban: home")
"home kanban")
("wt"
(org-ql-search (list jc/agenda-file-work) '(todo)
:super-groups org-super-agenda-groups)
"work tasks")
("wk"
(org-ql-view "Working: Kanban")
(org-ql-view "Kanban: work")
"work kanban"))
(map! :leader :n "oa" #'jc/agenda-views/body)

View File

@ -28,7 +28,7 @@
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
hydra
indent-guides ; highlighted indent columns
ligatures ; ligatures and symbols to make your code pretty again
;ligatures ; ligatures and symbols to make your code pretty again
;; minimap ; show a map of the code on the side
modeline ; snazzy, Atom-inspired modeline, plus API
nav-flash ; blink cursor line after big motions

View File

@ -13,6 +13,8 @@
scu = "systemctl --user";
ns = "nix search nixpkgs";
lg = pkgs.lazygit + ./bin/lazygit;
};
sessionVariables = { ZSH_CUSTOM = ./zsh/omz-custom; };
@ -44,7 +46,6 @@
"vagrant"
"docker"
"archlinux"
"kitty"
];
};
};