diff --git a/init.el b/init.el index 68d2ec5..47931df 100644 --- a/init.el +++ b/init.el @@ -15,25 +15,13 @@ ;; window history C-c / (winner-mode 1) -;;(setq completion-styles '(hotfuzz)) -;; (setq completion-styles '(flex)) -;; (setq completion-styles '(orderless)) -;; (setq completion-styles '(substring)) (setq select-enable-clipboard t) -;; completion: RET accepts (drop Windows-colliding M-RET), C-n/C-p navigate, C-c i triggers -(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)) (global-set-key (kbd "C-c n") #'complete-symbol) (setq completions-max-height 10) ;; cap *Completions* window at 10 lines -;; --- indentation: spaces everywhere, default 4, ts/html = 3 --- ;; eglot-format reads tab-width (tabSize) and indent-tabs-mode (insertSpaces) -(setq-default d nil - tab-width 4) +(setq-default d nil tab-width 4) ;; per-language autoindent offsets (default 4) (setq csharp-ts-mode-indent-offset 4 @@ -82,13 +70,18 @@ (use-package clipetty :hook (after-init . global-clipetty-mode)) -(setq evil-default-state 'emacs) +;; (setq evil-default-state 'emacs) (setq evil-toggle-key "C-;") -(use-package evil) -(evil-mode 1) +(setq evil-want-C-u-scroll t) +(setq evil-want-keybinding nil) +(setq evil-want-Y-yank-to-eol t) -(use-package magit) -(setq magit-status-show-untracked-files 'all) +(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)) @@ -111,6 +104,8 @@ lsp-headerline-breadcrumb-enable t lsp-enable-folding t)) +(use-package kkp) +(global-kkp-mode 1) ;; window-management (use-package zoom-window :ensure t @@ -120,4 +115,33 @@ (define-key global-map (kbd "C-c w") 'zoom-window-zoom) (global-set-key (kbd "C-c c") 'comment-line) -(load-theme 'modus-vivendi) +(use-package doom-themes) +(load-theme 'doom-shades-of-purple t) + +(define-minor-mode git-mode + "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 '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) + +(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-mode 1)