34 (global-hl-line-mode t) ; highlight current line |
34 (global-hl-line-mode t) ; highlight current line |
35 (global-set-key (kbd "C-c c") 'compile) ; compile |
35 (global-set-key (kbd "C-c c") 'compile) ; compile |
36 (global-set-key (kbd "C-c r") 'recompile) ; recompile |
36 (global-set-key (kbd "C-c r") 'recompile) ; recompile |
37 (global-set-key (kbd "C-c a") 'align-regexp) ; align |
37 (global-set-key (kbd "C-c a") 'align-regexp) ; align |
38 (global-set-key (kbd "C-c g") 'consult-ripgrep) ; ripgrep with preview |
38 (global-set-key (kbd "C-c g") 'consult-ripgrep) ; ripgrep with preview |
|
39 (global-set-key (kbd "C-x g") 'magit-status) ; magit status |
39 |
40 |
40 |
41 |
41 ;;; ediff |
42 ;;; ediff |
42 (setq-default |
43 (setq-default |
43 ediff-split-window-function 'split-window-horizontally |
44 ediff-split-window-function 'split-window-horizontally |
63 |
64 |
64 |
65 |
65 ;;;; Packages ;;;; |
66 ;;;; Packages ;;;; |
66 (require 'package-require) |
67 (require 'package-require) |
67 (package-require '(rg company exec-path-from-shell expand-region vertico |
68 (package-require '(rg company exec-path-from-shell expand-region vertico |
68 orderless consult marginalia magit markdown-mode hgignore-mode move-text paredit |
69 orderless consult marginalia magit forge magit-todos markdown-mode hgignore-mode move-text paredit |
69 rainbow-delimiters json-mode json-reformat flycheck treesit-auto |
70 rainbow-delimiters json-mode json-reformat flycheck treesit-auto |
70 solarized-theme terraform-mode visual-regexp yasnippet yaml-mode |
71 solarized-theme terraform-mode visual-regexp yasnippet yaml-mode |
71 emmet-mode)) |
72 emmet-mode)) |
72 |
73 |
73 ;; (custom-set-variables |
74 ;; (custom-set-variables |
156 (global-set-key (kbd "M-/") 'completion-at-point) |
157 (global-set-key (kbd "M-/") 'completion-at-point) |
157 (global-set-key (kbd "C-x b") 'consult-buffer) ; enhanced buffer switching |
158 (global-set-key (kbd "C-x b") 'consult-buffer) ; enhanced buffer switching |
158 (global-set-key (kbd "C-x 4 b") 'consult-buffer-other-window) |
159 (global-set-key (kbd "C-x 4 b") 'consult-buffer-other-window) |
159 (global-set-key (kbd "C-x 5 b") 'consult-buffer-other-frame) |
160 (global-set-key (kbd "C-x 5 b") 'consult-buffer-other-frame) |
160 (global-set-key (kbd "M-y") 'consult-yank-pop) ; enhanced yank-pop |
161 (global-set-key (kbd "M-y") 'consult-yank-pop) ; enhanced yank-pop |
|
162 |
|
163 |
|
164 ;;; magit |
|
165 (magit-todos-mode t) ; show TODOs in magit status |
161 |
166 |
162 |
167 |
163 ;;; emacs-lisp-mode |
168 ;;; emacs-lisp-mode |
164 (add-hook 'emacs-lisp-mode-hook 'enable-paredit-mode) |
169 (add-hook 'emacs-lisp-mode-hook 'enable-paredit-mode) |
165 |
170 |
264 ;; custom-set-variables was added by Custom. |
269 ;; custom-set-variables was added by Custom. |
265 ;; If you edit it by hand, you could mess it up, so be careful. |
270 ;; If you edit it by hand, you could mess it up, so be careful. |
266 ;; Your init file should contain only one such instance. |
271 ;; Your init file should contain only one such instance. |
267 ;; If there is more than one, they won't work right. |
272 ;; If there is more than one, they won't work right. |
268 '(package-selected-packages |
273 '(package-selected-packages |
269 '(magit yasnippet yaml-mode visual-regexp terraform-mode solarized-theme rg rainbow-delimiters paredit move-text markdown-mode json-reformat json-mode jinja2-mode hgignore-mode haskell-mode flycheck expand-region exec-path-from-shell company-ansible ansible-doc emmet-mode vertico orderless consult marginalia))) |
274 '(magit yasnippet yaml-mode visual-regexp terraform-mode solarized-theme rg rainbow-delimiters paredit move-text markdown-mode json-reformat json-mode jinja2-mode hgignore-mode haskell-mode flycheck expand-region exec-path-from-shell company-ansible ansible-doc emmet-mode vertico orderless consult marginalia treesit-auto))) |
270 (custom-set-faces |
275 (custom-set-faces |
271 ;; custom-set-faces was added by Custom. |
276 ;; custom-set-faces was added by Custom. |
272 ;; If you edit it by hand, you could mess it up, so be careful. |
277 ;; If you edit it by hand, you could mess it up, so be careful. |
273 ;; Your init file should contain only one such instance. |
278 ;; Your init file should contain only one such instance. |
274 ;; If there is more than one, they won't work right. |
279 ;; If there is more than one, they won't work right. |