Tweaked file structure. Configured eshell more

1 files changed, 129 insertions, 98 deletions

diff --git a/config/eshell.el b/config/eshell.el
index 4fe02b4..02ea970 100644
--- a/config/eshell.el
+++ b/config/eshell.el
@@ -4,26 +4,26 @@
 
 ;; Ensure eshell directory exists
 (unless (file-directory-p (concat user-emacs-directory "eshell"))
-  (make-directory (concat user-emacs-directory "eshell") t))
+	(make-directory (concat user-emacs-directory "eshell") t))
 
 ;; Scrolling behavior
 (setq eshell-scroll-to-bottom-on-input 'all
-      eshell-scroll-to-bottom-on-output 'all
-      eshell-kill-processes-on-exit t
-      eshell-hist-ignoredups t)
+	eshell-scroll-to-bottom-on-output 'all
+	eshell-kill-processes-on-exit t
+	eshell-hist-ignoredups t)
 
 ;; History settings
 (setq eshell-history-size 100000
-      eshell-history-file-name (concat user-emacs-directory "eshell/history")
-      eshell-save-history-on-exit t)
+	eshell-history-file-name (concat user-emacs-directory "eshell/history")
+	eshell-save-history-on-exit t)
 
 ;; Buffer naming
 (setq eshell-buffer-maximum-lines 20000
-      eshell-buffer-name "*eshell*")
+	eshell-buffer-name "*eshell*")
 
 ;; Completion settings
 (setq eshell-cmpl-cycle-completions nil
-      eshell-cmpl-ignore-case t)
+	eshell-cmpl-ignore-case t)
 
 ;; Visual commands (run in term mode instead of eshell)
 (setq eshell-visual-commands '("vi" "vim" "nvim" "screen" "tmux" "top" "htop" "less" "more" "lynx" "ncftp" "mutt"))
@@ -31,132 +31,139 @@
 
 ;; Optional: Hook to do extra setup when eshell starts
 (add-hook 'eshell-first-time-mode-hook
-          (lambda ()
-            ;; any additional setup here
-            ))
+		(lambda ()
+		  ;; any additional setup here
+		  ))
 
 ;; =====================================
 ;; xterm-color: Better ANSI Colors
 ;; =====================================
 
 (use-package xterm-color
-  :config
-  ;; Preserve text properties before prompt
-  (add-hook 'eshell-before-prompt-hook
-            (lambda ()
-              (setq xterm-color-preserve-properties t)))
+	:config
+	;; Preserve text properties before prompt
+	(add-hook 'eshell-before-prompt-hook
+		(lambda ()
+		  (setq xterm-color-preserve-properties t)))
 
-  ;; Ensure hooks exist after Eshell is loaded
-  (with-eval-after-load 'eshell
-    ;; Replace default ansi-color with xterm-color
-    (add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
-    ;; Remove default ansi-color handler
-    (setq eshell-output-filter-functions
-          (remove 'eshell-handle-ansi-color eshell-output-filter-functions))))
+	;; Ensure hooks exist after Eshell is loaded
+	(with-eval-after-load 'eshell
+	  ;; Replace default ansi-color with xterm-color
+	  (add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
+	  ;; Remove default ansi-color handler
+	  (setq eshell-output-filter-functions
+	        (remove 'eshell-handle-ansi-color eshell-output-filter-functions))))
 
 ;; =====================================
 ;; eshell-syntax-highlighting: Command Highlighting
 ;; =====================================
 
 (use-package eshell-syntax-highlighting
-  :after eshell
-  :config
-  ;; Enable syntax highlighting in all eshell buffers
-  (eshell-syntax-highlighting-global-mode +1))
+	:after eshell
+	:config
+	;; Enable syntax highlighting in all eshell buffers
+	(eshell-syntax-highlighting-global-mode +1))
 
 ;; =====================================
 ;; esh-autosuggest: Fish-like Autosuggestions
 ;; =====================================
 
 (use-package esh-autosuggest
-  :hook (eshell-mode . esh-autosuggest-mode)
-  :config
-  ;; Use company for completions if available
-  (setq esh-autosuggest-delay 0.5))
+	:hook (eshell-mode . esh-autosuggest-mode)
+	:config
+	;; Use company for completions if available
+	(setq esh-autosuggest-delay 0.5))
 
 ;; =====================================
 ;; eshell-prompt-extras: Enhanced Prompt
 ;; =====================================
 
 (use-package eshell-prompt-extras
-  :after eshell
-  :config
-  ;; Use epe-theme-lambda for a clean, informative prompt
-  ;; Shows: user@host, git branch/status, python venv
-  (setq eshell-highlight-prompt nil
-        eshell-prompt-function 'epe-theme-lambda)
-
-  ;; Prompt colors
-  (set-face-attribute 'epe-pipeline-delimiter-face nil :foreground "#F3AB4D")
-  (set-face-attribute 'epe-pipeline-user-face nil :foreground "#6BC0EE")
-  (set-face-attribute 'epe-pipeline-host-face nil :foreground "#91F9E5")
-  (set-face-attribute 'epe-dir-face nil :foreground "#8affff")
-  (set-face-attribute 'epe-git-face nil :foreground "#FAF36F"))
+	:after eshell
+	:config
+	;; Custom prompt with Emacs icon + lambda
+	(defun my-eshell-prompt ()
+		"Custom eshell prompt with Emacs icon and lambda."
+		(concat
+		 ;; Emacs icon at the start
+		 (propertize " " 'face '(:foreground "#8057b6"))
+		 ;; Use the built-in lambda theme for the rest
+		 (epe-theme-lambda)))
+
+	(setq eshell-highlight-prompt nil
+	      eshell-prompt-function 'my-eshell-prompt)
+
+	;; Prompt colors
+	(set-face-attribute 'epe-pipeline-delimiter-face nil :foreground "#F3AB4D")
+	(set-face-attribute 'epe-pipeline-user-face nil :foreground "#6BC0EE")
+	(set-face-attribute 'epe-pipeline-host-face nil :foreground "#91F9E5")
+	(set-face-attribute 'epe-dir-face nil :foreground "#8affff")
+	(set-face-attribute 'epe-git-face nil :foreground "#FAF36F"))
 
 ;; =====================================
 ;; Eshell Aliases & Custom Functions
 ;; =====================================
 
 (defun eshell/ll (&rest args)
-  "ls -lh with optional arguments."
-  (apply #'eshell/ls "-lh" args))
+	"ls -lh with optional arguments."
+	(apply #'eshell/ls "-lh" args))
 
 (defun eshell/l (&rest args)
-  (apply #'eshell/ls "-lah" args))
+	(apply #'eshell/ls "-lah" args))
 
 (defun eshell/la (&rest args)
-  "ls -lah (all files) with optional arguments."
-  (apply #'eshell/ls "-lah" args))
+	"ls -lah (all files) with optional arguments."
+	(apply #'eshell/ls "-lah" args))
 
 (defun eshell/e (file)
-  "Open FILE in Emacs."
-  (find-file file))
+	"Open FILE in Emacs."
+	(find-file file))
 
 (defun eshell/d (&optional dir)
-  "Open dired in DIR (or current directory)."
-  (dired (or dir ".")))
+	"Open dired in DIR (or current directory)."
+	(dired (or dir ".")))
 
 (defun eshell/take (dir)
-  "Create directory DIR and cd into it."
-  (make-directory dir t)
-  (eshell/cd dir))
+	"Create directory DIR and cd into it."
+	(make-directory dir t)
+	(eshell/cd dir))
 
 ;; =====================================
 ;; Eshell Git Integration
 ;; =====================================
 
 (defun eshell/gst ()
-  "Git status."
-  (magit-status))
+	"Git status."
+	(magit-status))
 
 (defun eshell/gd ()
-  "Git diff."
-  (magit-diff-unstaged))
+	"Git diff."
+	(magit-diff-unstaged))
 
 (defun eshell/gds ()
-  "Git diff staged."
-  (magit-diff-staged))
+	"Git diff staged."
+	(magit-diff-staged))
 
 ;; =====================================
 ;; Multi-eshell: Manage Multiple Buffers
 ;; =====================================
 
 (defvar eshell-buffer-index 1
-  "Index for naming multiple eshell buffers.")
+	"Index for naming multiple eshell buffers.")
 
 (defun eshell-new ()
-  "Create a new eshell buffer."
-  (interactive)
-  (eshell t))
+	"Create a new eshell buffer."
+	(interactive)
+	(eshell t))
 
 (defun eshell-here ()
-  "Open eshell in current directory."
-  (interactive)
-  (let ((current-dir default-directory))
-    (eshell)
-    (unless (equal (eshell/pwd) current-dir)
-      (eshell/cd current-dir)
-      (eshell-send-input))))
+	"Open eshell in current directory."
+	(interactive)
+	(let ((current-dir default-directory))
+		(eshell)
+		(unless (equal (eshell/pwd) current-dir)
+			(eshell/cd current-dir)
+			(eshell-send-input))))
 
 ;; =====================================
 ;; Keybindings
@@ -167,20 +174,28 @@
 
 ;; Eshell-mode specific keybindings
 (add-hook 'eshell-mode-hook
-          (lambda ()
-            ;; Company completion in eshell
-            (company-mode +1)
-            ;; Clear screen
-            (define-key eshell-mode-map (kbd "C-l")
-              (lambda ()
-                (interactive)
-                (eshell/clear 1)          ;; clear the buffer
-                (eshell-emit-prompt)))    ;; insert a new prompt
-            ;; History navigation
-            (define-key eshell-mode-map (kbd "C-c C-l") 'eshell-list-history)
-            ;; Emacs-style line navigation
-            (define-key eshell-mode-map (kbd "C-a") 'eshell-bol)
-            (define-key eshell-mode-map (kbd "C-e") 'end-of-line)))
+		(lambda ()
+		  ;; Company completion in eshell
+		  (company-mode +1)
+		  ;; Clear screen
+		  (define-key eshell-mode-map (kbd "C-l")
+		    (lambda ()
+		      (interactive)
+		      (eshell/clear 1)          ;; clear the buffer
+		      (eshell-emit-prompt)))    ;; insert a new prompt
+		  ;; History navigation
+		  (define-key eshell-mode-map (kbd "C-c C-l") 'eshell-list-history)
+		  ;; Emacs-style line navigation
+		  (define-key eshell-mode-map (kbd "C-a") 'eshell-bol)
+		  (define-key eshell-mode-map (kbd "C-e") 'end-of-line)
+		  ;; C-d exits if line is empty, otherwise deletes character
+		  (define-key eshell-mode-map (kbd "C-d")
+		    (lambda ()
+		      (interactive)
+		      (if (and (eolp) (looking-back eshell-prompt-regexp nil))
+		          (eshell-life-is-too-much)  ;; Exit eshell
+		        (delete-char 1)))))           ;; Delete character
+		  ))
 
 ;; =====================================
 ;; Evil Integration
@@ -195,16 +210,32 @@
     (evil-collection-eshell-setup)))
 
 (provide 'config-eshell)
-;;; eshell.el ends here
 
 ;; =====================================
-;; Startup
-;; =====================================
-
-(defun my-eshell-startup-hook ()
-  ;; clear banner
-  (setq eshell-banner-message "")
-  ;; run fastfetch
-  (eshell-command "fastfetch"))
-
-(add-hook 'eshell-first-time-mode-hook #'my-eshell-startup-hook)
+;; Startup Banner
+;; =====================================
+
+;; Customize the startup message
+(setq eshell-banner-message
+      (concat
+       "\n"
+       "  ███████╗███████╗██╗  ██╗███████╗██╗     ██╗\n"
+       "  ██╔════╝██╔════╝██║  ██║██╔════╝██║     ██║\n"
+       "  █████╗  ███████╗███████║█████╗  ██║     ██║\n"
+       "  ██╔══╝  ╚════██║██╔══██║██╔══╝  ██║     ██║\n"
+       "  ███████╗███████║██║  ██║███████╗███████╗███████╗\n"
+       "  ╚══════╝╚══════╝╚═╝  ╚═╝╚══════╝╚══════╝╚══════╝\n"
+       "\n"
+       "  Welcome to Eshell - The Emacs Shell🐚!\n"
+       "  Come Rest, Weary Traveller!\n"
+       "  Type 'help' for commands or 'exit' to close\n"
+       "\n"))
+
+;; Alternative: Clear banner completely
+;; (setq eshell-banner-message "")
+
+;; Alternative: Run fastfetch on startup
+;; (defun my-eshell-startup-hook ()
+;;   (setq eshell-banner-message "")
+;;   (eshell-command "fastfetch"))
+;; (add-hook 'eshell-first-time-mode-hook #'my-eshell-startup-hook)