doom config

2 files changed, 25 insertions, 12 deletions

diff --git a/doom.d/config.el b/doom.d/config.el
index a840f0b..0c6c03b 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -47,6 +47,15 @@
 ;; --------------------
 ;; Some of my own stuff
 ;; --------------------
+;; Open cider repl in vertical window
+;; https://stackoverflow.com/questions/65992013/doom-emacs-move-cider-repl-windows-vertical
+(after! cider
+  (set-popup-rules!
+   '(("^\\*cider-repl"
+      :side right
+      :width 100
+      :quit nil
+      :ttl nil))));
 ;;
 ;;Switch to scratch buffer
 (defun mrl/switch-to-scratch ()
@@ -64,6 +73,7 @@
 ;; Basic agenda stuff
 
 (after! org
+  (setq org-modules '(org-habit ol-bibtex))
   (evil-set-initial-state 'org-capture-mode 'insert) ;; from https://www.reddit.com/r/emacs/comments/hzkyrb/org_capture_evil_go_into_insert_mode/
   (setq org-directory "~/org/")
   (setq org-startup-indented nil)
@@ -283,24 +293,27 @@
         (org-agenda-redo t)
         (beginning-of-buffer))))
 
-  ;; org handling to-do items
+  ;; Defining stuck projects
+  (setq org-stuck-projects
+        '("/+PROJ" ("NEXT") nil ""))
 
   ;; Put state transition logs into a drawer called LOGBOOK
   (setq org-log-into-drawer t)
 
   (setq org-todo-keywords
-        (quote ((sequence "TODO(t)" "NEXT(n)" "DOING" "|" "DONE(d!)")
+        (quote ((sequence "TODO(t)" "NEXT(n)" "DOING(D)" "PROJ(p)"  "|" "DONE(d!)")
                 (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)")
                 )))
 
-  ;; (setq org-todo-keyword-faces
-  ;;       (quote (("TODO" :foreground "red" :weight bold)
-  ;;               ("NEXT" :foreground "cyan" :weight bold)
-  ;;               ("DOING" :foreground "orchid" :weight bold)
-  ;;               ("DONE" :foreground "forest green" :weight bold)
-  ;;               ("WAITING" :foreground "orange" :weight bold)
-  ;;               ("HOLD" :foreground "magenta" :weight bold)
-  ;;               ("CANCELLED" :foreground "forest green" :weight bold))))
+  (setq org-todo-keyword-faces
+        (quote (("TODO" :foreground "red" :weight bold)
+                ("NEXT" :foreground "cyan" :weight bold)
+                ("PROJ" :foreground "pink" :weight bold)
+                ("DOING" :foreground "orchid" :weight bold)
+                ("DONE" :foreground "forest green" :weight bold)
+                ("WAITING" :foreground "orange" :weight bold)
+                ("HOLD" :foreground "magenta" :weight bold)
+                ("CANCELLED" :foreground "forest green" :weight bold))))
 
   ;; tag stuff automatically dependent on a change of state
   (setq org-todo-state-tags-triggers
diff --git a/doom.d/init.el b/doom.d/init.el
index 725b51c..4bd2196 100644
--- a/doom.d/init.el
+++ b/doom.d/init.el
@@ -58,7 +58,7 @@
        fold              ; (nigh) universal code folding
        (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
-       ;;lispy             ; vim for lisp, for people who don't like vim
+       lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
        ;;parinfer          ; turn lisp into python, sort of
@@ -116,7 +116,7 @@
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
        ;;(cc +lsp)         ; C > C++ == 1
-       clojure           ; java with a lisp
+       (clojure +lsp)           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
        ;;crystal           ; ruby at the speed of c