chris/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

adding eglot symbols and some other tweaks

Browse source
This commit is contained in:
Chris Cochrun 2023-01-27 13:55:56 -06:00
parent da84ac967c
commit 7fc4df5ade
2 changed files with 126 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
README.org
View file

@ -962,6 +962,7 @@ We also need to setup some capture templates to use some specific setups with my
:file-name "%<%Y-%m-%d>-bib" :file-name "%<%Y-%m-%d>-bib"
:target (file+head "%<%Y-%m-%d>-bib.org" "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* Notes") :target (file+head "%<%Y-%m-%d>-bib.org" "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* Notes")
:unnarrowed t))) :unnarrowed t)))
(set-face-attribute 'magit-section-highlight nil :inherit 'variable-pitch)
(org-roam-setup) (org-roam-setup)
:general :general
(chris/leader-keys (chris/leader-keys
@ -1618,7 +1619,8 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc
"sf" 'consult-find "sf" 'consult-find
"sm" 'bookmark-jump "sm" 'bookmark-jump
"sf" 'consult-flymake "sf" 'consult-flymake
"sy" 'consult-yank-from-kill-ring)) "sy" 'consult-yank-from-kill-ring
"sb" 'consult-eglot-symbols))
#+end_src #+end_src
*** MARGINALIA *** MARGINALIA
@ -1920,6 +1922,7 @@ I'm going to use projectile to keep my projects inline.
"op" 'projectile-switch-open-project "op" 'projectile-switch-open-project
"gc" 'projectile-compile-project "gc" 'projectile-compile-project
"gr" 'projectile-run-project "gr" 'projectile-run-project
"gd" 'projectile-run-gdb
"fp" 'project-find-file "fp" 'project-find-file
"fP" 'project-switch-project)) "fP" 'project-switch-project))
#+end_src #+end_src
@ -1965,41 +1968,70 @@ Ace link provides an avy like search for links. Upon using the keybindings prese
** Window Management ** Window Management
#+begin_src emacs-lisp #+begin_src emacs-lisp
(setq display-buffer-alist (setq display-buffer-alist
'(("\\*e?shell\\*" (if (string= system-name "syl")
(display-buffer-in-side-window) '(("\\*e?shell\\*"
(side . bottom) (display-buffer-in-side-window)
(window-height . 0.25)) (side . bottom)
("*helpful*" (window-height . 0.25))
(display-buffer-in-side-window) ("*helpful*"
(side . right) (display-buffer-in-side-window)
(window-width . 0.4)) (side . right)
(if (string= system-name "syl") (window-width . 0.4))
("*compilation*" ("*compilation*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
(window-width . 0.4)) (window-width . 0.4))
("*org-roam*"
(display-buffer-in-side-window)
(side . right)
(window-width . 0.4))
("\\*elfeed-entry\\*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.60))
("*Agenda Commands*"
(display-buffer-in-side-window)
(side . right)
(window-width . 0.30))
("\\*Bongo-Elfeed Queue\\*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.25))
("\\*Async Shell Command\\*"
(display-buffer-no-window))
)
'(("\\*e?shell\\*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.25))
("*helpful*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.25))
("*compilation*" ("*compilation*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . bottom) (side . bottom)
(window-height . 0.25))) (window-height . 0.25))
("*org-roam*" ("*org-roam*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
(window-width . 0.4)) (window-width . 0.3))
("\\*elfeed-entry\\*" ("\\*elfeed-entry\\*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . bottom) (side . bottom)
(window-height . 0.60)) (window-height . 0.70))
("*Agenda Commands*" ("*Agenda Commands*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
(window-width . 0.30)) (window-width . 0.30))
("\\*Bongo-Elfeed Queue\\*" ("\\*Bongo-Elfeed Queue\\*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . bottom) (side . bottom)
(window-height . 0.25)) (window-height . 0.25))
("\\*Async Shell Command\\*" ("\\*Async Shell Command\\*"
(display-buffer-no-window)) (display-buffer-no-window))
)
)) ))
#+end_src #+end_src
@ -2996,10 +3028,10 @@ Let's add our own eshell prompt. and set the password cache to a significantly h
"C-d" 'kill-buffer-and-window)) "C-d" 'kill-buffer-and-window))
#+end_src #+end_src
*** Esh-autosuggest *** Esh-autosuggest
#+begin_src emacs-lisp #+begin_src emacs-lisp :tangle no
;; (use-package esh-autosuggest (use-package esh-autosuggest
;; ;; :hook (eshell-mode . esh-autosuggest-mode) :hook (eshell-mode . esh-autosuggest-mode)
;; :ensure nil) :ensure nil)
#+end_src #+end_src
** Vterm ** Vterm

