Adding performance tweaks through use-package and gcs
This commit is contained in:
parent
a55ff13fb3
commit
96ecdb6cf2
2 changed files with 281 additions and 181 deletions
203
init.el
203
init.el
|
|
@ -1,4 +1,14 @@
|
|||
;;; init.el -*- lexical-binding: t; -*-
|
||||
(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)
|
||||
|
||||
(setq gc-cons-threshold 50000000)
|
||||
|
||||
(setq inhibit-startup-message t)
|
||||
|
||||
(scroll-bar-mode -1)
|
||||
|
|
@ -24,14 +34,6 @@
|
|||
|
||||
(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))
|
||||
|
|
@ -48,8 +50,10 @@
|
|||
(setq straight-use-package-by-default t)
|
||||
|
||||
(straight-use-package 'use-package)
|
||||
(setq use-package-verbose t)
|
||||
|
||||
(use-package command-log-mode)
|
||||
(use-package command-log-mode
|
||||
:commands command-log-mode)
|
||||
|
||||
(use-package all-the-icons)
|
||||
|
||||
|
|
@ -68,12 +72,14 @@
|
|||
(use-package rainbow-delimiters
|
||||
:hook (prog-mode . rainbow-delimiters-mode))
|
||||
|
||||
(use-package adaptive-wrap)
|
||||
(use-package adaptive-wrap
|
||||
:defer t)
|
||||
|
||||
(use-package which-key
|
||||
:init (which-key-mode)
|
||||
:config
|
||||
(setq which-key-idle-delay 0.3))
|
||||
(setq which-key-idle-delay 0.3)
|
||||
(which-key-mode)
|
||||
:defer 1)
|
||||
|
||||
(use-package evil
|
||||
:init
|
||||
|
|
@ -84,7 +90,8 @@
|
|||
evil-respect-visual-line-mode t
|
||||
evil-want-C-u-delete t)
|
||||
:config
|
||||
(evil-mode +1))
|
||||
(evil-mode +1)
|
||||
(setq evil-undo-system 'undo-tree))
|
||||
|
||||
(use-package evil-collection
|
||||
:after evil
|
||||
|
|
@ -126,7 +133,14 @@
|
|||
:init (evil-escape-mode +1)
|
||||
:config (setq evil-escape-key-sequence "fd"))
|
||||
|
||||
(use-package olivetti)
|
||||
(use-package undo-tree
|
||||
:defer 1)
|
||||
|
||||
(use-package olivetti
|
||||
:after org
|
||||
:config
|
||||
(setq olivetti-body-width 0.6
|
||||
olivetti-minimum-body-width 100))
|
||||
|
||||
(use-package toc-org
|
||||
:after org)
|
||||
|
|
@ -142,7 +156,7 @@
|
|||
"C-S-j" 'selectrum-goto-end
|
||||
"C-S-k" 'selectrum-goto-beginning
|
||||
"TAB" 'selectrum-insert-current-candidate)
|
||||
:commands (completing-read))
|
||||
:commands completing-read)
|
||||
|
||||
(use-package prescient
|
||||
:config
|
||||
|
|
@ -154,7 +168,8 @@
|
|||
(selectrum-prescient-mode +1)
|
||||
:after selectrum)
|
||||
|
||||
(use-package consult)
|
||||
(use-package consult
|
||||
:after selectrum)
|
||||
|
||||
;; Enable richer annotations using the Marginalia package
|
||||
(use-package marginalia
|
||||
|
|
@ -179,91 +194,88 @@
|
|||
(setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
|
||||
:after selectrum)
|
||||
|
||||
(use-package helpful)
|
||||
(use-package helpful
|
||||
:commands (helpful-callable helpful-variable helpful-command helpful-key))
|
||||
|
||||
(use-package format-all
|
||||
:config
|
||||
(format-all-mode +1))
|
||||
(format-all-mode +1)
|
||||
:defer 1)
|
||||
|
||||
(defun chris/org-mode-setup ()
|
||||
(org-indent-mode +1)
|
||||
(toc-org-mode +1)
|
||||
(olivetti-mode +1))
|
||||
|
||||
(use-package org
|
||||
:config
|
||||
(setq org-startup-indented t)
|
||||
(defun chris/org-babel-tangle-config ()
|
||||
(when (string-equal (buffer-file-name)
|
||||
(expand-file-name "~/.personal-emacs/init.org"))
|
||||
(let ((org-confirm-babel-evaluate nil))
|
||||
(org-babel-tangle))))
|
||||
:config
|
||||
(setq org-startup-indented t
|
||||
org-edit-src-content-indentation 0)
|
||||
|
||||
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config)))
|
||||
(add-hook 'org-mode-hook 'chris/org-mode-setup)
|
||||
|
||||
(org-babel-do-load-languages
|
||||
'org-babel-load-languages
|
||||
'((emacs-lisp . t)
|
||||
(python . t)
|
||||
(shell . t)))
|
||||
(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"))
|
||||
(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-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-superstar-headline-bullets-list '("◉" "◈" "▸" "✬" "◎" "◇" "❉" "✙" "❖"))
|
||||
(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)")))
|
||||
(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))
|
||||
(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"
|
||||
|
|
@ -277,6 +289,15 @@
|
|||
(goto-char (point-min))
|
||||
(search-forward "PLAN")))
|
||||
|
||||
(defun chris/org-babel-tangle-config ()
|
||||
(when (string-equal (buffer-file-name)
|
||||
(expand-file-name "~/.dotemacs/README.org"))
|
||||
(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
|
||||
:append :local)))
|
||||
|
||||
(use-package org-roam
|
||||
:after org
|
||||
:config
|
||||
|
|
@ -324,5 +345,11 @@
|
|||
|
||||
(use-package magit
|
||||
:commands (magit-status magit-get-current-branch)
|
||||
:general
|
||||
(chris/leader-keys "g g" 'magit-status)
|
||||
:custom
|
||||
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
|
||||
|
||||
(setq gc-cons-threshold 2000000)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue