Merge remote-tracking branch 'origin/master'

README.org

@@ -1024,7 +1024,7 @@ Tempel is another templating system. Also perhaps even more powerful with it's e
 I'm going to use projectile to keep my projects inline.
 #+begin_src emacs-lisp
 (use-package projectile
-  :defer t
+  :ensure t
   :general
   (chris/leader-keys
     :states 'normal
@@ -1085,6 +1085,10 @@ Ace link provides an avy like search for links. Upon using the keybindings prese
          (display-buffer-in-side-window)
          (side . right)
          (window-width . 0.4))
+        ("*compilation*"
+         (display-buffer-in-side-window)
+         (side . right)
+         (window-width . 0.4))
         ("*org-roam*"
          (display-buffer-in-side-window)
          (side . right)
@@ -1500,7 +1504,22 @@ Let's start by creating a self contained function of what I'd like started on ev
   (display-line-numbers-mode -1)
   (variable-pitch-mode +1)
   (setq visual-fill-column-width 100
-        visual-fill-column-center-text t))
+        visual-fill-column-center-text t)
+
+  ;;Let's make sure org-mode faces are inheriting fixed pitch faces.
+  (dolist (face '(org-block
+                  org-block-begin-line
+                  org-block-end-line
+                  org-code
+                  org-document-info-keyword
+                  org-meta-line
+                  org-table
+                  org-date
+                  org-verbatim))
+    (set-face-attribute `,face nil :inherit 'fixed-pitch))
+
+  (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line)
+  (set-face-attribute 'org-quote nil :background "#242631" :inherit 'fixed-pitch))
 
 (defun chris/org-agenda-setup ()
   (interactive)
@@ -1509,6 +1528,7 @@ Let's start by creating a self contained function of what I'd like started on ev
   (visual-fill-column-mode +1)
   (display-line-numbers-mode -1)
   (variable-pitch-mode -1)
+  (toggle-truncate-lines +1)
   (setq visual-fill-column-width 120
         visual-fill-column-center-text t))
 #+end_src
@@ -1574,20 +1594,13 @@ Part of this config includes some special capture templates for my work as a you
           ("r" "Templates for projects")
           ("rt" "Project-local todo" entry
            (file+headline chris/project-todo "Inbox")
-           "* TODO %?\n%i\n%a" :prepend t)
+           "* TODO %?\n%a\n%i\n" :prepend t)
           ("rn" "Project-local notes" entry
-           (file+headline +org-capture-project-notes-file "Inbox")
+           (file+headline chris/project-todo "Notes")
-           "* %U %?\n%i\n%a" :prepend t)
+           "* %U %?\n%a\n%i\n" :prepend t)
           ("rc" "Project-local changelog" entry
-           (file+headline +org-capture-project-changelog-file "Unreleased")
+           (file+headline chris/project-changelog "Changelog")
-           "* %U %?\n%i\n%a" :prepend t)
+           "* %U %?\n%a\n%i\n" :prepend t))
-          ("o" "Centralized templates for projects")
-          ("ot" "Project todo" entry #'+org-capture-central-project-todo-file
-           "* TODO %?\n %i\n %a" :heading "Tasks" :prepend nil)
-          ("on" "Project notes" entry #'+org-capture-central-project-notes-file
-           "* %U %?\n %i\n %a" :heading "Notes" :prepend t)
-          ("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
-           "* %U %?\n %i\n %a" :heading "Changelog" :prepend t))
         org-capture-use-agenda-date t
         org-agenda-timegrid-use-ampm t
         org-agenda-show-inherited-tags nil
@@ -1622,7 +1635,7 @@ Part of this config includes some special capture templates for my work as a you
           "/home/chris/dev/church-presenter/TODO.org"
           "/home/chris/org/lessons/")
         org-id-method 'ts
-        org-agenda-tags-column -105)
+        org-agenda-tags-column -75)
 
   (defun chris/org-columns-view ()
     "Turn on org-columns overlay and turn off olivetti-mode"
@@ -1643,21 +1656,6 @@ Part of this config includes some special capture templates for my work as a you
   (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
   (add-hook 'org-agenda-finalize-hook 'chris/org-agenda-setup)
 
-  ;;Let's make sure org-mode faces are inheriting fixed pitch faces.
-  (dolist (face '(org-block
-                  org-block-begin-line
-                  org-block-end-line
-                  org-code
-                  org-document-info-keyword
-                  org-meta-line
-                  org-table
-                  org-date
-                  org-verbatim))
-    (set-face-attribute `,face nil :inherit 'fixed-pitch))
-
-  (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line)
-  (set-face-attribute 'org-quote nil :background "#242631" :inherit 'fixed-pitch)
-
   (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
 
   (setq org-agenda-window-setup 'current-window)
@@ -1719,7 +1717,10 @@ We need to create a lesson capture function to find our lesson files differently
 #+begin_src emacs-lisp
 (defun chris/project-todo ()
   (concat (projectile-project-root) "TODO.org"))
+(defun chris/project-changelog ()
+  (concat (projectile-project-root) "CHANGELOG.org"))
 #+end_src
+
 We are also going to make our config auto-tangle. This is so helpful on saving the .org file tangles out the config automatically.
 #+begin_src emacs-lisp
 (defun chris/org-babel-tangle-config ()

init.el

@@ -624,7 +624,7 @@ targets."
 )
 
 (use-package projectile
-  :defer t
+  :ensure t
   :general
   (chris/leader-keys
     :states 'normal
@@ -666,6 +666,10 @@ targets."
          (display-buffer-in-side-window)
          (side . right)
          (window-width . 0.4))
+        ("*compilation*"
+         (display-buffer-in-side-window)
+         (side . right)
+         (window-width . 0.4))
         ("*org-roam*"
          (display-buffer-in-side-window)
          (side . right)
@@ -925,7 +929,22 @@ targets."
   (display-line-numbers-mode -1)
   (variable-pitch-mode +1)
   (setq visual-fill-column-width 100
-        visual-fill-column-center-text t))
+        visual-fill-column-center-text t)
+
+  ;;Let's make sure org-mode faces are inheriting fixed pitch faces.
+  (dolist (face '(org-block
+                  org-block-begin-line
+                  org-block-end-line
+                  org-code
+                  org-document-info-keyword
+                  org-meta-line
+                  org-table
+                  org-date
+                  org-verbatim))
+    (set-face-attribute `,face nil :inherit 'fixed-pitch))
+
+  (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line)
+  (set-face-attribute 'org-quote nil :background "#242631" :inherit 'fixed-pitch))
 
 (defun chris/org-agenda-setup ()
   (interactive)
@@ -934,6 +953,7 @@ targets."
   (visual-fill-column-mode +1)
   (display-line-numbers-mode -1)
   (variable-pitch-mode -1)
+  (toggle-truncate-lines +1)
   (setq visual-fill-column-width 120
         visual-fill-column-center-text t))
 
@@ -994,20 +1014,13 @@ targets."
           ("r" "Templates for projects")
           ("rt" "Project-local todo" entry
            (file+headline chris/project-todo "Inbox")
-           "* TODO %?\n%i\n%a" :prepend t)
+           "* TODO %?\n%a\n%i\n" :prepend t)
           ("rn" "Project-local notes" entry
-           (file+headline +org-capture-project-notes-file "Inbox")
+           (file+headline chris/project-todo "Notes")
-           "* %U %?\n%i\n%a" :prepend t)
+           "* %U %?\n%a\n%i\n" :prepend t)
           ("rc" "Project-local changelog" entry
-           (file+headline +org-capture-project-changelog-file "Unreleased")
+           (file+headline chris/project-changelog "Changelog")
-           "* %U %?\n%i\n%a" :prepend t)
+           "* %U %?\n%a\n%i\n" :prepend t))
-          ("o" "Centralized templates for projects")
-          ("ot" "Project todo" entry #'+org-capture-central-project-todo-file
-           "* TODO %?\n %i\n %a" :heading "Tasks" :prepend nil)
-          ("on" "Project notes" entry #'+org-capture-central-project-notes-file
-           "* %U %?\n %i\n %a" :heading "Notes" :prepend t)
-          ("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
-           "* %U %?\n %i\n %a" :heading "Changelog" :prepend t))
         org-capture-use-agenda-date t
         org-agenda-timegrid-use-ampm t
         org-agenda-show-inherited-tags nil
@@ -1042,7 +1055,7 @@ targets."
           "/home/chris/dev/church-presenter/TODO.org"
           "/home/chris/org/lessons/")
         org-id-method 'ts
-        org-agenda-tags-column -105)
+        org-agenda-tags-column -75)
 
   (defun chris/org-columns-view ()
     "Turn on org-columns overlay and turn off olivetti-mode"
@@ -1063,21 +1076,6 @@ targets."
   (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
   (add-hook 'org-agenda-finalize-hook 'chris/org-agenda-setup)
 
-  ;;Let's make sure org-mode faces are inheriting fixed pitch faces.
-  (dolist (face '(org-block
-                  org-block-begin-line
-                  org-block-end-line
-                  org-code
-                  org-document-info-keyword
-                  org-meta-line
-                  org-table
-                  org-date
-                  org-verbatim))
-    (set-face-attribute `,face nil :inherit 'fixed-pitch))
-
-  (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line)
-  (set-face-attribute 'org-quote nil :background "#242631" :inherit 'fixed-pitch)
-
   (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
 
   (setq org-agenda-window-setup 'current-window)
@@ -1134,6 +1132,8 @@ targets."
 
 (defun chris/project-todo ()
   (concat (projectile-project-root) "TODO.org"))
+(defun chris/project-changelog ()
+  (concat (projectile-project-root) "CHANGELOG.org"))
 
 (defun chris/org-babel-tangle-config ()
   (when (string-equal (buffer-file-name)
@@ -2034,3 +2034,22 @@ interfere with the default `bongo-playlist-buffer'."
         gcmh-verbose nil))
 
 (setq warning-suppress-types '((comp)))
+<<<<<<< HEAD
+=======
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(pdf-misc-print-program "/usr/bin/lpr" t)
+ '(pdf-misc-print-program-args '("-o media=Letter" "-o fitplot") t)
+ '(safe-local-variable-values
+   '((projectile-project-run-cmd . "./build/bin/presenter")
+     (projectile-project-compilation-cmd . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make --dir build/"))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+>>>>>>> origin/master