skels: required some in init.org

4 files changed, 23 insertions, 21 deletions

diff --git a/init.org b/init.org
index d411e13..cf586d6 100644
--- a/init.org
+++ b/init.org
@@ -1022,6 +1022,24 @@
 
        (global-set-key "\C-ce" 'fc-eval-and-replace)
     #+END_SRC
+*** Skeletons and autoinsert
+    #+begin_src emacs-lisp
+      (use-package autoinsert
+        :config
+        (setq auto-insert-directory "~/.emacs.d/autoinsert/"
+              auto-insert t
+              auto-insert-query t)
+        (setf (alist-get 'html-mode auto-insert-alist nil t) nil))
+      (add-hook 'find-file-hooks #'auto-insert)
+
+      (use-package jao-skel
+        :demand t
+        :config
+        (require 'jao-skel-geiser)
+        (require 'jao-skel-lisp)
+        (require 'jao-skel-haskell)
+        (require 'jao-skel-latex))
+    #+end_src
 *** Completion
     #+begin_src emacs-lisp
       (jao-load-org "completion")
@@ -1048,16 +1066,6 @@
     (setq lock-file-name-transforms
           '(("\\`/.*/\\([^/]+\\)\\'" "/tmp/emacs-lock/\\1" t)))
     #+end_src
-*** autoinsert
-    #+BEGIN_SRC emacs-lisp
-      (use-package autoinsert
-        :config
-        (setq auto-insert-directory "~/.emacs.d/autoinsert/"
-              auto-insert t
-              auto-insert-quert t)
-        (setf (alist-get 'html-mode auto-insert-alist nil t) nil))
-      (add-hook 'find-file-hooks #'auto-insert)
-    #+END_SRC
 *** autorevert
     #+BEGIN_SRC emacs-lisp
       (setq auto-revert-check-vc-info nil)
diff --git a/lib/skels/jao-skel-geiser.el b/lib/skels/jao-skel-geiser.el
index 8e64c17..aa88238 100644
--- a/lib/skels/jao-skel-geiser.el
+++ b/lib/skels/jao-skel-geiser.el
@@ -1,4 +1,4 @@
-;; jao-geiser-fuel.el -- geiser skeletons  -*- lexical-binding: t; -*-
+;; jao-geiser-geiser.el -- geiser skeletons  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2009, 2022 Jose Antonio Ortega Ruiz
 
@@ -46,5 +46,5 @@
 
 
 
-(provide 'jao-geiser-fuel)
-;;; jao-geiser-fuel.el ends here
+(provide 'jao-skel-geiser)
+;;; jao-skel-geiser.el ends here
diff --git a/lib/skels/jao-skel-haskell.el b/lib/skels/jao-skel-haskell.el
index d785dbf..01a9936 100644
--- a/lib/skels/jao-skel-haskell.el
+++ b/lib/skels/jao-skel-haskell.el
@@ -26,11 +26,11 @@
 ;;; Code:
 
 (require 'jao-skel)
-(require 'jao-dominating-file)
+(require 'jao-compilation)
 
 ;;; Auxiliar
 (defun jao-skel--read-haskell-module ()
-  (let* ((ddir (jao-relative-path "\\.cabal\\'"))
+  (let* ((ddir (jao-compilation-root))
          (mbase (and ddir (concat (replace-regexp-in-string "/" "." ddir)
                                   ".")))
          (m (read-string "Module prefix (empty for no module): "
diff --git a/lib/skels/jao-skel.el b/lib/skels/jao-skel.el
index 9bd402d..3a6672c 100644
--- a/lib/skels/jao-skel.el
+++ b/lib/skels/jao-skel.el
@@ -94,10 +94,4 @@
 (defsubst jao-skel-install* (lst)
   (mapc (lambda (x) (apply #'jao-skel-install x))  lst))
 
-(setq auto-insert t)
-(add-hook 'find-file-hooks 'auto-insert)
-
-(setq auto-insert-directory "~/.emacs.d/autoinsert/")
-(setq auto-insert-query t)
-
 (provide 'jao-skel)