From b08fa2c1c27e54af7834900ee0a5ac392679b8f3 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 19 Nov 2022 19:12:43 -0500 Subject: Drop YASnippet I don't really need these or use them nearly as much as I used to. For similar needs, I think I'll be able to get by using Emacs's own Abbrev just fine. --- .emacs.d/etc/yasnippet/snippets/java-mode/format | 5 ---- .emacs.d/etc/yasnippet/snippets/java-mode/new | 5 ---- .emacs.d/etc/yasnippet/snippets/java-mode/printf | 5 ---- .emacs.d/etc/yasnippet/snippets/java-mode/println | 5 ---- .emacs.d/etc/yasnippet/snippets/java-mode/return | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/cite | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/eg | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/emph | 5 ---- .../etc/yasnippet/snippets/latex-mode/enumerate | 7 ----- .emacs.d/etc/yasnippet/snippets/latex-mode/etal | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/etc | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/ie | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/itemize | 7 ----- .emacs.d/etc/yasnippet/snippets/latex-mode/label | 5 ---- .../etc/yasnippet/snippets/latex-mode/newcommand | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/ref | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/section | 8 ------ .../etc/yasnippet/snippets/latex-mode/subsection | 8 ------ .emacs.d/etc/yasnippet/snippets/latex-mode/textbf | 5 ---- .emacs.d/etc/yasnippet/snippets/latex-mode/texttt | 5 ---- .../etc/yasnippet/snippets/latex-mode/usepackage | 5 ---- .../etc/yasnippet/snippets/log-edit-mode/thankgnu | 5 ---- .../etc/yasnippet/snippets/message-mode/thankgnu | 7 ----- .emacs.d/init.el | 31 ++-------------------- 24 files changed, 2 insertions(+), 156 deletions(-) delete mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/format delete mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/new delete mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/printf delete mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/println delete mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/return delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/cite delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/eg delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/emph delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/enumerate delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/etal delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/etc delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/ie delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/itemize delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/label delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/newcommand delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/ref delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/section delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/subsection delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/textbf delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/texttt delete mode 100644 .emacs.d/etc/yasnippet/snippets/latex-mode/usepackage delete mode 100644 .emacs.d/etc/yasnippet/snippets/log-edit-mode/thankgnu delete mode 100644 .emacs.d/etc/yasnippet/snippets/message-mode/thankgnu diff --git a/.emacs.d/etc/yasnippet/snippets/java-mode/format b/.emacs.d/etc/yasnippet/snippets/java-mode/format deleted file mode 100644 index 7620366..0000000 --- a/.emacs.d/etc/yasnippet/snippets/java-mode/format +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: String.format -# key: f -# -- -String.format("$1${2:%n}");$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/java-mode/new b/.emacs.d/etc/yasnippet/snippets/java-mode/new deleted file mode 100644 index 1ffd2e5..0000000 --- a/.emacs.d/etc/yasnippet/snippets/java-mode/new +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: new -# key: new -# -- -${1:Type} ${2:obj} = new ${3:Constr}(${4:args});$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/java-mode/printf b/.emacs.d/etc/yasnippet/snippets/java-mode/printf deleted file mode 100644 index 1b8c277..0000000 --- a/.emacs.d/etc/yasnippet/snippets/java-mode/printf +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: printf -# key: pf -# -- -System.out.printf("$1${2:%n}"$3);$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/java-mode/println b/.emacs.d/etc/yasnippet/snippets/java-mode/println deleted file mode 100644 index 7bb944c..0000000 --- a/.emacs.d/etc/yasnippet/snippets/java-mode/println +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: println -# key: p -# -- -System.out.println($1);$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/java-mode/return b/.emacs.d/etc/yasnippet/snippets/java-mode/return deleted file mode 100644 index 977859e..0000000 --- a/.emacs.d/etc/yasnippet/snippets/java-mode/return +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: return -# key: r -# -- -return $1;$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/cite b/.emacs.d/etc/yasnippet/snippets/latex-mode/cite deleted file mode 100644 index 3b4d161..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/cite +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: cite -# key: c -# -- -$1${2:~}\cite{${3:$$(unless yas-modified-p (mapconcat 'identity (reftex-citation 'dont-insert) ","))}}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/eg b/.emacs.d/etc/yasnippet/snippets/latex-mode/eg deleted file mode 100644 index 7c025e3..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/eg +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: eg -# key: eg -# -- -\emph{e.g.}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/emph b/.emacs.d/etc/yasnippet/snippets/latex-mode/emph deleted file mode 100644 index 36b19d7..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/emph +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: emph -# key: e -# -- -\emph{$1}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/enumerate b/.emacs.d/etc/yasnippet/snippets/latex-mode/enumerate deleted file mode 100644 index bcb1df1..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/enumerate +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# name: enumerate -# key: o -# -- -\begin{enumerate} -\item $0 -\end{enumerate} \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/etal b/.emacs.d/etc/yasnippet/snippets/latex-mode/etal deleted file mode 100644 index 96e1fb0..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/etal +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: etal -# key: etal -# -- -\emph{et~al.}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/etc b/.emacs.d/etc/yasnippet/snippets/latex-mode/etc deleted file mode 100644 index 86b698e..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/etc +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: etc -# key: etc -# -- -\emph{etc.}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/ie b/.emacs.d/etc/yasnippet/snippets/latex-mode/ie deleted file mode 100644 index cb91c2a..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/ie +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: ie -# key: ie -# -- -\emph{i.e.}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/itemize b/.emacs.d/etc/yasnippet/snippets/latex-mode/itemize deleted file mode 100644 index b7a6949..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/itemize +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# name: itemize -# key: u -# -- -\begin{itemize} -\item $0 -\end{itemize} \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/label b/.emacs.d/etc/yasnippet/snippets/latex-mode/label deleted file mode 100644 index 8a98d7e..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/label +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: label -# key: lbl -# -- -\label{$0} \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/newcommand b/.emacs.d/etc/yasnippet/snippets/latex-mode/newcommand deleted file mode 100644 index e9e03ca..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/newcommand +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: newcommand -# key: cmd -# -- -\newcommand{\\${1:name}}${2:[${3:0}]}{$0} \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/ref b/.emacs.d/etc/yasnippet/snippets/latex-mode/ref deleted file mode 100644 index 7eef596..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/ref +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: ref -# key: r -# -- -$1${2:~}\ref{${3:$$(unless yas-modified-p (reftex-reference nil nil))}}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/section b/.emacs.d/etc/yasnippet/snippets/latex-mode/section deleted file mode 100644 index e1a2710..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/section +++ /dev/null @@ -1,8 +0,0 @@ -# -*- mode: snippet -*- -# name: section -# key: s -# -- -\section{${1:name}} -\label{sec:${2:label}} - -$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/subsection b/.emacs.d/etc/yasnippet/snippets/latex-mode/subsection deleted file mode 100644 index ddfa13d..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/subsection +++ /dev/null @@ -1,8 +0,0 @@ -# -*- mode: snippet -*- -# name: subsection -# key: ss -# -- -\subsection{${1:name}} -\label{sec:${2:label}} - -$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/textbf b/.emacs.d/etc/yasnippet/snippets/latex-mode/textbf deleted file mode 100644 index 84171d7..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/textbf +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: textbf -# key: b -# -- -\textbf{$1}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/texttt b/.emacs.d/etc/yasnippet/snippets/latex-mode/texttt deleted file mode 100644 index 43cd769..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/texttt +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: texttt -# key: tt -# -- -\texttt{$1}$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/latex-mode/usepackage b/.emacs.d/etc/yasnippet/snippets/latex-mode/usepackage deleted file mode 100644 index 3405077..0000000 --- a/.emacs.d/etc/yasnippet/snippets/latex-mode/usepackage +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: usepackage -# key: p -# -- -\usepackage{$0} \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/log-edit-mode/thankgnu b/.emacs.d/etc/yasnippet/snippets/log-edit-mode/thankgnu deleted file mode 100644 index eafcbd7..0000000 --- a/.emacs.d/etc/yasnippet/snippets/log-edit-mode/thankgnu +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: thankgnu -# key: th -# -- -[RT#$1] Add ${2:$$(yas-choose-value '("Contributor" "Sustaining Contributor" "Patron"))} $3 to the 20${4:21} ThankGNUs list$0 \ No newline at end of file diff --git a/.emacs.d/etc/yasnippet/snippets/message-mode/thankgnu b/.emacs.d/etc/yasnippet/snippets/message-mode/thankgnu deleted file mode 100644 index 35c233a..0000000 --- a/.emacs.d/etc/yasnippet/snippets/message-mode/thankgnu +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# name: thankgnu -# key: th -# -- -Added ${2:$$(yas-choose-value '("Contributor" "Sustaining Contributor" "Patron"))} $3 to 20${4:21}supporters.html. - -Moving to campaigns.$0 diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f8a44e7..525348d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -60,8 +60,7 @@ ;; (debbugs "0.29") ;; (delight "1.7") ;; (emms "7.7") - ;; (rt-liberation "2.4") - ;; (yasnippet "0.14.0"))) + ;; (rt-liberation "2.4"))) (package-initialize)) (setq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa") @@ -778,31 +777,6 @@ Effectively a very simple light/dark theme toggle switch." ;; Highlight TODO in buffers. (global-hl-todo-mode)) -(run-with-idle-timer 0.6 nil #'require 'yasnippet) -(with-eval-after-load 'yasnippet - (declare-function yas-reload-all - "yasnippet" (&optional no-jit interactive)) - (declare-function yas-maybe-expand-abbrev-key-filter - "yasnippet" (cmd)) - - (defconst yas-verbosity-cur yas-verbosity) - (setq yas-verbosity 2 - yas-snippet-dirs `(,(b/etc "yasnippet/snippets"))) - ;; (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t) - (yas-reload-all) - (setq yas-verbosity yas-verbosity-cur) - - (defun b/yas-maybe-expand-abbrev-key-filter (cmd) - (when (and (yas-maybe-expand-abbrev-key-filter cmd) - (not (bound-and-true-p git-commit-mode))) - cmd)) - (defconst b/yas-maybe-expand - '(menu-item "" yas-expand - :filter b/yas-maybe-expand-abbrev-key-filter)) - (define-key yas-minor-mode-map (kbd "SPC") b/yas-maybe-expand) - - (yas-global-mode)) - ;; `debbugs' (global-set-key (kbd "C-c D d") #'debbugs-gnu) (global-set-key (kbd "C-c D b") #'debbugs-gnu-bugs) @@ -880,8 +854,7 @@ Effectively a very simple light/dark theme toggle switch." (with-eval-after-load 'delight (delight 'auto-fill-function " f" "simple") (delight 'abbrev-mode "" "abbrev") - (delight 'mml-mode " mml" "mml") - (delight 'yas-minor-mode "" "yasnippet")) + (delight 'mml-mode " mml" "mml")) (require 'bandali-po) -- cgit v1.2.3-60-g2f50