From 5c39aa2bfa619e11133cab82c35a538352adb575 Mon Sep 17 00:00:00 2001 From: Mars Date: Sat, 5 Oct 2024 23:08:56 -0400 Subject: [PATCH] weh --- config.org | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/config.org b/config.org index 307d1e6..47c8c04 100644 --- a/config.org +++ b/config.org @@ -119,6 +119,25 @@ (doom-modeline-mode)) #+end_src +** VTerm + +#+begin_src emacs-lisp + (use-package vterm + :ensure t + :config + (setq vterm-timer-delay 0.01)) + + (use-package shackle + :ensure t + :config + (setq shackle-rules + '(("\\*vterm\\*" :regexp t :popup t :align 'below :size 0.4 :select t))) + (shackle-mode 1)) + + (use-package vterm-toggle + :ensure t) +#+end_src + ** Nix #+begin_src emacs-lisp @@ -197,7 +216,9 @@ :ensure t :config (general-define-key - :states '(normal visual emacs))) + :states '(normal visual emacs) + :keymaps 'override + "C-t" '(vterm-toggle :wk "Toggle VTerm"))) (use-package evil-collection :ensure t @@ -238,12 +259,6 @@ (use-package lsp-bridge :ensure '(lsp-bridge :type git :host github :repo "manateelazycat/lsp-bridge" :files (:defaults "*")) :init - (defun my/lsp-bridge-find-def () - (interactive) - (let ((prev-marker (point-marker))) - (lsp-bridge-find-def) - (xref-push-marker-stack prev-marker))) - (defun lsp-bridge-mode-hook-func () (with-eval-after-load 'corfu (corfu-mode -1)) @@ -260,18 +275,18 @@ (evil-define-key 'normal 'local (kbd "gr") #'lsp-bridge-find-references) (evil-define-key 'normal 'local (kbd "K") #'lsp-bridge-popup-documentation)) - (setq lsp-bridge-enable-log nil - acm-enable-icon t - acm-enable-doc t - acm-enable-tabnine nil - acm-enable-quick-access t) + (setq lsp-bridge-enable-log t + lsp-bridge-nix-lsp-server "nil" + acm-enable-icon t + acm-enable-doc t + acm-enable-tabnine nil + acm-enable-quick-access t) (require 'lsp-bridge) (evil-set-initial-state 'lsp-bridge-ref-mode 'insert) (add-hook 'lsp-bridge-mode-hook #'lsp-bridge-mode-hook-func) - ;; Enable lsp-bridge. - (add-hook 'c++-mode-hook #'lsp-bridge-mode)) + (add-hook 'prog-mode-hook #'lsp-bridge-mode)) #+end_src *** TreeSitter