94
init.el
View file

@ -665,6 +665,7 @@
:file-name "%<%Y-%m-%d>-bib" :file-name "%<%Y-%m-%d>-bib"
:target (file+head "%<%Y-%m-%d>-bib.org" "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* Notes") :target (file+head "%<%Y-%m-%d>-bib.org" "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* Notes")
:unnarrowed t))) :unnarrowed t)))
(set-face-attribute 'magit-section-highlight nil :inherit 'variable-pitch)
(org-roam-setup) (org-roam-setup)
:general :general
(chris/leader-keys (chris/leader-keys
@ -1079,7 +1080,8 @@ If on a:
"sf" 'consult-find "sf" 'consult-find
"sm" 'bookmark-jump "sm" 'bookmark-jump
"sf" 'consult-flymake "sf" 'consult-flymake
"sy" 'consult-yank-from-kill-ring)) "sy" 'consult-yank-from-kill-ring
"sb" 'consult-eglot-symbols))
(use-package marginalia (use-package marginalia
:bind (:map minibuffer-local-map :bind (:map minibuffer-local-map
@ -1319,6 +1321,7 @@ targets."
"op" 'projectile-switch-open-project "op" 'projectile-switch-open-project
"gc" 'projectile-compile-project "gc" 'projectile-compile-project
"gr" 'projectile-run-project "gr" 'projectile-run-project
"gd" 'projectile-run-gdb
"fp" 'project-find-file "fp" 'project-find-file
"fP" 'project-switch-project)) "fP" 'project-switch-project))
@ -1345,41 +1348,70 @@ targets."
"gL" 'ace-link)) "gL" 'ace-link))
(setq display-buffer-alist (setq display-buffer-alist
'(("\\*e?shell\\*" (if (string= system-name "syl")
(display-buffer-in-side-window) '(("\\*e?shell\\*"
(side . bottom) (display-buffer-in-side-window)
(window-height . 0.25)) (side . bottom)
("*helpful*" (window-height . 0.25))
(display-buffer-in-side-window) ("*helpful*"
(side . right) (display-buffer-in-side-window)
(window-width . 0.4)) (side . right)
(if (string= system-name "syl") (window-width . 0.4))
("*compilation*" ("*compilation*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
(window-width . 0.4)) (window-width . 0.4))
("*org-roam*"
(display-buffer-in-side-window)
(side . right)
(window-width . 0.4))
("\\*elfeed-entry\\*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.60))
("*Agenda Commands*"
(display-buffer-in-side-window)
(side . right)
(window-width . 0.30))
("\\*Bongo-Elfeed Queue\\*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.25))
("\\*Async Shell Command\\*"
(display-buffer-no-window))
)
'(("\\*e?shell\\*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.25))
("*helpful*"
(display-buffer-in-side-window)
(side . bottom)
(window-height . 0.25))
("*compilation*" ("*compilation*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . bottom) (side . bottom)
(window-height . 0.25))) (window-height . 0.25))
("*org-roam*" ("*org-roam*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
(window-width . 0.4)) (window-width . 0.3))
("\\*elfeed-entry\\*" ("\\*elfeed-entry\\*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . bottom) (side . bottom)
(window-height . 0.60)) (window-height . 0.70))
("*Agenda Commands*" ("*Agenda Commands*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . right) (side . right)
(window-width . 0.30)) (window-width . 0.30))
("\\*Bongo-Elfeed Queue\\*" ("\\*Bongo-Elfeed Queue\\*"
(display-buffer-in-side-window) (display-buffer-in-side-window)
(side . bottom) (side . bottom)
(window-height . 0.25)) (window-height . 0.25))
("\\*Async Shell Command\\*" ("\\*Async Shell Command\\*"
(display-buffer-no-window)) (display-buffer-no-window))
)
)) ))
(defun chris/kill-buffer-frame () (defun chris/kill-buffer-frame ()
@ -2098,10 +2130,6 @@ targets."
(general-def '(normal insert) eshell-mode-map (general-def '(normal insert) eshell-mode-map
"C-d" 'kill-buffer-and-window)) "C-d" 'kill-buffer-and-window))
;; (use-package esh-autosuggest
;; ;; :hook (eshell-mode . esh-autosuggest-mode)
;; :ensure nil)
(setq vterm-buffer-name-string "vterm %s") (setq vterm-buffer-name-string "vterm %s")
(defun chris/vterm-setup () (defun chris/vterm-setup ()
"Setup vterm with my preferred settings" "Setup vterm with my preferred settings"