summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--emacs/custom/my-eshell.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/emacs/custom/my-eshell.el b/emacs/custom/my-eshell.el
index 58d63b7..cb2587f 100644
--- a/emacs/custom/my-eshell.el
+++ b/emacs/custom/my-eshell.el
@@ -1,12 +1,12 @@
-;;; my-eshell.el --- Configure eshell
+;;; my-eshell.el --- Configure eshell -*- lexical-binding: t -*-
+
 ;;; Commentary:
 
 ;;; Code:
 
 (require 'use-package)
 (require 'cl-seq)
-(require 'magit)
-
+(require 'vc)
 (require 'eshell)
 (require 'esh-mode)
 (require 'esh-module)
@@ -43,9 +43,7 @@
   (eshell/alias "ee" "find-file-other-window $1")
   (eshell/alias "ll" "ls -l")
   (eshell/alias "d" "dired $1")
-  (eshell/alias "gs" "magit-status")
-  (eshell/alias "gd" "magit-diff-unstaged")
-  (eshell/alias "gds" "magit-diff-staged")
+  (eshell/alias "gs" "vc-diff")
   (eshell/alias "cal" "calendar")
   (eshell/alias "agenda" "org-agenda"))
 
@@ -144,7 +142,10 @@ append to it, while separating multiple outputs with
 (use-package eshell
   :hook ((eshell-mode . my/eshell-mode-setup)
          (eshell-mode . my/eshell-current-command-time-track)
-         (eshell-mode . eshell-smart-initialize))
+         (eshell-mode . eshell-smart-initialize)
+         (eshell-mode . (lambda ()
+		                  (setq-local corfu-auto nil)
+		                  (corfu-mode))))
   :commands (eshell eshell-command)
   :bind (("C-c e h" . my/eshell-here)
          ("C-c e e" . my/eshell-export)