3 files changed, 34 insertions, 17 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 3c48275..68ac66c 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -25,7 +25,11 @@
   (load-theme 'atom-one-dark t))
 (set-face-attribute 'default nil :font "Monaco" :height 150)
 
-(use-package which-key)
+(use-package which-key
+  :ensure t
+  :config
+  (which-key-mode))
+
 (use-package undo-tree
   :config
   (global-undo-tree-mode))
@@ -75,17 +79,6 @@
   :config
   (setq vterm-kill-buffer-on-exit t))
 
-(use-package dashboard
-  :ensure t
-  :config
-  (dashboard-setup-startup-hook)
-  (setq dashboard-startup-banner nil)
-  (setq dashboard-items '((recents . 5)
-			  (bookmarks . 5)
-			  (projects . 5)
-			  (agenda . 5)
-			  (registers . 5))))
-
 (use-package markdown-mode
   :ensure t
   :commands (markdown-mode gfm-mode)
@@ -102,3 +95,8 @@
   (exec-path-from-shell-initialize))
 
 (use-package avy)
+
+(use-package paredit
+  :hook ((emacs-lisp-mode . enable-paredit-mode)
+	 (lisp-mode . enable-paredit-mode)
+	 (scheme-mode . enable-paredit-mode)))
diff --git a/.emacs.d/modes/init-evil-mode.el b/.emacs.d/modes/init-evil-mode.el
index ba04ca5..bccbc87 100644
--- a/.emacs.d/modes/init-evil-mode.el
+++ b/.emacs.d/modes/init-evil-mode.el
@@ -5,7 +5,8 @@
   (setq evil-want-integration t
 	evil-want-C-u-scroll t
 	evil-wannt-fine-undo t
-	evil-want-keybinding nil)
+	evil-want-keybinding nil
+	evil-disable-insert-state-bindings t)
   :config
   (evil-set-leader 'normal ",")
   (evil-set-undo-system 'undo-tree)
diff --git a/.emacs.d/modes/init-org-mode.el b/.emacs.d/modes/init-org-mode.el
index a542b2c..0644aa4 100644
--- a/.emacs.d/modes/init-org-mode.el
+++ b/.emacs.d/modes/init-org-mode.el
@@ -2,6 +2,7 @@
   :after evil
   :commands org-agenda
   :config
+  (require 'org-tempo)
   (setq org-directory "~/notes/")
   (setq org-default-notes-file (concat org-directory "/inbox.org"))
   (setq org-capture-templates
@@ -23,24 +24,41 @@
   (evil-define-key 'normal org-mode-map
     (kbd "TAB") 'org-cycle
     (kbd "RET") 'org-open-at-point)
-  (setq org-agenda-skip-deadline-prewarning-if-scheduled t)
 
-  ; todo
+  ;; todo
   (setq org-todo-keywords
 	'((sequence "TODO" "NEXT" "WAITING" "SOMEDAY" "PROJECT" "|" "DONE" "CANCELED")))
   (setq org-log-done t)
 
-  ; tags
+  ;; tags
   (setq org-tag-alist '((:startgroup . nil)
 			("work" . ?w) ("home" . ?h) ("errants" . ?e)
 			(:endgroup . nil)
 			("@phone" . ?p)))
 
-  ; org babel
+  ;; org babel
   (org-babel-do-load-languages
    'org-babel-load-languages
    '((shell . t))))
 
+(use-package org-agenda
+  :ensure nil
+  :init
+  (setq org-agenda-dim-blocked-tasks nil)
+  (setq org-agenda-skip-deadline-prewarning-if-scheduled t)
+  (setq org-deadline-warning-days 10)
+  (setq org-agenda-compact-blocks t)
+  (setq org-agenda-custom-commands
+	'(("d" "Daily agenda and all TODOs"
+	   ((tags "PRIORITY=\"A\""
+		  ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
+		   (org-agenda-overriding-header "High-priority unfinished tasks:")))
+	    (agenda "" ((org-agenda-ndays-to-span 1)))
+	    (alltodo ""
+		     ((org-agenda-skip-function '(or (org-agenda-skip-if nil '(scheduled deadline))))
+		      (org-agenda-overriding-header "All normal priority tasks:"))))))))
+
+
 (use-package evil-org
   :ensure t
   :after (org evil)