chris/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Chris Cochrun 2021-08-24 10:53:17 -05:00
parent 58bc6620b4 5cb5bb1792
commit f9454c847b
2 changed files with 68 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
README.org
View file

@ -351,6 +351,7 @@ This evil-collection package includes a lot of other evil based things.
"w" '(:ignore t :which-key "window") "w" '(:ignore t :which-key "window")
"s" '(:ignore t :which-key "search") "s" '(:ignore t :which-key "search")
"o" '(:ignore t :which-key "open") "o" '(:ignore t :which-key "open")
"oa" '(:ignore t :which-key "org agenda")
"of" '(:ignore t :which-key "elfeed") "of" '(:ignore t :which-key "elfeed")
"h" '(:ignore t :which-key "help") "h" '(:ignore t :which-key "help")
"n" '(:ignore t :which-key "notes") "n" '(:ignore t :which-key "notes")
@ -383,7 +384,11 @@ This evil-collection package includes a lot of other evil based things.
"C-v" 'evil-paste-after) "C-v" 'evil-paste-after)
(general-def 'normal (general-def 'normal
"gcc" 'comment-line "gcc" 'comment-line
"K" 'helpful-at-point)) "K" 'helpful-at-point)
(general-def 'normal Info-mode-map
"RET" 'Info-follow-nearest-node
"p" 'Info-prev
"n" 'Info-next))
#+end_src #+end_src
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -721,7 +726,9 @@ Ace link provides an avy like search for links. Upon using the keybindings prese
(side . bottom) (side . bottom)
(window-height . 0.60)) (window-height . 0.60))
("*Org Agenda(a)*" ("*Org Agenda(a)*"
(display-buffer-pop-up-frame)) (display-buffer-in-side-window)
(side . right)
(window-width . 0.4))
("*Agenda Commands*" ("*Agenda Commands*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
@ -1138,13 +1145,15 @@ Part of this config includes some special capture templates for my work as a you
(goto-char (point-min)) (goto-char (point-min))
(org-content) (org-content)
(org-columns) (org-columns)
(olivetti-mode -1)) (setq visual-fill-column-width 150))
(defun chris/org-columns-quit () (defun chris/org-columns-quit ()
"Remove the org-columns overlay and turn on olivetti-mode" "Remove the org-columns overlay and turn on olivetti-mode"
(interactive) (interactive)
(org-columns-quit) (org-columns-quit)
(chris/org-mode-setup)) (chris/org-mode-setup)
(setq visual-fill-column-width 100)
(setq visual-fill-column-width 100))
(add-hook 'org-agenda-finalize-hook 'evil-normal-state) (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
@ -1165,7 +1174,7 @@ Part of this config includes some special capture templates for my work as a you
(setq org-refile-targets '((org-agenda-files . (:maxlevel . 6)))) (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
(setq org-agenda-window-setup 'other-frame) (setq org-agenda-window-setup 'other-window)
(defun chris/org-agenda () (defun chris/org-agenda ()
"create a window in AwesomeWM that houses my org-agenda" "create a window in AwesomeWM that houses my org-agenda"
@ -1176,10 +1185,10 @@ Part of this config includes some special capture templates for my work as a you
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
:keymaps 'override :keymaps 'override
"oa" 'org-agenda
"c" 'org-capture "c" 'org-capture
"rr" 'org-refile "rr" 'org-refile
"e" 'org-export-dispatch) "e" 'org-export-dispatch
"oa" 'org-agenda)
('normal org-agenda-mode-map ('normal org-agenda-mode-map
"q" 'org-agenda-quit "q" 'org-agenda-quit
"r" 'org-agenda-redo "r" 'org-agenda-redo
@ -1205,12 +1214,9 @@ We need to create a lesson capture function to find our lesson files differently
(defun chris/org-roam-capture-lesson-file () (defun chris/org-roam-capture-lesson-file ()
"Function to return the lesson file that is needed for TFC plan capture and move to correct position for plan insertion" "Function to return the lesson file that is needed for TFC plan capture and move to correct position for plan insertion"
(interactive) (interactive)
(unless org-roam-mode (org-roam-mode)) ;; (unless org-roam-mode (org-roam-mode +1))
(let* ((completions (org-roam--get-title-path-completions)) (let ((node (org-roam-node-read)))
(title-with-tags (org-roam-completion--completing-read "Lesson: " completions)) (org-roam-node-visit node)
(res (cdr (assoc title-with-tags completions)))
(file-path (plist-get res :path)))
(find-file file-path)
(goto-char (point-min)) (goto-char (point-min))
(search-forward "PLAN"))) (search-forward "PLAN")))
#+end_src #+end_src
@ -1268,6 +1274,8 @@ We also need to setup some capture templates to use some specific setups with my
(use-package org-roam (use-package org-roam
:after org :after org
:ensure t :ensure t
:init
(setq org-roam-v2-ack t)
:config :config
(setq org-roam-directory "~/org" (setq org-roam-directory "~/org"
org-roam-buffer-width 0.25 org-roam-buffer-width 0.25
@ -1275,19 +1283,18 @@ We also need to setup some capture templates to use some specific setups with my
org-roam-db-location "~/.dotemacs/org-roam.db" org-roam-db-location "~/.dotemacs/org-roam.db"
org-roam-completion-everywhere t org-roam-completion-everywhere t
org-roam-capture-templates org-roam-capture-templates
'(("d" "default" plain (function org-roam--capture-get-point) '(("d" "default" plain "%?"
"%?" :if-new (file+head "${slug}.org"
:file-name "${slug}" "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ") :unnarrowed t)
("b" "bible" plain (function org-roam--capture-get-point) ("b" "bible" plain "%?"
"%?" :if-new (file+head "${slug}.org"
:file-name "${slug}" "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* %?")
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ") :unnarrowed t)
("l" "TFC Lesson" plain (function org-roam--capture-get-point) ("l" "TFC Lesson" plain (file ".templates/lessontemplate.org")
(file ".templates/lessontemplate.org") :if-new (file+head "lessons/${slug}.org"
:file-name "lessons/${slug}" "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")) :unnarrowed t))
org-roam-dailies-capture-templates org-roam-dailies-capture-templates
'(("d" "daily" plain #'org-roam-capture--get-point "" '(("d" "daily" plain #'org-roam-capture--get-point ""
:immediate-finish t :immediate-finish t
@ -1298,7 +1305,6 @@ We also need to setup some capture templates to use some specific setups with my
:file-name "%<%Y-%m-%d>-bib" :file-name "%<%Y-%m-%d>-bib"
:head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))) :head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun")))
(org-roam-setup) (org-roam-setup)
(setq org-roam-v2-ack t)
:general :general
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
@ -2092,12 +2098,12 @@ Matrix.el is a decent enough matrix client built in emacs. Like it.
** ActivityWatch ** ActivityWatch
I like to track my time with ActivityWatch so I can notice and kill bad habits. I like to track my time with ActivityWatch so I can notice and kill bad habits.
#+begin_src emacs-lisp #+begin_src emacs-lisp :tangle no
(use-package activity-watch-mode (use-package activity-watch-mode
:init :init
(if (string-equal (system-name) "syl") (if (string-equal (system-name) "syl")
(global-activity-watch-mode -1) (global-activity-watch-mode -1)
(global-activity-watch-mode +1))) (global-activity-watch-mode -1)))
#+end_src #+end_src
** MyBible ** MyBible

66
init.el
View file

@ -215,6 +215,7 @@
"w" '(:ignore t :which-key "window") "w" '(:ignore t :which-key "window")
"s" '(:ignore t :which-key "search") "s" '(:ignore t :which-key "search")
"o" '(:ignore t :which-key "open") "o" '(:ignore t :which-key "open")
"oa" '(:ignore t :which-key "org agenda")
"of" '(:ignore t :which-key "elfeed") "of" '(:ignore t :which-key "elfeed")
"h" '(:ignore t :which-key "help") "h" '(:ignore t :which-key "help")
"n" '(:ignore t :which-key "notes") "n" '(:ignore t :which-key "notes")
@ -247,7 +248,11 @@
"C-v" 'evil-paste-after) "C-v" 'evil-paste-after)
(general-def 'normal (general-def 'normal
"gcc" 'comment-line "gcc" 'comment-line
"K" 'helpful-at-point)) "K" 'helpful-at-point)
(general-def 'normal Info-mode-map
"RET" 'Info-follow-nearest-node
"p" 'Info-prev
"n" 'Info-next))
(use-package evil-escape (use-package evil-escape
:after evil :after evil
@ -428,7 +433,9 @@ vertically."
(side . bottom) (side . bottom)
(window-height . 0.60)) (window-height . 0.60))
("*Org Agenda(a)*" ("*Org Agenda(a)*"
(display-buffer-pop-up-frame)) (display-buffer-in-side-window)
(side . right)
(window-width . 0.4))
("*Agenda Commands*" ("*Agenda Commands*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
@ -741,13 +748,15 @@ vertically."
(goto-char (point-min)) (goto-char (point-min))
(org-content) (org-content)
(org-columns) (org-columns)
(olivetti-mode -1)) (setq visual-fill-column-width 150))
(defun chris/org-columns-quit () (defun chris/org-columns-quit ()
"Remove the org-columns overlay and turn on olivetti-mode" "Remove the org-columns overlay and turn on olivetti-mode"
(interactive) (interactive)
(org-columns-quit) (org-columns-quit)
(chris/org-mode-setup)) (chris/org-mode-setup)
(setq visual-fill-column-width 100)
(setq visual-fill-column-width 100))
(add-hook 'org-agenda-finalize-hook 'evil-normal-state) (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
@ -768,7 +777,7 @@ vertically."
(setq org-refile-targets '((org-agenda-files . (:maxlevel . 6)))) (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
(setq org-agenda-window-setup 'other-frame) (setq org-agenda-window-setup 'other-window)
(defun chris/org-agenda () (defun chris/org-agenda ()
"create a window in AwesomeWM that houses my org-agenda" "create a window in AwesomeWM that houses my org-agenda"
@ -779,10 +788,10 @@ vertically."
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
:keymaps 'override :keymaps 'override
"oa" 'org-agenda
"c" 'org-capture "c" 'org-capture
"rr" 'org-refile "rr" 'org-refile
"e" 'org-export-dispatch) "e" 'org-export-dispatch
"oa" 'org-agenda)
('normal org-agenda-mode-map ('normal org-agenda-mode-map
"q" 'org-agenda-quit "q" 'org-agenda-quit
"r" 'org-agenda-redo "r" 'org-agenda-redo
@ -805,12 +814,9 @@ vertically."
(defun chris/org-roam-capture-lesson-file () (defun chris/org-roam-capture-lesson-file ()
"Function to return the lesson file that is needed for TFC plan capture and move to correct position for plan insertion" "Function to return the lesson file that is needed for TFC plan capture and move to correct position for plan insertion"
(interactive) (interactive)
(unless org-roam-mode (org-roam-mode)) ;; (unless org-roam-mode (org-roam-mode +1))
(let* ((completions (org-roam--get-title-path-completions)) (let ((node (org-roam-node-read)))
(title-with-tags (org-roam-completion--completing-read "Lesson: " completions)) (org-roam-node-visit node)
(res (cdr (assoc title-with-tags completions)))
(file-path (plist-get res :path)))
(find-file file-path)
(goto-char (point-min)) (goto-char (point-min))
(search-forward "PLAN"))) (search-forward "PLAN")))
@ -848,6 +854,8 @@ vertically."
(use-package org-roam (use-package org-roam
:after org :after org
:ensure t :ensure t
:init
(setq org-roam-v2-ack t)
:config :config
(setq org-roam-directory "~/org" (setq org-roam-directory "~/org"
org-roam-buffer-width 0.25 org-roam-buffer-width 0.25
@ -855,19 +863,18 @@ vertically."
org-roam-db-location "~/.dotemacs/org-roam.db" org-roam-db-location "~/.dotemacs/org-roam.db"
org-roam-completion-everywhere t org-roam-completion-everywhere t
org-roam-capture-templates org-roam-capture-templates
'(("d" "default" plain (function org-roam--capture-get-point) '(("d" "default" plain "%?"
"%?" :if-new (file+head "${slug}.org"
:file-name "${slug}" "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ") :unnarrowed t)
("b" "bible" plain (function org-roam--capture-get-point) ("b" "bible" plain "%?"
"%?" :if-new (file+head "${slug}.org"
:file-name "${slug}" "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* %?")
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ") :unnarrowed t)
("l" "TFC Lesson" plain (function org-roam--capture-get-point) ("l" "TFC Lesson" plain (file ".templates/lessontemplate.org")
(file ".templates/lessontemplate.org") :if-new (file+head "lessons/${slug}.org"
:file-name "lessons/${slug}" "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")) :unnarrowed t))
org-roam-dailies-capture-templates org-roam-dailies-capture-templates
'(("d" "daily" plain #'org-roam-capture--get-point "" '(("d" "daily" plain #'org-roam-capture--get-point ""
:immediate-finish t :immediate-finish t
@ -878,7 +885,6 @@ vertically."
:file-name "%<%Y-%m-%d>-bib" :file-name "%<%Y-%m-%d>-bib"
:head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))) :head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun")))
(org-roam-setup) (org-roam-setup)
(setq org-roam-v2-ack t)
:general :general
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
@ -1591,12 +1597,6 @@ interfere with the default `bongo-playlist-buffer'."
(chris/leader-keys (chris/leader-keys
"oM" 'ement-list-rooms)) "oM" 'ement-list-rooms))
(use-package activity-watch-mode
:init
(if (string-equal (system-name) "syl")
(global-activity-watch-mode -1)
(global-activity-watch-mode +1)))
;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions ;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions
;; in non-focused windows. ;; in non-focused windows.
(setq-default cursor-in-non-selected-windows nil) (setq-default cursor-in-non-selected-windows nil)