marcuskammer/emacs.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

Browse source
This commit is contained in:
Marcus Kammer 2023-06-22 17:20:42 +02:00
commit 64af02d67f
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bundle/bundle--package.el
View file

@ -71,9 +71,8 @@
:mode (("\\.lisp$" . lisp-mode) :mode (("\\.lisp$" . lisp-mode)
("\\.lsp$" . lisp-mode) ("\\.lsp$" . lisp-mode)
("\\.cl$" . lisp-mode)) ("\\.cl$" . lisp-mode))
:custom
(lisp-indent-function 'common-lisp-indent-function)
:config :config
(setq lisp-indent-function 'common-lisp-indent-function)
(if (eq system-type 'windows-nt) (if (eq system-type 'windows-nt)
(setq inferior-lisp-program "sbcl --noinform") (setq inferior-lisp-program "sbcl --noinform")
(setq inferior-lisp-program "/usr/bin/sbcl --noinform")) (setq inferior-lisp-program "/usr/bin/sbcl --noinform"))
@ -329,13 +328,23 @@
;; (add-hook 'after-save-hook (lambda () (compile compile-command)))) ;; (add-hook 'after-save-hook (lambda () (compile compile-command))))
;; (add-hook 'c-mode-common-hook 'me/c-mode-compile-on-save)) ;; (add-hook 'c-mode-common-hook 'me/c-mode-compile-on-save))
(use-package js-mode ;; (use-package js-mode
:ensure nil ;; :ensure nil
:hook (js-mode . eglot-ensure) ;; :hook (js-mode . eglot-ensure)
:mode (("\\.webmanifest\\'" . js-mode) ;; :mode (("\\.webmanifest\\'" . js-mode)
("\\.js\\'" . js-mode) ;; ("\\.js\\'" . js-mode)
("\\.mjs\\'" . js-mode) ;; ("\\.mjs\\'" . js-mode)
("\\.cjs\\'" . js-mode))) ;; ("\\.cjs\\'" . js-mode)))
(use-package js2-mode
:defer t
:mode
(("\\.webmanifest\\'" . js2-mode)
("\\.js\\'" . js2-mode)
("\\.mjs\\'" . js2-mode)
("\\.cjs\\'" . js2-mode))
:config
(add-to-list 'interpreter-mode-alist '("node" . js2-mode)))
(use-package go-mode (use-package go-mode
:mode ("\\.go\\'" . go-mode) :mode ("\\.go\\'" . go-mode)
@ -460,15 +469,19 @@
(global-set-key (kbd "C-x M-g") 'magit-dispatch)) (global-set-key (kbd "C-x M-g") 'magit-dispatch))
(use-package yaml-mode (use-package yaml-mode
:defer t
:mode "\\.yml\\'") :mode "\\.yml\\'")
(use-package csv-mode (use-package csv-mode
:defer t
:mode "\\.csv\\'") :mode "\\.csv\\'")
(use-package markdown-mode (use-package markdown-mode
:defer t
:mode "\\.md\\'") :mode "\\.md\\'")
(use-package typescript-mode (use-package typescript-mode
:defer t
:mode "\\.ts\\'" :mode "\\.ts\\'"
:hook (typescript-mode . eglot-ensure) :hook (typescript-mode . eglot-ensure)
:config (setq typescript-indent-level 2)) :config (setq typescript-indent-level 2))