diff --git a/init.el b/init.el index 47931df..41654a3 100644 --- a/init.el +++ b/init.el @@ -1,60 +1,59 @@ -(setq custom-file "~/.emacs.d/custom.el") - -(setq display-line-numbers-type 'relative) -(global-display-line-numbers-mode 1) -(tool-bar-mode 0) -(menu-bar-mode 0) -;; (set-frame-parameter nil 'undecorated t) -;; (scroll-bar-mode 0) -(fido-vertical-mode 1) -(column-number-mode 1) -(delete-selection-mode 1) -(global-hl-line-mode 1) -(which-key-mode 1) - -;; window history C-c / -(winner-mode 1) - -(setq select-enable-clipboard t) - -(global-set-key (kbd "C-c n") #'complete-symbol) -(setq completions-max-height 10) ;; cap *Completions* window at 10 lines - -;; eglot-format reads tab-width (tabSize) and indent-tabs-mode (insertSpaces) -(setq-default d nil tab-width 4) - -;; per-language autoindent offsets (default 4) -(setq csharp-ts-mode-indent-offset 4 - c-ts-mode-indent-offset 4 - js-indent-level 4 - css-indent-offset 3) - -;; ts + html use 3 spaces (also makes eglot-format emit tabSize 3) -(add-hook 'typescript-ts-mode-hook - (lambda () (setq-local typescript-ts-mode-indent-offset 3 tab-width 3))) -(dolist (h '(mhtml-mode-hook html-mode-hook)) - (add-hook h (lambda () (setq-local sgml-basic-offset 3 tab-width 3)))) - -(add-hook 'before-save-hook 'delete-trailing-whitespace) -(setq-default truncate-lines t) - -(setq make-backup-files nil +(setq custom-file "~/.emacs.d/custom.el" + display-line-numbers-type 'relative + select-enable-clipboard t + completions-max-height 10 + make-backup-files nil + create-lockfiles nil auto-save-default nil) -(setq eglot-max-file-watches 1000000) +(global-set-key (kbd "C-c n") #'complete-symbol) +(add-hook 'before-save-hook 'delete-trailing-whitespace) + +(setq-default truncate-lines t) ;; package management (require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("gnu" . "https://elpa.gnu.org/packages/"))) -(setq package-install-upgrade-built-in t) ; allow upgrading built-ins (e.g. flymake for eglot 1.24) -(package-initialize) +(setq package-install-upgrade-built-in t) +(package-read-all-archive-contents) (unless package-archive-contents (package-refresh-contents)) -(setq use-package-always-ensure t) (require 'use-package) ;; modes +(global-display-line-numbers-mode 1) +(tool-bar-mode 0) +(menu-bar-mode 0) +;; (scroll-bar-mode 0) +(fido-vertical-mode 1) +(column-number-mode 1) +(delete-selection-mode 1) +(global-hl-line-mode 1) +(which-key-mode 1) +(winner-mode 1) + +(use-package hotfuzz + :config + (setq completion-styles '(hotfuzz) + completion-category-defaults nil + completion-category-overrides nil) + (add-hook 'icomplete-minibuffer-setup-hook + (lambda () + (kill-local-variable 'completion-styles)))) + +(use-package editorconfig + :config + (editorconfig-mode 1)) + +;; window-management +(use-package zoom-window + :config + (setq zoom-window-mode-line-color "firebrick")) + +(use-package doom-themes) +(load-theme 'doom-shades-of-purple t) + (use-package undo-tree :config (global-undo-tree-mode)) @@ -70,23 +69,19 @@ (use-package clipetty :hook (after-init . global-clipetty-mode)) -;; (setq evil-default-state 'emacs) -(setq evil-toggle-key "C-;") -(setq evil-want-C-u-scroll t) -(setq evil-want-keybinding nil) -(setq evil-want-Y-yank-to-eol t) - -(use-package evil) - -(use-package evil-collection - :after evil - :config - (evil-collection-init)) - (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-ts-mode)) (add-to-list 'auto-mode-alist '("\\.go\\'" . go-ts-mode)) +;; 1. Configure global Flycheck behavior instead of Flymake +(use-package flycheck + :config + (setq flycheck-display-errors-function #'flycheck-display-error-messages) + ;; Update only when you save or pause typing for a moment + (setq flycheck-check-syntax-automatically '(save idle-change)) + (setq flycheck-idle-change-delay 1.5) + (global-flycheck-mode 1)) + (use-package lsp-mode :commands (lsp lsp-deferred) :hook (;; Automatically trigger LSP for tree-sitter typescript modes @@ -101,47 +96,60 @@ :config (setq lsp-completion-provider :capf lsp-idle-delay 0.20 + lsp-diagnostics-provider :flycheck + lsp-diagnostic-clean-after-change nil lsp-headerline-breadcrumb-enable t - lsp-enable-folding t)) + lsp-eslint-enable t + lsp-enable-folding t)) -(use-package kkp) -(global-kkp-mode 1) -;; window-management -(use-package zoom-window - :ensure t +;; EVIL +;; (setq evil-default-state 'emacs) +(setq evil-toggle-key "C-a" + evil-want-C-u-scroll t + evil-disable-insert-state-bindings t + evil-want-keybinding nil + evil-undo-system 'undo-tree + evil-want-C-w-in-emacs-state t + evil-want-Y-yank-to-eol t) + +(use-package evil) + +(use-package evil-collection + :after evil :config - (setq zoom-window-mode-line-color "DarkGreen")) + (evil-collection-init)) -(define-key global-map (kbd "C-c w") 'zoom-window-zoom) -(global-set-key (kbd "C-c c") 'comment-line) - -(use-package doom-themes) -(load-theme 'doom-shades-of-purple t) (define-minor-mode git-mode - "git mode." - :keymap (make-sparse-keymap)) +"git mode." +:keymap (make-sparse-keymap)) (evil-set-leader 'normal (kbd "SPC")) (evil-define-key 'normal 'global (kbd "g") 'git-mode) (evil-define-key 'normal 'git-mode "k" 'diff-hl-previous-hunk) (evil-define-key 'normal 'git-mode "j" 'diff-hl-next-hunk) +(evil-define-key 'normal 'git-mode "p" 'diff-hl-show-hunk) +(evil-define-key 'normal 'git-mode "u" 'diff-hl-revert-hunk) +(evil-define-key 'normal 'git-mode "g" 'vc-dir) + +(evil-define-key 'normal 'global (kbd "fg") 'project-find-regexp) +(evil-define-key 'normal 'global (kbd "ff") 'project-find-file) +(evil-define-key 'normal 'global (kbd "kk") 'find-file) (evil-define-key 'normal 'global (kbd "C-w z") 'zoom-window-zoom) (evil-define-key 'normal 'global (kbd "gr") 'lsp-find-references) (evil-define-key 'insert 'global (kbd "C-n") 'completion-at-point) (evil-define-key 'normal 'global (kbd "gcc") 'comment-line) +(evil-define-key 'visual 'global (kbd "gc") 'comment-dwim) (with-eval-after-load 'minibuffer (keymap-set completion-in-region-mode-map "M-RET" nil) (keymap-set completion-in-region-mode-map "RET" #'minibuffer-choose-completion) (keymap-set completion-in-region-mode-map "C-p" #'minibuffer-previous-completion) (keymap-set completion-in-region-mode-map "C-n" #'minibuffer-next-completion) - ;; Make these bindings override Evil's state maps. (with-eval-after-load 'evil - (evil-make-overriding-map completion-in-region-mode-map) - (add-hook 'completion-in-region-mode-hook - #'evil-normalize-keymaps))) - + (evil-make-overriding-map completion-in-region-mode-map) + (add-hook 'completion-in-region-mode-hook + #'evil-normalize-keymaps))) (evil-mode 1)