2 files changed, 38 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 5406395..6f945e8 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -253,6 +253,7 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
 (with-eval-after-load 'ruby-mode (load "oni-ruby-init"))
 (with-eval-after-load 'shackle (load "oni-shackle-init"))
 (with-eval-after-load 'align (load "oni-align"))
+(with-eval-after-load 'yasnippet (load "oni-yasnippet-init"))
 
 (add-hook 'ielm-mode-hook 'paredit-mode)
 
diff --git a/emacs/.emacs.d/init/oni-yasnippet-init.el b/emacs/.emacs.d/init/oni-yasnippet-init.el
new file mode 100755
index 0000000..3c7f4be
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-yasnippet-init.el
@@ -0,0 +1,37 @@
+;;; oni-yasnippet-init.el --- Yasnippet configuration  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; My yasnippet configuration.
+
+;;; Code:
+
+(require 'yasnippet)
+(require 'diminish)
+
+(diminish 'yas-minor-mode)
+
+(define-key yas-minor-mode-map (kbd "C-\\") 'yas-expand)
+(define-key yas-minor-mode-map (kbd "TAB") nil)
+(define-key yas-minor-mode-map (kbd "<tab>") nil)
+
+(provide 'oni-yasnippet-init)
+;;; oni-yasnippet-init.el ends here