From ea5eea7046677784488e921f02d72e4534fa9dcd Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Mon, 7 Feb 2022 13:16:09 -0600 Subject: Change lisp-indent-function to common-lisp-indent-function --- init.el | 151 +++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 87 insertions(+), 64 deletions(-) diff --git a/init.el b/init.el index 4b4d668..4140814 100644 --- a/init.el +++ b/init.el @@ -209,14 +209,14 @@ ;; Transform URLs before passing to `browse-url' (:option +browse-url-transformations `((,(rx (or "youtube.com" "youtu.be")) - . ,+invidious-host) + . ,+invidious-host) ("twitter\\.com" . "nitter.net") ("instagram\\.com" . "bibilogram.art") (,(rx (or "reddit.com" "old.reddit.com")) - . "teddit.net") + . "teddit.net") ("medium\\.com" . "scribe.rip"))) (+browse-url-transform-url-global-mode +1)) @@ -290,6 +290,8 @@ (:bind "C-c C-c" #'eval-defun "C-c C-k" #'+elisp-eval-region-or-buffer "C-c C-z" #'ielm)) + (:with-mode (emacs-lisp-mode lisp-interaction-mode +init-mode lisp-mode) + (:local-set lisp-indent-function #'common-lisp-indent-function)) (advice-add #'eval-region :around #'+eval-region@pulse)) (setup eshell @@ -338,7 +340,7 @@ ;; Bind keys (dolist (binding '(("C-d" . +eshell-quit-or-delete-char))) (define-key eshell-mode-map - (kbd (car binding)) (cdr binding))) + (kbd (car binding)) (cdr binding))) ;; Environment variables (dolist (environment '(("PAGER" . "cat"))) (setenv (car environment) (cdr environment))))) @@ -524,7 +526,7 @@ org-startup-with-inline-images t org-tags-column (- (- fill-column (length org-ellipsis))) org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)" - "|" "DONE(d!)") + "|" "DONE(d!)") (sequence "|" "CANCELED(k@)") (sequence "MEETING(m)"))) (:bind "RET" #'+org-return-dwim @@ -594,27 +596,27 @@ (+org-capture-templates-setf "t" "Todo") (+org-capture-templates-setf "tt" `("Today!" entry (file "todo.org") - ,(concat "* TODO %^{Title}\n" - "DEADLINE: %t\n" - "\n%?"))) + ,(concat "* TODO %^{Title}\n" + "DEADLINE: %t\n" + "\n%?"))) (+org-capture-templates-setf "ts" `("Someday..." entry (file "todo.org") - ,(concat "* TODO %^{Title}\n" - ":PROPERTIES:\n" - ":CREATED: [%<%F %T>]\n" - ":END:\n" - "\n%?"))) + ,(concat "* TODO %^{Title}\n" + ":PROPERTIES:\n" + ":CREATED: [%<%F %T>]\n" + ":END:\n" + "\n%?"))) (+org-capture-templates-setf "tm" `("Media" entry (file "todo.org") - ,(concat "* TODO %^{TITLE}\n" - ":PROPERTIES:\n" - ":TITLE: %\\1\n" - ":AUTHOR: %^{AUTHOR}\n" - ":END:\n" - "\n%?"))) + ,(concat "* TODO %^{TITLE}\n" + ":PROPERTIES:\n" + ":TITLE: %\\1\n" + ":AUTHOR: %^{AUTHOR}\n" + ":END:\n" + "\n%?"))) (+org-capture-templates-setf "l" `("Link" entry (file "links.org") - "* %(+org-insert-link-dwim) %^g\n\n")) + "* %(+org-insert-link-dwim) %^g\n\n")) (+org-capture-templates-setf "w" "Work") (+org-capture-templates-setf "j" '("Journal entry" plain @@ -626,14 +628,14 @@ ;; from there. (+org-capture-templates-setf "s" `("SSH Config" plain (file "~/.ssh/config") - ,(concat "\n\nHost %^{Host: }" - "\nHostname %\\1" - "\nUser %^{User:|" (user-login-name) "}" - "\nIdentityFile %?" - "\nIdentitiesOnly yes" - "\nPubkeyAuthentication yes" - "\nPort %^{Port: |22}") - :unnarrowed t)) + ,(concat "\n\nHost %^{Host: }" + "\nHostname %\\1" + "\nUser %^{User:|" (user-login-name) "}" + "\nIdentityFile %?" + "\nIdentitiesOnly yes" + "\nPubkeyAuthentication yes" + "\nPort %^{Port: |22}") + :unnarrowed t)) (+org-capture-sort)) (setup org-contacts @@ -718,9 +720,9 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers." (with-current-buffer buffer (el-patch-wrap 2 - (save-restriction - (widen) - (string-equal (buffer-substring 1 10) ";; Emacs:"))))))) + (save-restriction + (widen) + (string-equal (buffer-substring 1 10) ";; Emacs:"))))))) (setup (:straight 0x0) (:option 0x0-default-server 'ttm) @@ -785,18 +787,30 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers." (:when-loaded (setf (alist-get ?. avy-dispatch-alist) #'avy-action-embark))) +(setup (:straight (bongo :type git + :flavor melpa + :files ("*.el" "*.texi" "images" "*.rb" "bongo-pkg.el" "*.info") + :pre-build ("makeinfo" "--no-split" "bongo.texi") + :host github + :repo "dbrock/bongo")) + (:also-load +bongo) + (:option bongo-default-directory "~/var/music") + (with-eval-after-load 'notifications + (add-hook 'bongo-player-metadata-changed-hook #'+bongo-notify))) + (setup (:straight (cape :host github :repo "minad/cape")) (dolist (fn - ;; All available cape capfs listed here. Add them to the front since - ;; they're reversed with `add-to-list'. - '(cape-file - cape-dabbrev - cape-keyword - cape-abbrev - cape-ispell - ;;cape-dict)) - (add-to-list 'completion-at-point-functions fn :append))))) + ;; All available cape capfs listed here. Add them to the front since + ;; they're reversed with `add-to-list'. + '(cape-file + cape-dabbrev + cape-keyword + cape-abbrev + cape-ispell + ;;cape-dict + )) + (add-to-list 'completion-at-point-functions fn :append))))) (setup (:straight circe) (:require _circe @@ -922,11 +936,11 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers." lui-track-indicator 'bar lui-fill-remove-face-from-newline nil lui-formatting-list `((,(+lui-make-formatting-list-rx "*") - 1 lui-strong-face) + 1 lui-strong-face) (,(+lui-make-formatting-list-rx "_") - 1 lui-emphasis-face) + 1 lui-emphasis-face) (,(+lui-make-formatting-list-rx "/") - 1 lui-emphasis-face)) + 1 lui-emphasis-face)) lui-autopaste-function (defun +0x0-upload-string (string) "Upload a string using 0x0." @@ -1168,8 +1182,8 @@ See also `crux-reopen-as-root-mode'." elfeed-curl-extra-arguments '("--insecure") elfeed-enclosure-default-dir (cl-loop for dir in '("~/var/download/" "~/Downloads/") - if (file-exists-p dir) - return dir) + if (file-exists-p dir) + return dir) elfeed-search-filter "@1-month-ago +unread" elfeed-search-trailing-width 24 elfeed-search-title-min-width 24 @@ -1201,8 +1215,8 @@ See also `crux-reopen-as-root-mode'." (elfeed-org) (+org-capture-templates-setf "f" `("Feed" entry - (file+olp ,(car rmh-elfeed-org-files) "Feeds") - "* %? %^g"))) + (file+olp ,(car rmh-elfeed-org-files) "Feeds") + "* %? %^g"))) (setup (:straight elpher)) @@ -1350,7 +1364,13 @@ See also `crux-reopen-as-root-mode'." (:option gcmh-idle-delay 'auto) (gcmh-mode +1)) -(setup (:straight geiser +(setup (:straight (geiser + :type git + :flavor melpa + :files ("elisp/*.el" "doc/*" "geiser-pkg.el") + :pre-build ("make" "-Cdoc" "geiser.info") + :host gitlab + :repo "emacs-geiser/geiser") geiser-chicken macrostep-geiser scheme-complete) @@ -1410,6 +1430,9 @@ See also `crux-reopen-as-root-mode'." (paredit-forward-delete arg)))) (global-hungry-delete-mode +1)) +(setup (:straight info+) + (:load-after info)) + (setup (:straight isearch-mb) ;; This complicatedness is an attempt to make it easier to add and ;; subtract `isearch-mb' bindings using the suggestions in the @@ -1435,11 +1458,11 @@ See also `crux-reopen-as-root-mode'." (setup (:straight (jabber :repo "https://tildegit.org/wgreenhouse/emacs-jabber" :host nil :files ("*.el" "*.texi" - ("jabber-fallback-lib" - "jabber-fallback-lib/hexrgb.el" - "jabber-fallback-lib/srv.el" - "jabber-fallback-lib/fsm.el") - "jabber-pkg.el") + ("jabber-fallback-lib" + "jabber-fallback-lib/hexrgb.el" + "jabber-fallback-lib/srv.el" + "jabber-fallback-lib/fsm.el") + "jabber-pkg.el") :fork (:repo "https://tildegit.org/acdw/emacs-jabber" :host nil))) (:also-load +jabber) @@ -1584,10 +1607,10 @@ See also `crux-reopen-as-root-mode'." (let ((facen (1+ facen-1))) (custom-set-faces `(,(intern (format "org-level-%s" facen)) - ((t :inherit - (,(intern (format "modus-themes-heading-%s" facen)) - fixed-pitch)) - :now))))) + ((t :inherit + (,(intern (format "modus-themes-heading-%s" facen)) + fixed-pitch)) + :now))))) (dawn-schedule #'modus-themes-load-operandi #'modus-themes-load-vivendi)) @@ -1816,11 +1839,11 @@ See also `crux-reopen-as-root-mode'." '(:eval (list (propertize " " - 'display - `((space - :align-to - ,(unless (bound-and-true-p visual-fill-column-mode) - 0)))) + 'display + `((space + :align-to + ,(unless (bound-and-true-p visual-fill-column-mode) + 0)))) (funcall topsy-fn)))))) (setup (:straight transpose-frame) @@ -1840,8 +1863,8 @@ See also `crux-reopen-as-root-mode'." (:option trashed-action-confirmer #'y-or-n-p)) (setup (:straight undo-fu) - (:+key "C-/" #'undo-fu-only-undo - "C-?" #'undo-fu-only-redo)) + (:global "C-/" #'undo-fu-only-undo + "C-?" #'undo-fu-only-redo)) (setup (:straight undo-fu-session) (:option undo-fu-session-incompatible-files '("/COMMIT_EDITMSG\\'" @@ -1861,7 +1884,7 @@ See also `crux-reopen-as-root-mode'." :host github :repo "minad/vertico" :files ("*" "extensions/*" - (:exclude ".git")))) + (:exclude ".git")))) (:also-load +vertico) (:option resize-mini-windows 'grow-only vertico-count-format nil -- cgit 1.4.1-21-gabe81