changeset 38: |
891ace7526cc |
parent 37: |
964e4427f5ad |
child 39: |
86ce16b512b7 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Tue, 04 Jun 2024 22:00:23 -0400 |
files: |
.emacs.d/ellis.el |
description: |
fix use-package decl |
1.1--- a/.emacs.d/ellis.el Tue Jun 04 21:46:48 2024 -0400
1.2+++ b/.emacs.d/ellis.el Tue Jun 04 22:00:23 2024 -0400
1.3@@ -553,27 +553,18 @@
1.4
1.5 ;;; Skel Config
1.6 (use-package skel
1.7- :requires skel
1.8+ :defer t
1.9 :load-path user-emacs-lib-directory
1.10- :custom
1.11- tempo-interactive t
1.12- auto-insert 'unmodified
1.13- auto-insert-query nil
1.14- skt-enable-tempo-elements t
1.15- skt-delete-duplicate-marks t
1.16 :config
1.17+ (setq
1.18+ tempo-interactive t
1.19+ auto-insert 'no-modify
1.20+ auto-insert-query nil
1.21+ skt-enable-tempo-elements t
1.22+ skt-delete-duplicate-marks t)
1.23+
1.24 (defvar skt-default-version "0.1.0")
1.25- (skt-define-template readme (:mode org-mode :tag t)
1.26- "#+title: " (p "title: ") n
1.27- "#+description: " (p "description: ") n
1.28- "#+author: " user-full-name n
1.29- "#+email:" user-mail-address n
1.30- "#+setupfile: clean.theme" n
1.31- "#+export_file_name: index" n>
1.32- p n> n>
1.33- ":info:" n>
1.34- "+ version :: " skt-default-version n
1.35- ":end:" n>)
1.36+
1.37 (keymap-set skt-minor-mode-map "b" #'tempo-backward-mark)
1.38 (keymap-set skt-minor-mode-map "f" #'tempo-forward-mark)
1.39 (keymap-set skt-minor-mode-map "SPC" #'tempo-complete-tag)
1.40@@ -590,11 +581,34 @@
1.41 (if (string= (file-name-nondirectory buffer-file-name) "skelfile")
1.42 "skelfile"
1.43 (skt-buffer-path)))
1.44+
1.45+ ;; functions
1.46+ (skt-define-function capture (:abbrev "capture" :tag t) org-capture)
1.47+ (skt-define-function agenda (:abbrev "agenda" :tag t) org-agenda)
1.48+ (skt-define-function mjump (:abbrev "mjump" :tag t) bookmark-jump)
1.49+ (skt-define-function bjump (:abbrev "bjump" :tag t) ibuffer-jump)
1.50+ (skt-define-function rjump (:abbrev "rjump" :tag t)
1.51+ (lambda () (jump-to-register (read-char "register: "))))
1.52+ (skt-define-function pjump (:abbrev "pjump" :tag t) (lambda () (project-switch-project default-directory)))
1.53+
1.54+ ;; templates
1.55+ (skt-define-template readme (:mode org-mode :tag t)
1.56+ "#+title: " (p "title: ") n
1.57+ "#+description: " (p "description: ") n
1.58+ "#+author: " user-full-name n
1.59+ "#+email:" user-mail-address n
1.60+ "#+setupfile: clean.theme" n
1.61+ "#+export_file_name: index" n>
1.62+ p n> n>
1.63+ ":info:" n>
1.64+ "+ version :: " skt-default-version n
1.65+ ":end:" n>)
1.66+
1.67 ;; TODO 2024-06-04:
1.68 ;; (skt-define-template defsystem (:mode lisp-mode :tag t :abbrev "defsystem"))
1.69 ;; (skt-define-template defpackage (:mode lisp-mode :tag t :abbrev "defpackage"))
1.70 ;; (skt-define-template defpkg (:mode lisp-mode :tag t :abbrev "defpkg"))
1.71-
1.72+
1.73 (skt-define-template defmacro (:abbrev "defvar" :tag t :mode lisp-mode)
1.74 "(defmacro " (p "Name: ") " (" (p "Args: ") ")" > n> r ")")
1.75
1.76@@ -604,14 +618,7 @@
1.77 (skt-define-template defvar (:abbrev "defvar" :tag t :mode lisp-mode)
1.78 > "(defvar " > r ")")
1.79
1.80- (skt-define-function capture (:abbrev "capture" :tag t) org-capture)
1.81- (skt-define-function agenda (:abbrev "agenda" :tag t) org-agenda)
1.82- (skt-define-function mjump (:abbrev "mjump" :tag t) bookmark-jump)
1.83- (skt-define-function bjump (:abbrev "bjump" :tag t) ibuffer-jump)
1.84- (skt-define-function rjump (:abbrev "rjump" :tag t)
1.85- (lambda () (jump-to-register (read-char "register: "))))
1.86- (skt-define-function pjump (:abbrev "pjump" :tag t) (lambda () (project-switch-project default-directory)))
1.87-
1.88+ ;; skeletons
1.89 (skt-define-skeleton head (:abbrev "head" :mode lisp-mode)
1.90 "title: "
1.91 ";;; " (skt-buffer-path) " --- " str \n \n \n ";;; Code:" \n > _)
1.92@@ -668,6 +675,7 @@
1.93 (skt-register-auto-insert "readme.org" #'skt-template-org-readme)
1.94 (skt-register-auto-insert ".*[.]asd" #'skt-template-lisp-system-head)
1.95 (auto-insert-mode t)
1.96+
1.97 (keymap-set skel-minor-mode-map "C-<return>" 'company-tempo))
1.98
1.99 (provide 'ellis)