Merge branch 'main' of ssh://code.metalisp.dev:2222/marcuskammer/emacs.d

This commit is contained in:
Marcus Kammer 2024-12-13 14:18:36 +01:00
commit ddc7347065

22
init.el
View file

@ -129,7 +129,7 @@
(setq-default custom-file "~/.emacs.d/bundle/custom_gnu.el" (setq-default custom-file "~/.emacs.d/bundle/custom_gnu.el"
browse-url-secondary-browser-function 'browse-url-firefox) browse-url-secondary-browser-function 'browse-url-firefox)
(unless (file-directory-p "~/cl-sites/") (unless (file-directory-p "~/cl-sites/")
(async-shell-command "git clone git@git.sr.ht:~marcuskammer/cl-sites ~/cl-sites"))) (async-shell-command "git clone https://code.metalisp.dev/marcuskammer/cl-sites.git ~/cl-sites")))
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
(setq-default explicit-shell-file-name (setq-default explicit-shell-file-name
@ -388,11 +388,21 @@
:config :config
(setq auto-insert-query nil) (setq auto-insert-query nil)
(let ((new-templates (let ((new-templates
'((("\\.sh\\'" . "Shell script header") nil "#!/bin/bash\n# -*- mode: shell-script; coding: utf-8; -*-\n") '((("\\.sh\\'" . "Shell script header")
(("\\.js\\'" . "JavaScript header") nil "#!/usr/bin/env node\n// -*- mode: js; coding: utf-8; -*-\n") nil
(("\\.css\\'" . "CSS header") nil "/* -*- mode: css; coding: utf-8; -*-\n * Dependencies: none\n */\n") "#!/bin/bash\n# -*- mode: shell-script; coding: utf-8; -*-\n")
(("\\.html\\'" . "HTML header") nil "<!-- -*- mode: web; coding: utf-8; -*- -->\n") (("\\.js\\'" . "JavaScript header")
(("\\.lisp\\'" . "Lisp header") nil ";;; -*- mode: lisp; coding: utf-8; -*-\n")))) nil
"#!/usr/bin/env node\n// -*- mode: js; coding: utf-8; -*-\n")
(("\\.css\\'" . "CSS header")
nil
"/* -*- mode: css; coding: utf-8; -*-\n * Dependencies: none\n */\n")
(("\\.html\\'" . "HTML header")
nil
"<!-- -*- mode: web; coding: utf-8; -*- -->\n")
(("\\.lisp\\'" . "Lisp header")
nil
";;; -*- mode: lisp; coding: utf-8; -*-\n"))))
(setq auto-insert-alist (nconc new-templates auto-insert-alist)))) (setq auto-insert-alist (nconc new-templates auto-insert-alist))))
(use-package tramp (use-package tramp