diff --git a/README.org b/README.org index a40562f0..eff4656c 100644 --- a/README.org +++ b/README.org @@ -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" :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))) + (set-face-attribute 'magit-section-highlight nil :inherit 'variable-pitch) (org-roam-setup) :general (chris/leader-keys @@ -1618,7 +1619,8 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc "sf" 'consult-find "sm" 'bookmark-jump "sf" 'consult-flymake - "sy" 'consult-yank-from-kill-ring)) + "sy" 'consult-yank-from-kill-ring + "sb" 'consult-eglot-symbols)) #+end_src *** MARGINALIA @@ -1920,6 +1922,7 @@ I'm going to use projectile to keep my projects inline. "op" 'projectile-switch-open-project "gc" 'projectile-compile-project "gr" 'projectile-run-project + "gd" 'projectile-run-gdb "fp" 'project-find-file "fP" 'project-switch-project)) #+end_src @@ -1965,41 +1968,70 @@ Ace link provides an avy like search for links. Upon using the keybindings prese ** Window Management #+begin_src emacs-lisp (setq display-buffer-alist - '(("\\*e?shell\\*" - (display-buffer-in-side-window) - (side . bottom) - (window-height . 0.25)) - ("*helpful*" - (display-buffer-in-side-window) - (side . right) - (window-width . 0.4)) - (if (string= system-name "syl") + (if (string= system-name "syl") + '(("\\*e?shell\\*" + (display-buffer-in-side-window) + (side . bottom) + (window-height . 0.25)) + ("*helpful*" + (display-buffer-in-side-window) + (side . right) + (window-width . 0.4)) ("*compilation*" (display-buffer-in-side-window) (side . right) (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*" (display-buffer-in-side-window) (side . bottom) - (window-height . 0.25))) - ("*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)) + (window-height . 0.25)) + ("*org-roam*" + (display-buffer-in-side-window) + (side . right) + (window-width . 0.3)) + ("\\*elfeed-entry\\*" + (display-buffer-in-side-window) + (side . bottom) + (window-height . 0.70)) + ("*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)) + ) )) #+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)) #+end_src *** Esh-autosuggest -#+begin_src emacs-lisp -;; (use-package esh-autosuggest -;; ;; :hook (eshell-mode . esh-autosuggest-mode) -;; :ensure nil) +#+begin_src emacs-lisp :tangle no +(use-package esh-autosuggest + :hook (eshell-mode . esh-autosuggest-mode) + :ensure nil) #+end_src ** Vterm diff --git a/init.el b/init.el index 53735a83..392b6d00 100644 --- a/init.el +++ b/init.el @@ -665,6 +665,7 @@ :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") :unnarrowed t))) + (set-face-attribute 'magit-section-highlight nil :inherit 'variable-pitch) (org-roam-setup) :general (chris/leader-keys @@ -1079,7 +1080,8 @@ If on a: "sf" 'consult-find "sm" 'bookmark-jump "sf" 'consult-flymake - "sy" 'consult-yank-from-kill-ring)) + "sy" 'consult-yank-from-kill-ring + "sb" 'consult-eglot-symbols)) (use-package marginalia :bind (:map minibuffer-local-map @@ -1319,6 +1321,7 @@ targets." "op" 'projectile-switch-open-project "gc" 'projectile-compile-project "gr" 'projectile-run-project + "gd" 'projectile-run-gdb "fp" 'project-find-file "fP" 'project-switch-project)) @@ -1345,41 +1348,70 @@ targets." "gL" 'ace-link)) (setq display-buffer-alist - '(("\\*e?shell\\*" - (display-buffer-in-side-window) - (side . bottom) - (window-height . 0.25)) - ("*helpful*" - (display-buffer-in-side-window) - (side . right) - (window-width . 0.4)) - (if (string= system-name "syl") + (if (string= system-name "syl") + '(("\\*e?shell\\*" + (display-buffer-in-side-window) + (side . bottom) + (window-height . 0.25)) + ("*helpful*" + (display-buffer-in-side-window) + (side . right) + (window-width . 0.4)) ("*compilation*" (display-buffer-in-side-window) (side . right) (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*" (display-buffer-in-side-window) (side . bottom) - (window-height . 0.25))) - ("*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)) + (window-height . 0.25)) + ("*org-roam*" + (display-buffer-in-side-window) + (side . right) + (window-width . 0.3)) + ("\\*elfeed-entry\\*" + (display-buffer-in-side-window) + (side . bottom) + (window-height . 0.70)) + ("*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)) + ) )) (defun chris/kill-buffer-frame () @@ -2098,10 +2130,6 @@ targets." (general-def '(normal insert) eshell-mode-map "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") (defun chris/vterm-setup () "Setup vterm with my preferred settings"