From 476f62281409cb1948658c3bb1032f7d2e9f4d2f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 25 May 2019 18:41:22 -0400
Subject: [PATCH] emacs: enable yasnippet globally and add a couple of snippets

---
 .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/init.el                                  | 5 ++---
 6 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/format
 create mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/new
 create mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/printf
 create mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/println
 create mode 100644 .emacs.d/etc/yasnippet/snippets/java-mode/return

diff --git a/.emacs.d/etc/yasnippet/snippets/java-mode/format b/.emacs.d/etc/yasnippet/snippets/java-mode/format
new file mode 100644
index 0000000..7620366
--- /dev/null
+++ b/.emacs.d/etc/yasnippet/snippets/java-mode/format
@@ -0,0 +1,5 @@
+# -*- 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
new file mode 100644
index 0000000..1ffd2e5
--- /dev/null
+++ b/.emacs.d/etc/yasnippet/snippets/java-mode/new
@@ -0,0 +1,5 @@
+# -*- 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
new file mode 100644
index 0000000..eac39a1
--- /dev/null
+++ b/.emacs.d/etc/yasnippet/snippets/java-mode/printf
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: printf
+# key: pf
+# --
+System.out.printf("$1${2:%n}");$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
new file mode 100644
index 0000000..7bb944c
--- /dev/null
+++ b/.emacs.d/etc/yasnippet/snippets/java-mode/println
@@ -0,0 +1,5 @@
+# -*- 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
new file mode 100644
index 0000000..977859e
--- /dev/null
+++ b/.emacs.d/etc/yasnippet/snippets/java-mode/return
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: return
+# key: r
+# --
+return $1;$0
\ No newline at end of file
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e236f40..42b2c79 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1508,11 +1508,10 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)
-  (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets")
+  (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)
-  :hook
-  (text-mode . yas-minor-mode))
+  (yas-global-mode))
 
 (use-package debbugs
   :straight (debbugs
-- 
2.20.1