summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/custom.el2
-rw-r--r--init.org78
2 files changed, 39 insertions, 41 deletions
diff --git a/etc/custom.el b/etc/custom.el
index 013afe6..51be9a2 100644
--- a/etc/custom.el
+++ b/etc/custom.el
@@ -59,7 +59,7 @@
(or
(name . "^\\*scratch\\*$")
(name . "^\\*Messages\\*$"))))) t)
- '(ls-lisp-dirs-first t t)
+ '(ls-lisp-dirs-first t)
'(org-latex-packages-alist '(("" "listings") ("" "color")))
'(safe-local-variable-values
'((eval when
diff --git a/init.org b/init.org
index 44504ab..684bbf1 100644
--- a/init.org
+++ b/init.org
@@ -799,7 +799,7 @@ And here's where my actual Org configurations begin:
#+begin_src emacs-lisp
(use-feature org
- :defer 0.5
+ :defer 2
:config
(setq org-src-tab-acts-natively t
org-src-preserve-indentation nil
@@ -811,13 +811,6 @@ And here's where my actual Org configurations begin:
org-catch-invisible-edits 'show-and-error
org-log-done 'time)
(add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
- (font-lock-add-keywords
- 'org-mode
- '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
- (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
- (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
- (4 '(:foreground "#c5c8c6") t))) ; title
- t)
:bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
:hook ((org-mode . org-indent-mode)
(org-mode . auto-fill-mode)
@@ -835,20 +828,15 @@ And here's where my actual Org configurations begin:
(setq org-latex-listings 'listings
;; org-latex-prefer-user-labels t
)
- (add-to-list 'org-latex-packages-alist '("" "listings"))
- (add-to-list 'org-latex-packages-alist '("" "color"))
(add-to-list 'org-latex-classes
'("IEEEtran" "\\documentclass[11pt]{IEEEtran}"
- ("\\section{%s}" . "\\section*{%s}")
- ("\\subsection{%s}" . "\\subsection*{%s}")
+ ("\\section{%s}" . "\\section*{%s}")
+ ("\\subsection{%s}" . "\\subsection*{%s}")
("\\subsubsection{%s}" . "\\subsubsection*{%s}")
- ("\\paragraph{%s}" . "\\paragraph*{%s}")
- ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
- t))
-
-(use-feature ox-beamer
- :demand
- :after ox)
+ ("\\paragraph{%s}" . "\\paragraph*{%s}")
+ ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
+ t)
+ (require 'ox-beamer))
#+end_src
**** asynchronous tangle
@@ -887,7 +875,7 @@ file.
`(lambda (result)
(if result
(progn
- (setq byte-compile-warnings '(not noruntime unresolved))
+ ;; (setq byte-compile-warnings '(not noruntime unresolved))
(message "Tangled %s%s"
,file-nodir
(if a/show-async-tangle-time
@@ -916,7 +904,7 @@ Not just how I do git, but /the/ way to do git.
#+begin_src emacs-lisp
(use-package magit
- :defer 1
+ :defer 2
:bind (("C-x g" . magit-status)
("s-g s" . magit-status)
("s-g l" . magit-log-buffer-file))
@@ -1002,6 +990,7 @@ There's no way I could top that, so I won't attempt to.
#+begin_src emacs-lisp
(use-package counsel
+ :defer 0.6
:after ivy
:bind (([remap execute-extended-command] . counsel-M-x)
([remap find-file] . counsel-find-file)
@@ -1019,7 +1008,7 @@ There's no way I could top that, so I won't attempt to.
#+begin_src emacs-lisp
(use-feature eshell
- :defer 1
+ :defer 2
:commands eshell
:bind ("C-c a s e" . eshell)
:config
@@ -1299,7 +1288,7 @@ Automatically save place in each file.
#+begin_src emacs-lisp
(use-package company
- :defer 1
+ :defer 3
:bind
(:map company-active-map
([tab] . company-complete-common-or-cycle)
@@ -1386,7 +1375,7 @@ Automatically save place in each file.
** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]])
#+begin_src emacs-lisp
-(use-package proof-site
+(use-package proof-site ; Proof General
:straight proof-general)
#+end_src
@@ -1832,19 +1821,29 @@ Emacs package that displays available keybindings in popup
** theme helper functions
#+begin_src emacs-lisp
+(defvar a/org-mode-font-lock-keywords
+ '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
+ (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
+ (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
+ (4 '(:foreground "#c5c8c6") t)))) ; title
+
(defun a/lights-on ()
"Enable my favourite light theme."
(interactive)
(mapc #'disable-theme custom-enabled-themes)
(load-theme 'tangomod t)
- (sml/apply-theme 'automatic))
+ (sml/apply-theme 'automatic)
+ (font-lock-remove-keywords
+ 'org-mode a/org-mode-font-lock-keywords))
(defun a/lights-off ()
"Go dark."
(interactive)
(mapc #'disable-theme custom-enabled-themes)
(load-theme 'doom-tomorrow-night t)
- (sml/apply-theme 'automatic))
+ (sml/apply-theme 'automatic)
+ (font-lock-add-keywords
+ 'org-mode a/org-mode-font-lock-keywords t))
(bind-keys
("s-t d" . a/lights-off)
@@ -1901,7 +1900,7 @@ Emacs package that displays available keybindings in popup
#+begin_src emacs-lisp
(use-package helpful
- :defer 1
+ :defer 3
:bind
(("C-S-h c" . helpful-command)
("C-S-h f" . helpful-callable) ; helpful-function
@@ -1993,10 +1992,8 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
#+begin_src emacs-lisp
(use-package shrink-path
:defer 2
+ :after eshell
:config
- (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
- eshell-prompt-function #'+eshell/prompt)
-
(defun +eshell/prompt ()
(let ((base/dir (shrink-path-prompt default-directory)))
(concat (propertize (car base/dir)
@@ -2016,22 +2013,24 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
collect match))))
(if (not (eq branch nil))
(concat " " (substring branch 2))
- ""))))
+ "")))
+ (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
+ eshell-prompt-function #'+eshell/prompt))
#+end_src
** [[https://github.com/peterwvj/eshell-up][eshell-up]]
#+begin_src emacs-lisp
(use-package eshell-up
- :commands eshell-up
- :after eshell)
+ :after eshell
+ :commands eshell-up)
#+end_src
** multi-term
#+begin_src emacs-lisp
(use-package multi-term
- :defer 1
+ :defer 3
:bind (("C-c a s m" . multi-term-dedicated-toggle)
:map term-mode-map
("C-c C-j" . term-char-mode)
@@ -2304,6 +2303,7 @@ Convenient footnotes in =message-mode=.
#+begin_src emacs-lisp
(use-package ebdb
:straight (:host github :repo "girzel/ebdb")
+ :defer 2
:after gnus
:bind (:map gnus-group-mode-map ("e" . ebdb))
:config
@@ -2320,15 +2320,12 @@ Convenient footnotes in =message-mode=.
;; (ebdb-complete-enable))
(use-package company-ebdb
- :after (:all company message)
+ :defer 2
:config
- (defun company-ebdb--post-complete (_) nil)
- :hook
- (message-mode . (lambda ()
- (add-to-list (make-local-variable 'company-backends)
- 'company-ebdb))))
+ (defun company-ebdb--post-complete (_) nil))
(use-feature ebdb-gnus
+ :defer 3
:after ebdb
:demand
:custom
@@ -2341,6 +2338,7 @@ Convenient footnotes in =message-mode=.
(ebdb-gnus 0.3))))))
(use-feature ebdb-mua
+ :defer 3
:after ebdb
:demand
;; :custom (ebdb-mua-pop-up nil)