change back to yasnippet

24 files changed, 135 insertions, 25 deletions

diff --git a/bard-emacs-modules/bard-emacs-writing.el b/bard-emacs-modules/bard-emacs-writing.el
index 3d9d40c..ec5ac23 100644
--- a/bard-emacs-modules/bard-emacs-writing.el
+++ b/bard-emacs-modules/bard-emacs-writing.el
@@ -42,34 +42,18 @@
   (setq show-paren-context-when-offscreen 'overlay))
 
 ;; snippets
-
-(use-package tempel
+(use-package yasnippet
   :ensure t
-  :demand t
-  ;; Require trigger prefix before template name when completing.
-  :bind (("M-i" . tempel-complete) ;; Alternative tempel-expand
-         ("M-S-i" . tempel-insert))
-  :init
-
-  ;; Setup completion at point
-  (defun tempel-setup-capf ()
-    ;; Add the Tempel Capf to `completion-at-point-functions'.
-    ;; `tempel-expand' only triggers on exact matches. Alternatively use
-    ;; `tempel-complete' if you want to see all matches, but then you
-    ;; should also configure `tempel-trigger-prefix', such that Tempel
-    ;; does not trigger too often when you don't expect it. NOTE: We add
-    ;; `tempel-expand' *before* the main programming mode Capf, such
-    ;; that it will be tried first.
-    (setq-local completion-at-point-functions
-                (cons #'tempel-expand
-                      completion-at-point-functions)))
+  :config
+  (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
+  (yas-global-mode t)
+  )
 
-  :hook
-  ((conf-mode . tempel-setup-capf)
-   (prog-mode . tempel-setup-capf)
-   (text-mode . tempel-setup-capf))
+(use-package yasnippet-capf
+  :ensure t
+  :after cape
   :config
-  (setq tempel-path "~/.emacs.d/tempel-snippets.el"))
+  (add-to-list 'completion-at-point-functions #'yasnippet-capf))
 
 ;;; Notes
 (use-package denote
diff --git a/snippets/emacs-lisp-mode/hook b/snippets/emacs-lisp-mode/hook
new file mode 100644
index 0000000..3b05c39
--- /dev/null
+++ b/snippets/emacs-lisp-mode/hook
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: hook
+# key: hook
+# --
+(add-hook ${1:mode}-mode-hook #'$0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/key b/snippets/emacs-lisp-mode/key
new file mode 100644
index 0000000..045bb5a
--- /dev/null
+++ b/snippets/emacs-lisp-mode/key
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: define-key
+# key: key
+# --
+
+(define-key ${1:map} (kbd "${2:keybind}") #'$0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/up b/snippets/emacs-lisp-mode/up
new file mode 100644
index 0000000..dbe6f39
--- /dev/null
+++ b/snippets/emacs-lisp-mode/up
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: use-package
+# key: up
+# --
+(use-package $1
+  :ensure t
+  $0
+)
\ No newline at end of file
diff --git a/snippets/org-mode/appx b/snippets/org-mode/appx
new file mode 100644
index 0000000..a86f6f1
--- /dev/null
+++ b/snippets/org-mode/appx
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: approximately
+# key: appx
+# --
+
+\approx $0
\ No newline at end of file
diff --git a/snippets/org-mode/beg b/snippets/org-mode/beg
new file mode 100644
index 0000000..f8df24c
--- /dev/null
+++ b/snippets/org-mode/beg
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: begin{} ... end{}
+# key: beg
+# --
+\begin{${1}}
+$0
+\end{$1}
diff --git a/snippets/org-mode/begin b/snippets/org-mode/begin
new file mode 100644
index 0000000..7d2dedc
--- /dev/null
+++ b/snippets/org-mode/begin
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: begin{} ... end{}
+# key: begin
+# --
+\begin{${1}}
+$0
+\end{$1}
diff --git a/snippets/org-mode/center b/snippets/org-mode/center
new file mode 100644
index 0000000..df6a778
--- /dev/null
+++ b/snippets/org-mode/center
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: center
+# key: center
+# --
+\begin{center}
+$0
+\end{center}
diff --git a/snippets/org-mode/ddx b/snippets/org-mode/ddx
new file mode 100644
index 0000000..f25651f
--- /dev/null
+++ b/snippets/org-mode/ddx
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: derivative
+# key: ddx
+# --
+\frac{d}{dx}
diff --git a/snippets/org-mode/eq b/snippets/org-mode/eq
new file mode 100644
index 0000000..5c1edb8
--- /dev/null
+++ b/snippets/org-mode/eq
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: inline math
+# key: mk
+# --
+$${1}$0$$
diff --git a/snippets/org-mode/frac b/snippets/org-mode/frac
new file mode 100644
index 0000000..aa9ae09
--- /dev/null
+++ b/snippets/org-mode/frac
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: fraction
+# key: frac
+# --
+\frac{$1}{$2}$0
diff --git a/snippets/org-mode/geq b/snippets/org-mode/geq
new file mode 100644
index 0000000..a2c91cc
--- /dev/null
+++ b/snippets/org-mode/geq
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: greater or equal
+# key: geq
+# --
+\geq
diff --git a/snippets/org-mode/infty b/snippets/org-mode/infty
new file mode 100644
index 0000000..73bc1e2
--- /dev/null
+++ b/snippets/org-mode/infty
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: infinity
+# key: infty
+# --
+\infty
diff --git a/snippets/org-mode/leq b/snippets/org-mode/leq
new file mode 100644
index 0000000..0533f9f
--- /dev/null
+++ b/snippets/org-mode/leq
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: less or equal
+# key: leq
+# --
+\leq
diff --git a/snippets/org-mode/lim b/snippets/org-mode/lim
new file mode 100644
index 0000000..44f1901
--- /dev/null
+++ b/snippets/org-mode/lim
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: limit
+# key: lim
+# --
+\lim_{${1:n} \to ${2:\infty}} ${3:f(x)}
diff --git a/snippets/org-mode/mapsto b/snippets/org-mode/mapsto
new file mode 100644
index 0000000..ab26671
--- /dev/null
+++ b/snippets/org-mode/mapsto
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: mapsto
+# key: mapsto
+# --
+\mapsto
diff --git a/snippets/org-mode/mk b/snippets/org-mode/mk
new file mode 100644
index 0000000..8bb71a3
--- /dev/null
+++ b/snippets/org-mode/mk
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: inline math
+# key: mk
+# --
+$$0$
diff --git a/snippets/org-mode/neq b/snippets/org-mode/neq
new file mode 100644
index 0000000..5f85d32
--- /dev/null
+++ b/snippets/org-mode/neq
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: not equal
+# key: neq
+# --
+\neq
diff --git a/snippets/org-mode/now b/snippets/org-mode/now
new file mode 100644
index 0000000..5517e56
--- /dev/null
+++ b/snippets/org-mode/now
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: now
+# key: now
+# --
+<`(format-time-string "%Y-%m-%d %a %H:%M")`>
diff --git a/snippets/org-mode/prod b/snippets/org-mode/prod
new file mode 100644
index 0000000..1a8fcdf
--- /dev/null
+++ b/snippets/org-mode/prod
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: product
+# key: prod
+# --
+\prod
diff --git a/snippets/org-mode/sq b/snippets/org-mode/sq
new file mode 100644
index 0000000..25e1ee9
--- /dev/null
+++ b/snippets/org-mode/sq
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: sqrt
+# key: sq
+# --
+\sqrt{$1}
diff --git a/snippets/org-mode/sum b/snippets/org-mode/sum
new file mode 100644
index 0000000..be69a63
--- /dev/null
+++ b/snippets/org-mode/sum
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: sum
+# key: sum
+# --
+\sum
diff --git a/snippets/org-mode/time b/snippets/org-mode/time
new file mode 100644
index 0000000..108b567
--- /dev/null
+++ b/snippets/org-mode/time
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: time
+# key: time
+# --
+[`(format-time-string "%Y-%m-%d %a %H:%M")`]
diff --git a/snippets/org-mode/vec b/snippets/org-mode/vec
new file mode 100644
index 0000000..baf2365
--- /dev/null
+++ b/snippets/org-mode/vec
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: vector
+# key: vec
+# --
+\vec{$1}