diff --git a/README.org b/README.org index 49ea139b..61da32fc 100644 --- a/README.org +++ b/README.org @@ -4598,11 +4598,8 @@ Emulate a terminal ** Vterm #+begin_src emacs-lisp (setq vterm-buffer-name-string "vterm %s" -<<<<<<< HEAD vterm-shell "/run/current-system/sw/bin/nu") -======= - vterm-shell "/run/current-system/sw/bin/fish") ->>>>>>> 3f6bc9c5 (making some eshell changes) + (making some eshell changes) (defun chris/vterm-setup () "Setup vterm with my preferred settings" (display-line-numbers-mode -1)) @@ -5032,7 +5029,6 @@ interfere with the default `bongo-playlist-buffer'." (general-def 'normal elfeed-search-mode-map "v" 'chris/elfeed-empv-play - "h" 'chris/elfeed-bongo-switch-to-playlist "b" 'chris/elfeed-eww-browse "o" 'chris/elfeed-org-view "d" 'chris/elfeed-ytdlp-empv) @@ -5490,5 +5486,3 @@ As of right now I haven't fully setup my early-init file, this does not export i ;; ;; Load the heart of Doom Emacs ;; (load (concat user-emacs-directory "core/core") nil 'nomessage) #+end_src -From: Chris Cochrun -Date: Sat, 27 Apr 2024 22:31:11 -0500 diff --git a/init.el b/init.el index 18e981ff..a19f12ed 100644 --- a/init.el +++ b/init.el @@ -3384,6 +3384,7 @@ targets." (setq vterm-buffer-name-string "vterm %s" vterm-shell "/run/current-system/sw/bin/nu") + (making some eshell changes) (defun chris/vterm-setup () "Setup vterm with my preferred settings" (display-line-numbers-mode -1)) @@ -3704,7 +3705,6 @@ interfere with the default `bongo-playlist-buffer'." (general-def 'normal elfeed-search-mode-map "v" 'chris/elfeed-empv-play - "h" 'chris/elfeed-bongo-switch-to-playlist "b" 'chris/elfeed-eww-browse "o" 'chris/elfeed-org-view "d" 'chris/elfeed-ytdlp-empv)