Emacs/Guix: Fix yasnippet support

master
Pierre Neidhardt 2018-06-21 19:20:27 +02:00
parent d2d06e6a3a
commit 599c995b2f
1 changed files with 8 additions and 4 deletions

View File

@ -187,11 +187,12 @@
;;; Guix
(when (executable-find "guix")
(nconc package-selected-packages '(guix))
(let ((guix-checkout "~/projects/guix"))
(when (require 'yasnippet nil t)
(yas-global-mode 1)
(with-eval-after-load 'yasnippet
(add-to-list 'yas-snippet-dirs (expand-file-name "etc/snippets" guix-checkout)))
(with-eval-after-load 'geiser-guile
(add-to-list 'geiser-guile-load-path guix-checkout)))
(add-to-list 'yas-snippet-dirs (expand-file-name "etc/snippets" "~/projects/guix"))))
(with-eval-after-load 'geiser-guile
(add-to-list 'geiser-guile-load-path "~/projects/guix"))
(defun ambrevar/init-guix ()
(and buffer-file-name
(string-match "\\<guix\\>" buffer-file-name)
@ -504,6 +505,9 @@
;;; Because XML is hard to read.
(add-hook 'nxml-mode-hook 'ambrevar/turn-on-tab-width-to-4)
;;; Yasnippet
(nconc package-selected-packages 'yasnippet)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Finalization