Merge branch 'master' of gitlab.com:chriscochrun/dotemacs
This commit is contained in:
Chris Cochrun
commit
f9454c847b
64
README.org
64
README.org
|
|
@ -351,6 +351,7 @@ This evil-collection package includes a lot of other evil based things.
|
|||
"w" '(:ignore t :which-key "window")
|
||||
"s" '(:ignore t :which-key "search")
|
||||
"o" '(:ignore t :which-key "open")
|
||||
"oa" '(:ignore t :which-key "org agenda")
|
||||
"of" '(:ignore t :which-key "elfeed")
|
||||
"h" '(:ignore t :which-key "help")
|
||||
"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)
|
||||
(general-def 'normal
|
||||
"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
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -721,7 +726,9 @@ Ace link provides an avy like search for links. Upon using the keybindings prese
|
|||
(side . bottom)
|
||||
(window-height . 0.60))
|
||||
("*Org Agenda(a)*"
|
||||
(display-buffer-pop-up-frame))
|
||||
(display-buffer-in-side-window)
|
||||
(side . right)
|
||||
(window-width . 0.4))
|
||||
("*Agenda Commands*"
|
||||
(display-buffer-in-side-window)
|
||||
(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))
|
||||
(org-content)
|
||||
(org-columns)
|
||||
(olivetti-mode -1))
|
||||
(setq visual-fill-column-width 150))
|
||||
|
||||
(defun chris/org-columns-quit ()
|
||||
"Remove the org-columns overlay and turn on olivetti-mode"
|
||||
(interactive)
|
||||
(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)
|
||||
|
||||
|
|
@ -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-agenda-window-setup 'other-frame)
|
||||
(setq org-agenda-window-setup 'other-window)
|
||||
|
||||
(defun chris/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
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
"oa" 'org-agenda
|
||||
"c" 'org-capture
|
||||
"rr" 'org-refile
|
||||
"e" 'org-export-dispatch)
|
||||
"e" 'org-export-dispatch
|
||||
"oa" 'org-agenda)
|
||||
('normal org-agenda-mode-map
|
||||
"q" 'org-agenda-quit
|
||||
"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 ()
|
||||
"Function to return the lesson file that is needed for TFC plan capture and move to correct position for plan insertion"
|
||||
(interactive)
|
||||
(unless org-roam-mode (org-roam-mode))
|
||||
(let* ((completions (org-roam--get-title-path-completions))
|
||||
(title-with-tags (org-roam-completion--completing-read "Lesson: " completions))
|
||||
(res (cdr (assoc title-with-tags completions)))
|
||||
(file-path (plist-get res :path)))
|
||||
(find-file file-path)
|
||||
;; (unless org-roam-mode (org-roam-mode +1))
|
||||
(let ((node (org-roam-node-read)))
|
||||
(org-roam-node-visit node)
|
||||
(goto-char (point-min))
|
||||
(search-forward "PLAN")))
|
||||
#+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
|
||||
:after org
|
||||
:ensure t
|
||||
:init
|
||||
(setq org-roam-v2-ack t)
|
||||
:config
|
||||
(setq org-roam-directory "~/org"
|
||||
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-completion-everywhere t
|
||||
org-roam-capture-templates
|
||||
'(("d" "default" plain (function org-roam--capture-get-point)
|
||||
"%?"
|
||||
:file-name "${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
|
||||
("b" "bible" plain (function org-roam--capture-get-point)
|
||||
"%?"
|
||||
:file-name "${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ")
|
||||
("l" "TFC Lesson" plain (function org-roam--capture-get-point)
|
||||
(file ".templates/lessontemplate.org")
|
||||
:file-name "lessons/${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n"))
|
||||
|
||||
'(("d" "default" plain "%?"
|
||||
:if-new (file+head "${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
|
||||
:unnarrowed t)
|
||||
("b" "bible" plain "%?"
|
||||
:if-new (file+head "${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* %?")
|
||||
:unnarrowed t)
|
||||
("l" "TFC Lesson" plain (file ".templates/lessontemplate.org")
|
||||
:if-new (file+head "lessons/${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")
|
||||
:unnarrowed t))
|
||||
org-roam-dailies-capture-templates
|
||||
'(("d" "daily" plain #'org-roam-capture--get-point ""
|
||||
: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"
|
||||
:head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun")))
|
||||
(org-roam-setup)
|
||||
(setq org-roam-v2-ack t)
|
||||
:general
|
||||
(chris/leader-keys
|
||||
:states 'normal
|
||||
|
|
@ -2092,12 +2098,12 @@ Matrix.el is a decent enough matrix client built in emacs. Like it.
|
|||
|
||||
** ActivityWatch
|
||||
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
|
||||
:init
|
||||
(if (string-equal (system-name) "syl")
|
||||
(global-activity-watch-mode -1)
|
||||
(global-activity-watch-mode +1)))
|
||||
(global-activity-watch-mode -1)))
|
||||
#+end_src
|
||||
|
||||
** MyBible
|
||||
|
|
|
|||
66
init.el
66
init.el
|
|
@ -215,6 +215,7 @@
|
|||
"w" '(:ignore t :which-key "window")
|
||||
"s" '(:ignore t :which-key "search")
|
||||
"o" '(:ignore t :which-key "open")
|
||||
"oa" '(:ignore t :which-key "org agenda")
|
||||
"of" '(:ignore t :which-key "elfeed")
|
||||
"h" '(:ignore t :which-key "help")
|
||||
"n" '(:ignore t :which-key "notes")
|
||||
|
|
@ -247,7 +248,11 @@
|
|||
"C-v" 'evil-paste-after)
|
||||
(general-def 'normal
|
||||
"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
|
||||
:after evil
|
||||
|
|
@ -428,7 +433,9 @@ vertically."
|
|||
(side . bottom)
|
||||
(window-height . 0.60))
|
||||
("*Org Agenda(a)*"
|
||||
(display-buffer-pop-up-frame))
|
||||
(display-buffer-in-side-window)
|
||||
(side . right)
|
||||
(window-width . 0.4))
|
||||
("*Agenda Commands*"
|
||||
(display-buffer-in-side-window)
|
||||
(side . right)
|
||||
|
|
@ -741,13 +748,15 @@ vertically."
|
|||
(goto-char (point-min))
|
||||
(org-content)
|
||||
(org-columns)
|
||||
(olivetti-mode -1))
|
||||
(setq visual-fill-column-width 150))
|
||||
|
||||
(defun chris/org-columns-quit ()
|
||||
"Remove the org-columns overlay and turn on olivetti-mode"
|
||||
(interactive)
|
||||
(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)
|
||||
|
||||
|
|
@ -768,7 +777,7 @@ vertically."
|
|||
|
||||
(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 ()
|
||||
"create a window in AwesomeWM that houses my org-agenda"
|
||||
|
|
@ -779,10 +788,10 @@ vertically."
|
|||
(chris/leader-keys
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
"oa" 'org-agenda
|
||||
"c" 'org-capture
|
||||
"rr" 'org-refile
|
||||
"e" 'org-export-dispatch)
|
||||
"e" 'org-export-dispatch
|
||||
"oa" 'org-agenda)
|
||||
('normal org-agenda-mode-map
|
||||
"q" 'org-agenda-quit
|
||||
"r" 'org-agenda-redo
|
||||
|
|
@ -805,12 +814,9 @@ vertically."
|
|||
(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"
|
||||
(interactive)
|
||||
(unless org-roam-mode (org-roam-mode))
|
||||
(let* ((completions (org-roam--get-title-path-completions))
|
||||
(title-with-tags (org-roam-completion--completing-read "Lesson: " completions))
|
||||
(res (cdr (assoc title-with-tags completions)))
|
||||
(file-path (plist-get res :path)))
|
||||
(find-file file-path)
|
||||
;; (unless org-roam-mode (org-roam-mode +1))
|
||||
(let ((node (org-roam-node-read)))
|
||||
(org-roam-node-visit node)
|
||||
(goto-char (point-min))
|
||||
(search-forward "PLAN")))
|
||||
|
||||
|
|
@ -848,6 +854,8 @@ vertically."
|
|||
(use-package org-roam
|
||||
:after org
|
||||
:ensure t
|
||||
:init
|
||||
(setq org-roam-v2-ack t)
|
||||
:config
|
||||
(setq org-roam-directory "~/org"
|
||||
org-roam-buffer-width 0.25
|
||||
|
|
@ -855,19 +863,18 @@ vertically."
|
|||
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)
|
||||
"%?"
|
||||
:file-name "${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
|
||||
("b" "bible" plain (function org-roam--capture-get-point)
|
||||
"%?"
|
||||
:file-name "${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ")
|
||||
("l" "TFC Lesson" plain (function org-roam--capture-get-point)
|
||||
(file ".templates/lessontemplate.org")
|
||||
:file-name "lessons/${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n"))
|
||||
|
||||
'(("d" "default" plain "%?"
|
||||
:if-new (file+head "${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
|
||||
:unnarrowed t)
|
||||
("b" "bible" plain "%?"
|
||||
:if-new (file+head "${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* %?")
|
||||
:unnarrowed t)
|
||||
("l" "TFC Lesson" plain (file ".templates/lessontemplate.org")
|
||||
:if-new (file+head "lessons/${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")
|
||||
:unnarrowed t))
|
||||
org-roam-dailies-capture-templates
|
||||
'(("d" "daily" plain #'org-roam-capture--get-point ""
|
||||
:immediate-finish t
|
||||
|
|
@ -878,7 +885,6 @@ vertically."
|
|||
:file-name "%<%Y-%m-%d>-bib"
|
||||
:head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun")))
|
||||
(org-roam-setup)
|
||||
(setq org-roam-v2-ack t)
|
||||
:general
|
||||
(chris/leader-keys
|
||||
:states 'normal
|
||||
|
|
@ -1591,12 +1597,6 @@ interfere with the default `bongo-playlist-buffer'."
|
|||
(chris/leader-keys
|
||||
"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
|
||||
;; in non-focused windows.
|
||||
(setq-default cursor-in-non-selected-windows nil)
|
||||
|
|
|
|||
Loading…
Reference in a new issue