[emacs/eshell] various tweaks

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 4ff8b94..96911f2 100644 (file)
--- a/init.org
+++ b/init.org
@@ -867,6 +867,7 @@ In short, my favourite way of life.
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0
         org-email-link-description-format "Email %c: %s" ; %.30s
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0
         org-email-link-description-format "Email %c: %s" ; %.30s

+        org-highlight-latex-and-related '(entities)

         org-log-done 'time)
   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
   (after! org-src
         org-log-done 'time)
   (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
   (after! org-src


@@ -880,12 +881,23 @@ In short, my favourite way of life.
         (org-edit-src-save)
         (org-edit-src-exit)))
     (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
         (org-edit-src-save)
         (org-edit-src-exit)))
     (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))

+  (font-lock-add-keywords
+   'org-mode
+   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
+      (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
+      (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
+      (4 '(:foreground "#c5c8c6") t))) ; title
+   t)

   :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
          (org-mode . flyspell-mode))
   :custom
   :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
          (org-mode . flyspell-mode))
   :custom

-  (org-latex-packages-alist '(("" "listings") ("" "color"))))
+  (org-latex-packages-alist '(("" "listings") ("" "color")))
+  :custom-face
+  '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
+  '(org-block ((t (:background "#1d1f21"))))
+  '(org-latex-and-related ((t (:foreground "#b294bb")))))

 
 (use-package ox-latex
   :after ox
 
 (use-package ox-latex
   :after ox


@@ -1018,10 +1030,11 @@ There's no way I could top that, so I won't attempt to.
   :config
   (setq ivy-wrap t)
   (ivy-mode 1)
   :config
   (setq ivy-wrap t)
   (ivy-mode 1)

-  :custom-face
-  (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
-  (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
-  (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold)))))
+  ;; :custom-face
+  ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
+  ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
+  ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
+)

 #+end_src
 
 **** Swiper
 #+end_src
 
 **** Swiper


@@ -1059,7 +1072,7 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package eshell
 
 #+begin_src emacs-lisp
 (use-package eshell

-  :defer t
+  :defer 1

   :commands eshell
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))
   :commands eshell
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))


@@ -1076,11 +1089,18 @@ There's no way I could top that, so I won't attempt to.
     (eshell-send-input))
 
   (defun amin|eshell-setup ()
     (eshell-send-input))
 
   (defun amin|eshell-setup ()

+    (make-local-variable 'company-idle-delay)
+    (setq company-idle-delay nil)

     (bind-keys :map eshell-mode-map
                ("C-d" . amin/eshell-quit-or-delete-char)
     (bind-keys :map eshell-mode-map
                ("C-d" . amin/eshell-quit-or-delete-char)

-               ("C-l" . amin/eshell-clear)))
+               ("C-l" . amin/eshell-clear)
+               ("M-r" . counsel-esh-history)
+               ([tab] . company-complete)))

 
 

-  :hook (eshell-mode . amin|eshell-setup))
+  :hook (eshell-mode . amin|eshell-setup)
+  :custom
+  (eshell-hist-ignoredups t)
+  (eshell-input-filter 'eshell-input-filter-initial-space))

 #+end_src
 
 *** Ibuffer
 #+end_src
 
 *** Ibuffer


@@ -1271,7 +1291,6 @@ TODO: break this giant source block down into individual org sections.
         ([tab]    . company-complete-common-or-cycle)
         ([escape] . company-abort))
   :custom
         ([tab]    . company-complete-common-or-cycle)
         ([escape] . company-abort))
   :custom

