Fix keybinding conflict and remove dead Corfu code

- Change C-c r to C-c R for crux-rename-buffer-and-file to avoid
  conflict with consult-ripgrep-project-root
- Remove unused corfu and cape from package list, add company instead
- Remove dead Corfu/Cape integration code from init-eglot.el
- Include related indentation and formatting settings cleanup

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Jens Luedicke
2025-12-12 10:25:51 +01:00
parent 3a22e1e294
commit ba8b24b1d9
3 changed files with 83 additions and 21 deletions

View File

@@ -31,8 +31,7 @@
marginalia ; Rich annotations in minibuffer
embark ; Contextual actions
embark-consult ; Embark integration with Consult
corfu ; In-buffer completion popup
cape ; Completion extensions for Corfu
company ; In-buffer completion (configured in init-completion.el)
;; Markdown & Notes
markdown-mode markdown-toc grip-mode
@@ -55,14 +54,14 @@
;; God mode for modal editing
god-mode
;; Quality of life improvements
helpful ; Better help buffers
undo-tree ; Visual undo history
smartparens ; Better than electric-pair-mode
crux ; Collection of useful functions
ace-window ; Quick window switching
;; Terminal emulator
eat ; Emacs terminal emulator
))
@@ -96,6 +95,75 @@
;;; General Settings
(setq-default indent-tabs-mode nil)
(setq tab-width 4)
;; Set standard indentation offset for all modes
(setq-default standard-indent 4)
;; Mode-specific indentation settings (4 spaces)
(setq-default
;; JavaScript
js-indent-level 4
js2-basic-offset 4
js3-indent-level 4
;; TypeScript
typescript-indent-level 4
;; CSS/SCSS
css-indent-offset 4
scss-indent-offset 4
;; HTML/XML
sgml-basic-offset 4
nxml-child-indent 4
;; Shell scripts
sh-basic-offset 4
sh-indentation 4
;; Lisp
lisp-indent-offset 4
;; Other languages
perl-indent-level 4
cperl-indent-level 4
ruby-indent-level 4
rust-indent-offset 4
scala-indent:step 4
coffee-tab-width 4
lua-indent-level 4
go-ts-mode-indent-offset 4
;; C/C++ Allman style
c-basic-offset 4)
;; C/C++ style configuration - Allman/BSD style with braces on new lines
(setq c-default-style '((c-mode . "bsd")
(c++-mode . "bsd")
(java-mode . "java")
(awk-mode . "awk")
(other . "bsd")))
;; Ensure C/C++ modes use Allman style
(with-eval-after-load 'cc-mode
(defun apply-c-allman-style ()
"Ensure Allman style is applied to C/C++ buffers."
(c-set-style "bsd")
(setq c-basic-offset 4
indent-tabs-mode nil))
(add-hook 'c-mode-hook #'apply-c-allman-style)
(add-hook 'c++-mode-hook #'apply-c-allman-style))
;; Web-mode indentation (for HTML/JSX/TSX files)
(with-eval-after-load 'web-mode
(setq web-mode-markup-indent-offset 4
web-mode-css-indent-offset 4
web-mode-code-indent-offset 4
web-mode-attr-indent-offset 4
web-mode-script-padding 4
web-mode-style-padding 4))
(setq inhibit-startup-screen t)
(setq ring-bell-function 'ignore)
@@ -149,4 +217,4 @@
(message "Desktop restored"))))))
(provide 'init-core)
;;; init-core.el ends here
;;; init-core.el ends here