init.el

@@ -274,6 +274,7 @@ DOCSTRING is an optional form that is discarded upon expansion."
   ;; General configuration
   (frame-title-format '("%b — Emacs") "Set frame title to buffer name")
   (truncate-lines t "Truncate lines instead of wrapping")
+  (kill-whole-line t "Include newline character when killing a line")
   (context-menu-mode t "Enable global context menu support")
   (message-truncate-lines t "Truncate messages in the echo area")
   (cursor-in-non-selected-windows nil "Hide cursor in inactive windows")
@@ -402,15 +403,6 @@ DOCSTRING is an optional form that is discarded upon expansion."
   :mode
   ("\\.cppm\\'" . c++-ts-mode))
 
-;; ---------------------------------- ;;
-;; cmake-ts-mode
-;; ---------------------------------- ;;
-
-(editor-feature cmake-ts-mode
-  "Major mode for CMake files, using the Tree-sitter parsing library."
-  :mode
-  ("\\CMakeLists.txt\\'" . cmake-ts-mode))
-
 ;; ---------------------------------- ;;
 ;; compile
 ;; ---------------------------------- ;;
@@ -450,23 +442,20 @@ DOCSTRING is an optional form that is discarded upon expansion."
                                           eglot-hover-eldoc-function))
     (eglot-inlay-hints-mode -1))
   :config
-  (add-to-list 'eglot-server-programs `(svelte-mode . ("svelteserver" "--stdio")))
   ;; Remove the mode-line segment that Eglot adds
   (setq mode-line-misc-info (assoc-delete-all 'eglot--managed-mode mode-line-misc-info))
   :hook
   (c-ts-base-mode-hook . eglot-ensure)
-  (gdscript-mode-hook . eglot-ensure)
   (js-ts-mode-hook . eglot-ensure)
   (rust-ts-mode-hook . eglot-ensure)
-  (svelte-mode-hook . eglot-ensure)
   (typescript-mode-hook . eglot-ensure)
+  (gdscript-mode-hook . eglot-ensure)
   (eglot-managed-mode-hook . user/set-up-eglot)
   :bind
   (:map eglot-mode-map
         ("C-c \\" . eglot-format-buffer)
         ("C-c q" . eglot-code-action-quickfix)
-        ("C-c C-q" . eglot-code-actions)
-        ("M-s r ." . eglot-rename)))
+        ("C-c C-q" . eglot-code-actions)))
 
 ;; ---------------------------------- ;;
 ;; elec-pair
@@ -988,22 +977,16 @@ DOCSTRING is an optional form that is discarded upon expansion."
 (external-package markdown-mode
   "Major mode for Markdown files."
   :mode
-  ("\\.md\\'" . markdown-mode))
+  (("\\.md\\'" . markdown-mode)))
 
-(external-package svelte-mode
-  "Major mode for Svelte files."
+(external-package web-mode
+  "Major mode for web templates."
+  :custom
+  (web-mode-markup-indent-offset 2 "Use 2 spaces instead of 4 for indenting HTML elements")
+  (web-mode-enable-auto-quoting nil "Do not automatically insert quotes after HTML attributes")
   :mode
-  ("\\.svelte\\'" . svelte-mode))
-
-;; (external-package web-mode
-;;   "Major mode for web templates."
-;;   :custom
-;;   (web-mode-markup-indent-offset 2 "Use 2 spaces instead of 4 for indenting HTML elements")
-;;   (web-mode-enable-auto-quoting nil "Do not automatically insert quotes after HTML attributes")
-;;   :mode
-;;   ("\\.php\\'" . web-mode)
-;;   ("\\.html\\'" . web-mode)
-;;   ("\\.svelte\\'" . web-mode))
+  (("\\.php\\'" . web-mode)
+   ("\\.html\\'" . web-mode)))
 
 ;; ---------------------------------- ;;
 ;; anzu
@@ -1158,7 +1141,7 @@ DOCSTRING is an optional form that is discarded upon expansion."
   :bind
   (:map clj-refactor-map
         ("C-c ." . cljr-find-usages)
-        ("M-s r ." . cljr-rename-symbol)))
+        ("M-s M-r ." . cljr-rename-symbol)))
 
 ;; ---------------------------------- ;;
 ;; consult
@@ -1244,15 +1227,6 @@ DOCSTRING is an optional form that is discarded upon expansion."
   (global-diff-hl-mode)
   (diff-hl-flydiff-mode))
 
-;; ---------------------------------- ;;
-;; editorconfig-mode
-;; ---------------------------------- ;;
-
-(external-package editorconfig
-  "Reads EditorConfig files and applies appropriate formatting settings for projects."
-  :config
-  (editorconfig-mode))
-
 ;; ---------------------------------- ;;
 ;; eldoc-frame
 ;; ---------------------------------- ;;
@@ -1361,7 +1335,7 @@ DOCSTRING is an optional form that is discarded upon expansion."
   "Enables support for mapping characters to ligatures."
   :config
   (ligature-set-ligatures
-   '(sgml-mode prog-mode)
+   'prog-mode
    '(;; This set of ligatures is for Fira Code, but
      ;; should work for most any font with ligatures:
      ;; && &&&
@@ -1415,7 +1389,6 @@ DOCSTRING is an optional form that is discarded upon expansion."
      ("0" (rx (and "x" (+ (in "A-F" "a-f" "0-9")))))
      "Fl"  "Tl"  "fi"  "fj"  "fl"  "ft"))
   :hook
-  (sgml-mode-hook . ligature-mode)
   (prog-mode-hook . ligature-mode))
 
 ;; ---------------------------------- ;;
@@ -1647,7 +1620,7 @@ DOCSTRING is an optional form that is discarded upon expansion."
     (when (eq (car-safe elem) 'i)
       (if-let (template (alist-get (cadr elem) (tempel--templates)))
           (cons 'l (user/tempel-subst-names template (caddr elem)))
-        (message "user/tempel-include: Template not found: %s" (cadr elem)))))
+        (message "tempel-include: Template not found: %s" (cadr elem)))))
   (defun user/tempel-setup-capf ()
     "Add `tempel-complete' to `completion-at-point-functions' (buffer-local).
 If `tempel-complete' is already a member of `completion-at-point-functions', it
@@ -1666,15 +1639,13 @@ is promoted to the beginning of the list of hooked functions."
   :hook
   (prog-mode-hook . user/tempel-setup-capf)
   (text-mode-hook . user/tempel-setup-capf)
-  (conf-mode-hook . user/tempel-setup-capf)
   (eglot-managed-mode-hook . user/tempel-setup-capf)
   :bind
   (:map tempel-map
         ("RET" . tempel-done)
         ("<tab>" . tempel-next)
         ("<backtab>" . tempel-previous)
-        ("C-g" . tempel-abort)
-        ("C-k" . tempel-abort)))
+        ("C-g" . tempel-abort)))
 
 ;; ---------------------------------- ;;
 ;; treesit-auto