Compare commits
3 Commits
b1161fb12d
...
14c9c0c75d
Author | SHA1 | Date | |
---|---|---|---|
14c9c0c75d | |||
0dbd262ec4 | |||
bbadac0cf1 |
84
config.el
84
config.el
@ -56,15 +56,19 @@
|
||||
(avy-lead-face-2-fg (internal-get-lisp-face-attribute 'avy-lead-face-2
|
||||
:background)))
|
||||
(custom-theme-set-faces! 'doom-one
|
||||
`(avy-lead-face :foreground ,avy-lead-face-fg
|
||||
:background nil
|
||||
:weight bold)
|
||||
`(avy-lead-face-0 :foreground ,avy-lead-face-0-fg
|
||||
:inherit avy-lead-face)
|
||||
`(avy-lead-face-1 :foreground ,avy-lead-face-1-fg
|
||||
:inherit avy-lead-face)
|
||||
`(avy-lead-face-2 :foreground ,avy-lead-face-2-fg
|
||||
:inherit avy-lead-face))))
|
||||
`(avy-lead-face
|
||||
:foreground ,avy-lead-face-fg
|
||||
:background nil
|
||||
:weight bold)
|
||||
`(avy-lead-face-0
|
||||
:foreground ,avy-lead-face-0-fg
|
||||
:inherit avy-lead-face)
|
||||
`(avy-lead-face-1
|
||||
:foreground ,avy-lead-face-1-fg
|
||||
:inherit avy-lead-face)
|
||||
`(avy-lead-face-2
|
||||
:foreground ,avy-lead-face-2-fg
|
||||
:inherit avy-lead-face))))
|
||||
(after! symbol-overlay
|
||||
(custom-theme-set-faces! nil
|
||||
'(symbol-overlay-default-face :inherit hl-line)))
|
||||
@ -210,6 +214,8 @@
|
||||
|
||||
;; Podman > docker.
|
||||
(after! docker (setq docker-command "podman"))
|
||||
(after! docker-tramp (setq docker-tramp-method "podman"
|
||||
docker-tramp-docker-executable "podman"))
|
||||
(after! dockerfile-mode (setq dockerfile-mode-command "podman"))
|
||||
|
||||
;; Fix git-gutter advice for magit.
|
||||
@ -229,6 +235,12 @@
|
||||
|
||||
;; Don't use the LSP formatter.
|
||||
(after! lsp (setq +format-with-lsp nil))
|
||||
(after! lsp-mode
|
||||
(lsp-register-client
|
||||
(make-lsp-client :new-connection (lsp-tramp-connection "clangd")
|
||||
:major-modes '(c-mode c++-mode)
|
||||
:remote? t
|
||||
:server-id 'clangd-remote)))
|
||||
|
||||
;; Python virtualenv configuration.
|
||||
(after! lsp-pyright
|
||||
@ -285,11 +297,11 @@
|
||||
|
||||
;; The only thing I actually missed from helm.
|
||||
(map! (:when (featurep! :completion vertico)
|
||||
:map vertico-map
|
||||
"C-l" (defun +x-vertico/directory-delete-one-word ()
|
||||
"Delete one directory or word before point."
|
||||
(interactive)
|
||||
(vertico-directory-delete-word 1))))
|
||||
:map vertico-map
|
||||
"C-l" (defun +x-vertico/directory-delete-one-word ()
|
||||
"Delete one directory or word before point."
|
||||
(interactive)
|
||||
(vertico-directory-delete-word 1))))
|
||||
|
||||
;; Extra VTerm configuration.
|
||||
(after! vterm
|
||||
@ -298,18 +310,18 @@
|
||||
|
||||
(map! :leader
|
||||
(:prefix-map ("o" . "open")
|
||||
(:when (featurep! :term vterm)
|
||||
:desc "Project VTerm" "p" #'+vterm/project/other-window
|
||||
:desc "Project VTerm (same window)" "P" #'+vterm/project/here
|
||||
:desc "VTerm" "t" #'+vterm/other-window
|
||||
:desc "VTerm (same window)" "T" #'+vterm/here)))
|
||||
(:when (featurep! :term vterm)
|
||||
:desc "Project VTerm" "p" #'+vterm/project/other-window
|
||||
:desc "Project VTerm (same window)" "P" #'+vterm/project/here
|
||||
:desc "VTerm" "t" #'+vterm/other-window
|
||||
:desc "VTerm (same window)" "T" #'+vterm/here)))
|
||||
|
||||
;; Tab key should indent and absolutely nothing more.
|
||||
(after! yasnippet
|
||||
(map! (:map yas-minor-mode-map
|
||||
"<tab>" nil
|
||||
"TAB" nil
|
||||
"<C-return>" #'yas-expand)))
|
||||
"<tab>" nil
|
||||
"TAB" nil
|
||||
"<C-return>" #'yas-expand)))
|
||||
|
||||
;; -----------------------------------------------------------------------------
|
||||
;; Configuration for additional packages on top of doom and its modules.
|
||||
@ -330,16 +342,28 @@
|
||||
(read-directory-name "Base directory: " nil default-directory t)))
|
||||
:config
|
||||
(map! (:map deadgrep-mode-map
|
||||
"C-o" (defun +x-deadgrep/open-result-other-window ()
|
||||
"Open the result in other window without changing to it."
|
||||
(interactive)
|
||||
(save-selected-window (deadgrep-visit-result-other-window)))
|
||||
"RET" #'deadgrep-visit-result-other-window)))
|
||||
"C-o" (defun +x-deadgrep/open-result-other-window ()
|
||||
"Open the result in other window without changing to it."
|
||||
(interactive)
|
||||
(save-selected-window (deadgrep-visit-result-other-window)))
|
||||
"RET" #'deadgrep-visit-result-other-window)))
|
||||
|
||||
;; Duplicate things.
|
||||
(use-package! duplicate-thing
|
||||
:bind (("M-C" . duplicate-thing)))
|
||||
|
||||
;; Debugger.
|
||||
(use-package! gud
|
||||
:defer t
|
||||
:init
|
||||
(setq-default
|
||||
;; Use gdb-many-windows by default.
|
||||
gdb-many-windows t
|
||||
;; Display source file containing main.
|
||||
gdb-show-main t)
|
||||
:config
|
||||
(setq gud-chdir-before-run nil))
|
||||
|
||||
;; P4 programming mode.
|
||||
(use-package! p4_16-mode
|
||||
:mode (("\\.p4\\'" . p4_16-mode)
|
||||
@ -442,7 +466,7 @@
|
||||
(error "No file on this line"))))
|
||||
|
||||
(map! (:map dired-mode-map
|
||||
"W" #'+x/browse-url-of-dired-file)))
|
||||
"W" #'+x/browse-url-of-dired-file)))
|
||||
|
||||
;; -----------------------------------------------------------------------------
|
||||
;; Global keybindings.
|
||||
@ -455,7 +479,7 @@
|
||||
"C->" #'+x/scroll-up-one
|
||||
"M-Q" #'+x/unfill-paragraph
|
||||
(:map org-mode-map
|
||||
"C-c C-;" #'+x/org-insert-link-with-title)
|
||||
"C-c C-;" #'+x/org-insert-link-with-title)
|
||||
;; Faster navigation with avy.
|
||||
"M-g M-c" #'avy-goto-char
|
||||
"M-g M-v" #'avy-goto-char-2
|
||||
@ -465,7 +489,7 @@
|
||||
"M-g M-t" #'avy-goto-char-timer
|
||||
"M-g M-j" #'avy-resume
|
||||
(:map isearch-mode-map
|
||||
"C-'" #'avy-isearch)
|
||||
"C-'" #'avy-isearch)
|
||||
;; Create binding before dired is loaded.
|
||||
"C-x C-j" #'dired-jump
|
||||
;; More convenient window switching.
|
||||
|
Loading…
Reference in New Issue
Block a user