aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-02-26 23:23:18 -0800
committerGravatar Tom Willemse2019-02-26 23:23:18 -0800
commit285b4395ac60704de7908c7f9ea5c1d3d48faeb1 (patch)
tree9c3020e5d39802614c7fca64d9b54e04bb1c5ac3 /emacs
parentcc9b18588a37eaa7ec7b6e4c6f744f1a0196fada (diff)
downloadnew-dotfiles-285b4395ac60704de7908c7f9ea5c1d3d48faeb1.tar.gz
new-dotfiles-285b4395ac60704de7908c7f9ea5c1d3d48faeb1.zip
Move yasnippet configuration to emacs-config
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el2
-rwxr-xr-xemacs/.emacs.d/init/oni-yasnippet-init.el37
2 files changed, 0 insertions, 39 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c713272..724ad6d 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -162,8 +162,6 @@
;; (propertize (concat " " (char-to-string #xf233))
;; 'face '(:family "Font Awesome" :height 0.75))))
-(with-eval-after-load 'yasnippet (load "oni-yasnippet-init"))
-
(add-hook 'ielm-mode-hook 'paredit-mode)
(add-hook 'prog-mode-hook 'goto-address-prog-mode)
diff --git a/emacs/.emacs.d/init/oni-yasnippet-init.el b/emacs/.emacs.d/init/oni-yasnippet-init.el
deleted file mode 100755
index 3c7f4be..0000000
--- a/emacs/.emacs.d/init/oni-yasnippet-init.el
+++ /dev/null
@@ -1,37 +0,0 @@
-;;; 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