diff options
| -rw-r--r-- | users/grfn/emacs.d/+bindings.el | 2 | ||||
| -rw-r--r-- | users/grfn/emacs.d/+private.el.gpg | bin | 913 -> 1115 bytes | |||
| -rw-r--r-- | users/grfn/emacs.d/config.el | 62 | ||||
| -rw-r--r-- | users/grfn/emacs.d/packages.el | 4 |
4 files changed, 35 insertions, 33 deletions
diff --git a/users/grfn/emacs.d/+bindings.el b/users/grfn/emacs.d/+bindings.el index d0d82ba72e25..1e95d8e2eb69 100644 --- a/users/grfn/emacs.d/+bindings.el +++ b/users/grfn/emacs.d/+bindings.el @@ -353,7 +353,7 @@ private/hlissner/snippets." :desc "Store link" :n "l" #'org-store-link :desc "Browse notes" :n "N" #'+hlissner/browse-notes :desc "Org capture" :n "x" #'+org-capture/open - :desc "Create clubhouse story" :n "c" #'org-clubhouse-create-story + :desc "Create clubhouse story" :n "c" #'org-tracker-create-issue :desc "Archive subtree" :n "k" #'org-archive-subtree :desc "Goto clocked-in note" :n "g" #'org-clock-goto :desc "Clock Out" :n "o" #'org-clock-out) diff --git a/users/grfn/emacs.d/+private.el.gpg b/users/grfn/emacs.d/+private.el.gpg index 3179dc424980..6273c67d6ecd 100644 --- a/users/grfn/emacs.d/+private.el.gpg +++ b/users/grfn/emacs.d/+private.el.gpg Binary files differdiff --git a/users/grfn/emacs.d/config.el b/users/grfn/emacs.d/config.el index 293afa939f24..554bb20b9527 100644 --- a/users/grfn/emacs.d/config.el +++ b/users/grfn/emacs.d/config.el @@ -223,6 +223,22 @@ (load! "+commands") (load! "cpp") + +(add-to-list 'load-path "/home/grfn/code/org-tracker") +(require 'org-tracker) +(use-package! org-tracker + :hook (org-mode . org-tracker-mode) + :config + (setq org-tracker-state-alist '(("BACKLOG" . "Backlog") + ("PLANNED" . "Planned") + ("TODO" . "Seleted for Development") + ("ACTIVE" . "In Progress") + ("PR" . "Code Review") + ("DONE" . "Done")) + org-tracker-username "griffin@readyset.io" + org-tracker-claim-ticket-on-status-update '("ACTIVE" "PR" "DONE") + org-tracker-create-stories-with-labels 'existing)) + (load! "+private") (require 'dash) @@ -269,20 +285,6 @@ (setq doom-modeline-height 12) -(load "/home/grfn/code/org-clubhouse/org-clubhouse.el") -(use-package! org-clubhouse - :hook (org-mode . org-clubhouse-mode) - :config - (setq org-clubhouse-state-alist '(("BACKLOG" . "Unscheduled") - ("TODO" . "Ready for Development") - ("ACTIVE" . "In Development") - ("PR" . "Ready for Review") - ("DONE" . "Completed")) - org-clubhouse-username "griffinsmith" - org-clubhouse-claim-story-on-status-update '("ACTIVE" "PR" "DONE") - org-clubhouse-create-stories-with-labels 'existing - org-clubhouse-workflow-name "Engineering")) - ;; Should really figure out which of these is correct, eventually @@ -517,45 +519,45 @@ ["f"] (list "o" "Reset HEAD@{1}" #'magit-reset-head-previous)) - (defun magit-read-org-clubhouse-branch-name () - (when-let ((story-id (org-clubhouse-clocked-in-story-id))) + (defun magit-read-org-tracker-branch-name () + (when-let ((issue-id (org-tracker-clocked-in-issue-id))) (let ((desc (magit-read-string-ns - (format "Story description (to go after gs/ch%d/)" - story-id)))) - (format "gs/ch%d/%s" story-id desc)))) + (format "Issue description (to go after gs/%s/)" + issue-id)))) + (format "gs/%s/%s" issue-id desc)))) - (defun magit-read-org-clubhouse-branch-args () - (if-let ((story-id (org-clubhouse-clocked-in-story-id))) + (defun magit-read-org-tracker-branch-args () + (if-let ((issue-id (org-tracker-clocked-in-issue-id))) (let ((start-point (magit-read-starting-point - "Create and checkout branch for Clubhouse story" + "Create and checkout branch for Tracker issue" nil "origin/master"))) (if (magit-rev-verify start-point) - (when-let ((desc (magit-read-org-clubhouse-branch-name))) + (when-let ((desc (magit-read-org-tracker-branch-name))) (list desc start-point)) (user-error "Not a valid starting point: %s" choice))) - (user-error "No currently clocked-in clubhouse story"))) + (user-error "No currently clocked-in tracker issue"))) - (transient-define-suffix magit-checkout-org-clubhouse-branch (branch start-point) - (interactive (magit-read-org-clubhouse-branch-args)) + (transient-define-suffix magit-checkout-org-tracker-branch (branch start-point) + (interactive (magit-read-org-tracker-branch-args)) (magit-branch-and-checkout branch start-point)) - (transient-define-suffix magit-rename-org-clubhouse-branch (old new) + (transient-define-suffix magit-rename-org-tracker-branch (old new) (interactive (let ((branch (magit-read-local-branch "Rename branch"))) - (list branch (magit-read-org-clubhouse-branch-name)))) + (list branch (magit-read-org-tracker-branch-name)))) (when (and old new) (magit-branch-rename old new))) (transient-append-suffix #'magit-branch ["c"] - (list "C" "Checkout Clubhouse branch" #'magit-checkout-org-clubhouse-branch)) + (list "C" "Checkout Tracker branch" #'magit-checkout-org-tracker-branch)) (transient-append-suffix #'magit-branch ["c"] - (list "M" "Rename branch to Clubhouse ticket" #'magit-rename-org-clubhouse-branch))) + (list "M" "Rename branch to Tracker ticket" #'magit-rename-org-tracker-branch))) ;; (defun grfn/split-window-more-sensibly (&optional window) ;; (let ((window (or window (selected-window)))) diff --git a/users/grfn/emacs.d/packages.el b/users/grfn/emacs.d/packages.el index 9cac50c12da7..de66b4b233d8 100644 --- a/users/grfn/emacs.d/packages.el +++ b/users/grfn/emacs.d/packages.el @@ -17,9 +17,9 @@ (package! string-inflection) ;;; Org -(package! org-clubhouse +(package! org-tracker :recipe (:host file - :local-repo "~/code/org-clubhouse")) + :local-repo "~/code/org-tracker")) (package! org-alert) (package! ob-http) (package! ob-ipython) |