-  (company-idle-delay 0.3)

   (company-minimum-prefix-length 1)
   (company-selection-wrap-around t)
   (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
   (company-minimum-prefix-length 1)
   (company-selection-wrap-around t)
   (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")


@@ -1704,7 +1723,7 @@ Emacs package that displays available keybindings in popup
 (load-theme 'tangomod t)
 #+end_src
 
 (load-theme 'tangomod t)
 #+end_src
 

-** [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]]
+** COMMENT [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]]

 
 #+begin_src emacs-lisp
 (use-package smart-mode-line
 
 #+begin_src emacs-lisp
 (use-package smart-mode-line


@@ -1714,29 +1733,42 @@ Emacs package that displays available keybindings in popup
   (remove-hook 'display-time-hook 'sml/propertize-time-string))
 #+end_src
 
   (remove-hook 'display-time-hook 'sml/propertize-time-string))
 #+end_src
 

+** doom-modeline
+
+#+begin_src emacs-lisp
+(use-package doom-modeline
+  :demand t
+  :config (setq doom-modeline-height 32)
+  :hook (after-init . doom-modeline-init))
+#+end_src
+
+** doom-themes
+
+#+begin_src emacs-lisp
+(use-package doom-themes)
+#+end_src
+

 ** theme helper functions
 
 #+begin_src emacs-lisp
 ** theme helper functions
 
 #+begin_src emacs-lisp

-(defun amin/light ()
-  "Load light theme(s)."
+(defun amin/lights-on ()
+  "Enable my favourite light theme."

   (interactive)
   (progn
     (mapc #'disable-theme custom-enabled-themes)
   (interactive)
   (progn
     (mapc #'disable-theme custom-enabled-themes)

-    (load-theme 'tangomod t)
-    (sml/apply-theme 'light)))
+    (load-theme 'tangomod t)))

 
 

-(defun amin/dark ()
-  "Load dark theme(s)."
+(defun amin/lights-off ()
+  "Go dark."

   (interactive)
   (progn
     (mapc #'disable-theme custom-enabled-themes)
   (interactive)
   (progn
     (mapc #'disable-theme custom-enabled-themes)

-    (load-theme 'tangomod-dark t)
-    (sml/apply-theme 'dark)))
+    (load-theme 'doom-tomorrow-night t)))

 
 (amin--leader-keys
   "t"   '(:ignore t :wk "theme")
 
 (amin--leader-keys
   "t"   '(:ignore t :wk "theme")

-  "t d" 'amin/dark
-  "t l" 'amin/light)
+  "t d" 'amin/lights-off
+  "t l" 'amin/lights-on)

 #+end_src
 
 ** [[https://github.com/bbatsov/crux][crux]]
 #+end_src
 
 ** [[https://github.com/bbatsov/crux][crux]]


@@ -1808,15 +1840,52 @@ Emacs package that displays available keybindings in popup
     "h h p" 'helpful-at-point))
 #+end_src
 
     "h h p" 'helpful-at-point))
 #+end_src
 

-** [[https://github.com/kyagi/shell-pop-el][shell-pop]]
+** [[https://github.com/knu/shell-toggle.el][shell-toggle]]

 
 #+begin_src emacs-lisp
 
 #+begin_src emacs-lisp

-(use-package shell-pop
-  :defer 1
-  :general (amin--leader-keys "a s" 'shell-pop)
-  :init
-  (setq shell-pop-universal-key "C-c e"
-        shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
+(use-package shell-toggle
+  :after eshell
+  :general (amin--leader-keys "a s" 'amin/shell-toggle)
+  :bind ("C-c e" . amin/shell-toggle)
+  :config
+  (defun amin/shell-toggle (make-cd)
+    "Toggle between the shell buffer and whatever buffer you are editing.
+With a prefix argument MAKE-CD also insert a \"cd DIR\" command
+into the shell, where DIR is the directory of the current buffer.
+
+When called in the shell buffer returns you to the buffer you were editing
+before calling this the first time.
+
+Options: `shell-toggle-goto-eob'"
+    (interactive "P")
+    ;; Try to decide on one of three possibilities:
+    ;; If not in shell-buffer, switch to it.
+    ;; If in shell-buffer, return to state before going to the shell-buffer
+    (if (eq (current-buffer) shell-toggle-shell-buffer)
+        (shell-toggle-buffer-return-from-shell)
+      (progn
+        (shell-toggle-buffer-goto-shell make-cd)
+        (if shell-toggle-full-screen-window-only (delete-other-windows)))))
+
+  ;; override to split horizontally instead
+  (defun shell-toggle-buffer-switch-to-other-window ()
+    "Switch to other window.
+If the current window is the only window in the current frame,
+create a new window and switch to it.
+
+\(This is less intrusive to the current window configuration than
+`switch-buffer-other-window')"
+    (let ((this-window (selected-window)))
+      (other-window 1)
+      ;; If we did not switch window then we only have one window and need to
+      ;; create a new one.
+      (if (eq this-window (selected-window))
+             (progn
+               (split-window-horizontally)
+            (other-window 1)))))
+
+  :custom
+  (shell-toggle-launch-shell 'shell-toggle-eshell))

 #+end_src
 
 ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]
 #+end_src
 
 ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]


@@ -1829,6 +1898,7 @@ Make =*scratch*= and =*Messages*= unkillable.
   :config
   (unkillable-scratch 1)
   :custom
   :config
   (unkillable-scratch 1)
   :custom

+  (unkillable-scratch-behavior 'do-nothing)

   (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
 #+end_src
 
   (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
 #+end_src
 


@@ -2209,10 +2279,11 @@ For when I /have to/ use GH.
          (message-mode . flyspell-mode)
          (message-mode . (lambda () (setq fill-column 65
                                      message-fill-column 65))))
          (message-mode . flyspell-mode)
          (message-mode . (lambda () (setq fill-column 65
                                      message-fill-column 65))))

-  :custom-face
-  (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
-  (message-header-to      ((t (:foreground "#111" :weight normal))))
-  (message-header-cc      ((t (:foreground "#333" :weight normal)))))
+  ;; :custom-face
+  ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
+  ;; (message-header-to      ((t (:foreground "#111" :weight normal))))
+  ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
+  )

 
 (after! mml-sec
   (setq mml-secure-openpgp-encrypt-to-self t
 
 (after! mml-sec
   (setq mml-secure-openpgp-encrypt-to-self t