A lot of formatting and adding little things
This commit is contained in:
parent
5c585c8b94
commit
a55ff13fb3
2 changed files with 467 additions and 92 deletions
182
init.el
182
init.el
|
|
@ -4,19 +4,34 @@
|
|||
(scroll-bar-mode -1)
|
||||
(tool-bar-mode -1)
|
||||
(tooltip-mode -1)
|
||||
(set-fringe-mode 10)
|
||||
(set-fringe-mode 1)
|
||||
|
||||
(menu-bar-mode -1)
|
||||
(blink-cursor-mode -1)
|
||||
(column-number-mode +1)
|
||||
|
||||
(if (string-equal (system-name) "chris-linuxlaptop")
|
||||
(set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 240)
|
||||
(set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 120))
|
||||
(defvar chris/default-font-size 240)
|
||||
(defvar chris/default-font-size 120))
|
||||
|
||||
(set-face-attribute 'default nil :font "VictorMono Nerd Font" :height chris/default-font-size)
|
||||
(set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font" :height chris/default-font-size)
|
||||
(set-face-attribute 'variable-pitch nil :font "Cantarell" :height chris/default-font-size :weight 'regular)
|
||||
|
||||
(setq display-line-numbers-type 'relative)
|
||||
(display-line-numbers-mode +1)
|
||||
(global-visual-line-mode +1)
|
||||
|
||||
(global-set-key (kbd "<escape>") 'keyboard-escape-quit)
|
||||
|
||||
(defun chris/display-startup-time ()
|
||||
(message "Emacs loaded in %s with %d garbage collections."
|
||||
(format "%.2f seconds"
|
||||
(float-time
|
||||
(time-subtract after-init-time before-init-time)))
|
||||
gcs-done))
|
||||
(add-hook 'emacs-startup-hook #'chris/display-startup-time)
|
||||
|
||||
(defvar bootstrap-version)
|
||||
(let ((bootstrap-file
|
||||
(expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
|
||||
|
|
@ -53,6 +68,8 @@
|
|||
(use-package rainbow-delimiters
|
||||
:hook (prog-mode . rainbow-delimiters-mode))
|
||||
|
||||
(use-package adaptive-wrap)
|
||||
|
||||
(use-package which-key
|
||||
:init (which-key-mode)
|
||||
:config
|
||||
|
|
@ -64,6 +81,7 @@
|
|||
evil-want-keybinding nil
|
||||
evil-want-C-i-jump nil
|
||||
evil-want-C-u-scroll t
|
||||
evil-respect-visual-line-mode t
|
||||
evil-want-C-u-delete t)
|
||||
:config
|
||||
(evil-mode +1))
|
||||
|
|
@ -86,14 +104,21 @@
|
|||
"w" '(:ignore t :which-key "window")
|
||||
"s" '(:ignore t :which-key "search")
|
||||
"o" '(:ignore t :which-key "open")
|
||||
"h" '(:ignore t :which-key "help")
|
||||
"n" '(:ignore t :which-key "notes")
|
||||
"bs" '(consult-buffer :which-key "buffer search")
|
||||
"bd" '(kill-this-buffer :which-key "kill buffer")
|
||||
"nf" '(org-roam-find-file :which-key "org roam ff")
|
||||
"tt" '(consult-theme :which-key "choose theme")
|
||||
"ff" '(find-file :which-key "find file")
|
||||
"fr" '(consult-recent-file :which-key "recent file")
|
||||
"fs" '(save-buffer :which-key "save")
|
||||
"hf" '(helpful-callable :which-key "describe-function")
|
||||
"hv" '(helpful-variable :which-key "describe-variable")
|
||||
"od" '(dired-jump :which-key "dired jump")
|
||||
"ss" '(consult-line :which-key "consult search")
|
||||
"ww" '(other-window :which-key "other window")
|
||||
"wd" '(delete-window :which-key "other window")
|
||||
))
|
||||
|
||||
(use-package evil-escape
|
||||
|
|
@ -101,6 +126,11 @@
|
|||
:init (evil-escape-mode +1)
|
||||
:config (setq evil-escape-key-sequence "fd"))
|
||||
|
||||
(use-package olivetti)
|
||||
|
||||
(use-package toc-org
|
||||
:after org)
|
||||
|
||||
(use-package selectrum
|
||||
:init
|
||||
(selectrum-mode +1)
|
||||
|
|
@ -111,15 +141,18 @@
|
|||
"C-k" 'selectrum-previous-candidate
|
||||
"C-S-j" 'selectrum-goto-end
|
||||
"C-S-k" 'selectrum-goto-beginning
|
||||
"TAB" 'selectrum-insert-current-candidate))
|
||||
"TAB" 'selectrum-insert-current-candidate)
|
||||
:commands (completing-read))
|
||||
|
||||
(use-package prescient
|
||||
:config
|
||||
(prescient-persist-mode +1))
|
||||
(prescient-persist-mode +1)
|
||||
:after selectrum)
|
||||
|
||||
(use-package selectrum-prescient
|
||||
:init
|
||||
(selectrum-prescient-mode +1))
|
||||
(selectrum-prescient-mode +1)
|
||||
:after selectrum)
|
||||
|
||||
(use-package consult)
|
||||
|
||||
|
|
@ -143,11 +176,14 @@
|
|||
(lambda () (when (bound-and-true-p selectrum-mode) (selectrum-exhibit))))
|
||||
|
||||
;; Prefer richer, more heavy, annotations over the lighter default variant.
|
||||
(setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)))
|
||||
(setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
|
||||
:after selectrum)
|
||||
|
||||
(use-package helpful
|
||||
(use-package helpful)
|
||||
|
||||
(use-package format-all
|
||||
:config
|
||||
)
|
||||
(format-all-mode +1))
|
||||
|
||||
(use-package org
|
||||
:config
|
||||
|
|
@ -158,7 +194,133 @@
|
|||
(let ((org-confirm-babel-evaluate nil))
|
||||
(org-babel-tangle))))
|
||||
|
||||
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config))))
|
||||
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config)))
|
||||
|
||||
(org-babel-do-load-languages
|
||||
'org-babel-load-languages
|
||||
'((emacs-lisp . t)
|
||||
(python . t)
|
||||
(shell . t)))
|
||||
|
||||
(require 'org-tempo)
|
||||
(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
|
||||
(add-to-list 'org-structure-template-alist '("py" . "src python"))
|
||||
(add-to-list 'org-structure-template-alist '("sh" . "src shell"))
|
||||
(add-to-list 'org-structure-template-alist '("q" . "quote"))
|
||||
|
||||
(setq org-capture-templates
|
||||
'(("t" "Personal todo" entry
|
||||
(file+headline +org-capture-todo-file "Inbox")
|
||||
"* TODO %^{TODO name}\nSCHEDULED: %T\n%a\n%i%?" :prepend t)
|
||||
("n" "Personal notes" entry
|
||||
(file+headline +org-capture-notes-file "Inbox")
|
||||
"* %u %?\n%i\n%a" :prepend t)
|
||||
("j" "Journal" entry
|
||||
(file+olp+datetree +org-capture-journal-file)
|
||||
"* %U %?\n%i\n%a" :prepend t)
|
||||
("p" "TFC Plan" entry
|
||||
(function chris/org-roam-capture-lesson-file)
|
||||
(file ".templates/tfcplantemplate.org")
|
||||
:prepend nil
|
||||
:jump-to-captured t
|
||||
:empty-lines 1)
|
||||
("r" "Templates for projects")
|
||||
("rt" "Project-local todo" entry
|
||||
(file+headline +org-capture-project-todo-file "Inbox")
|
||||
"* TODO %?\n%i\n%a" :prepend t)
|
||||
("rn" "Project-local notes" entry
|
||||
(file+headline +org-capture-project-notes-file "Inbox")
|
||||
"* %U %?\n%i\n%a" :prepend t)
|
||||
("rc" "Project-local changelog" entry
|
||||
(file+headline +org-capture-project-changelog-file "Unreleased")
|
||||
"* %U %?\n%i\n%a" :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)
|
||||
|
||||
;;(setq org-superstar-headline-bullets-list '("◉" "◈" "▸" "✬" "◎" "◇" "❉" "✙" "❖"))
|
||||
(setq olivetti-body-width 0.6)
|
||||
(setq olivetti-minimum-body-width 100)
|
||||
(setq org-imenu-depth 4)
|
||||
(setq org-odt-styles-file "/home/chris/org/style.odt")
|
||||
|
||||
(setq org-todo-keywords
|
||||
'((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "|" "DONE(d)" "CNCL(c)")
|
||||
(sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")))
|
||||
|
||||
|
||||
(add-hook 'org-mode-hook
|
||||
(toc-org-mode +1)
|
||||
(olivetti-mode +1))
|
||||
|
||||
(setq org-agenda-files
|
||||
'("/home/chris/org/DMPREADME.org" "/home/chris/org/DMPTODO.org" "/home/chris/org/inbox.org" "/home/chris/org/notes.org" "/home/chris/org/repetition.org" "/home/chris/org/tasks.org" "/home/chris/org/tfc_plans.org" "/home/chris/org/ministry_team.org" "/home/chris/org/todo.org" "/home/chris/org/newsletter.org"))
|
||||
(setq org-id-method 'ts)
|
||||
:general
|
||||
(chris/leader-keys "o a" 'org-agenda)
|
||||
(chris/leader-keys "c" 'org-capture))
|
||||
|
||||
(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)
|
||||
(goto-char (point-min))
|
||||
(search-forward "PLAN")))
|
||||
|
||||
(use-package org-roam
|
||||
:after org
|
||||
:config
|
||||
(setq org-roam-directory "~/org")
|
||||
(setq org-roam-buffer-width 0.25)
|
||||
(setq org-roam-file-exclude-regexp ".stversion.*\|.stfolder.*\|.*~.*\|.*sync.*")
|
||||
(setq org-roam-db-location "~/.dotemacs/org-roam.db")
|
||||
(setq 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 "${slug}"
|
||||
:head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")))
|
||||
|
||||
(setq org-roam-dailies-capture-templates
|
||||
'(("d" "daily" plain #'org-roam-capture--get-point ""
|
||||
:immediate-finish t
|
||||
:file-name "%<%Y-%m-%d>"
|
||||
:head "#+TITLE: %<%Y-%m-%d>\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* HFL\n* Tasks\n* Family\n** How Do I Love Abbie?")
|
||||
("b" "biblical daily" plain #'org-roam-capture--get-point ""
|
||||
:immediate-finish t
|
||||
:file-name "%<%Y-%m-%d>-bib"
|
||||
:head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))))
|
||||
|
||||
(use-package org-roam-server
|
||||
:config
|
||||
(setq org-roam-server-host "127.0.0.1"
|
||||
org-roam-server-port 8080
|
||||
org-roam-server-export-inline-images t
|
||||
org-roam-server-authenticate nil
|
||||
org-roam-server-serve-files t
|
||||
org-roam-server-network-label-truncate t
|
||||
org-roam-server-network-label-truncate-length 60
|
||||
org-roam-server-network-label-wrap-length 20)
|
||||
:after org-roam)
|
||||
|
||||
(add-hook 'org-roam-mode-hook org-roam-server-mode t)
|
||||
|
||||
(use-package magit
|
||||
:commands (magit-status magit-get-current-branch)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue