Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

init.el

@@ -360,6 +360,11 @@ vertically."
 (use-package company-dict
   :after company)
 
+(use-package yasnippet
+  :config
+  (setq yas-snippet-dirs '("~/.dotemacs/yasnippets"))
+  (yas-global-mode 1))
+
 (use-package avy
   :after evil)
 
@@ -381,16 +386,23 @@ vertically."
 
 (setq display-buffer-alist
       '(("\\*e?shell\\*"
-         (display-buffer-pop-up-frame))
+         (display-buffer-in-side-window)
+         (side . right)
+         (window-width . 0.3))
         ("*helpful*"
-         (display-buffer-pop-up-frame))
+         (display-buffer-in-side-window)
+         (side . right)
+         (window-width . 0.4))
         ("\\*elfeed-entry\\*"
          (display-buffer-in-side-window)
          (side . bottom)
          (window-height . 0.60))
         ("*Org Agenda(a)*"
-         (display-buffer-pop-up-frame)
-         (wait-for-wm . t))
+         (display-buffer-pop-up-frame))
+        ("*Agenda Commands*"
+         (display-buffer-in-side-window)
+         (side . right)
+         (window-width . 0.30))
         ("\\*Bongo-Elfeed Queue\\*"
          (display-buffer-in-side-window)
          (side . bottom)
@@ -439,6 +451,11 @@ vertically."
 (use-package fish-mode
   :mode ("\\.fish\\'" . fish-mode))
 
+(use-package markdown-mode
+  :mode ("\\.md\\'" . markdown-mode)
+  :config
+  (setq markdown-fontify-code-blocks-natively t))
+
 (use-package qml-mode
   :mode ("\\.qml\\'" . qml-mode)
   :config
@@ -558,7 +575,7 @@ vertically."
         org-agenda-sticky t
         org-fontify-quote-and-verse-blocks t
         org-src-preserve-indentation t
-        org-src-window-setup 'other-frame)
+        org-src-window-setup 'other-window)
 
   (add-hook 'org-mode-hook 'chris/org-mode-setup)
 
@@ -704,7 +721,8 @@ vertically."
   ('normal org-mode-map
            "RET" 'chris/org-dwim-at-point
            "gC" 'chris/org-columns-view
-           "ge" 'org-edit-src-code)
+           "ge" 'org-edit-src-code
+           "t" 'org-todo)
   ('normal 'org-src-mode-map
            "q" 'org-edit-src-abort))
 
@@ -754,15 +772,14 @@ vertically."
 (use-package org-roam
   :after org
   ;; :ensure t
-  :commands (org-roam org-roam-find-file org-roam-insert)
   :hook
-  (org-load . org-roam-mode)
+  (after-init . org-roam-mode)
   :config
   (setq org-roam-directory "~/org"
         org-roam-buffer-width 0.25
         org-roam-file-exclude-regexp ".stversion.*\|.stfolder.*\|.*~.*\|.*sync.*"
-           org-roam-db-location "~/.dotemacs/org-roam.db"
-           org-roam-completion-everywhere t
+        org-roam-db-location "~/.dotemacs/org-roam.db"
+        org-roam-completion-everywhere t
         org-roam-capture-templates
         '(("d" "default" plain (function org-roam--capture-get-point)
            "%?"
@@ -1247,7 +1264,7 @@ If on a:
     :keymaps 'override
     "oe" 'eshell)
   (general-def '(normal insert) eshell-mode-map
-    "C-d" 'chris/kill-buffer-frame))
+    "C-d" 'kill-buffer-and-window))
 
 (setq eshell-command-aliases-list
       '(("ls" "exa $1")
@@ -1460,6 +1477,9 @@ interfere with the default `bongo-playlist-buffer'."
   (chris/leader-keys
     "st" 'password-store-otp-token-copy))
 
+(use-package activity-watch-mode
+  :init (global-activity-watch-mode))
+
 ;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions
 ;; in non-focused windows.
 (setq-default cursor-in-non-selected-windows nil)