[Emacs] Add again eshell syntax highlight

Between Emacs 28.0.50.145785 and Emacs 28.0.50.146000, a commit broke my
face config, and inheriting from `fixed-pitch' no longer made my faces
fixed-pitched. This commit therefore sets directly the font of the faces
than need to be fixed-pitched instead of relying on the `fixed-pitch'
face.

.spacemacs

@@ -140,7 +140,7 @@ This function is called at the very end of Spacemacs initialization."
  '(objed-cursor-color "#ff6c6b")
  '(org-export-headline-levels 4)
  '(package-selected-packages
-   '(diredfl caddyfile-mode ob-swift wttrin wrap-region pinentry org-tree-slide org-sidebar org-ql peg ov org-super-agenda ts dired-du caddyfile-mode loop xkcd vmd-mode visual-fill-column typit mmt sudoku restclient-helm pony-mode pacmacs ox-reveal outorg ob-restclient ob-http meson-mode ibuffer-projectile lv helm-w3m w3m graphviz-dot-mode flycheck-gometalinter transient ess-smart-equals ess-R-data-view ctable ess julia-mode eshell-git-prompt emoji-cheat-sheet-plus edit-indirect dockerfile-mode docker docker-tramp company-restclient restclient know-your-http-well company-quickhelp company-emoji company-emacs-eclim eclim atomic-chrome websocket 2048-game ox-gfm slime-company slime common-lisp-snippets erlang insert-shebang fish-mode company-shell faceup racket-mode treepy graphql yapfify yaml-mode xterm-color web-beautify twittering-mode toml-mode tagedit stickyfunc-enhance smeargle slim-mode shell-pop selectric-mode scss-mode sass-mode ranger rainbow-identifiers pytest pyenv-mode py-isort pug-mode plantuml-mode phpunit phpcbf php-auto-yasnippets pdf-tools tablist ox-pandoc orgit org-present org-pomodoro alert log4e gntp ob-elixir multi-term markdown-toc magit-gitflow magit-gh-pulls livid-mode live-py-mode json-snatcher js2-refactor js-doc htmlize hlint-refactor hindent helm-pydoc helm-hoogle helm-gitignore helm-css-scss haskell-snippets haml-mode gnuplot glsl-mode gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-messenger gist gh marshal logito pcache ht gh-md flyspell-correct-helm flyspell-correct flycheck-rust pos-tip flycheck-mix flycheck-credo eshell-z eshell-prompt-extras esh-help drupal-mode disaster cython-mode dash-functional tern company-ghci company-ghc ghc color-identifiers-mode cmm-mode clang-format cargo auto-dictionary alchemist modern-cpp-font-lock yasnippet-snippets x86-lookup web-mode srefactor racer pyvenv pip-requirements pandoc-mode org-projectile org-category-capture org-mime org-download nasm-mode json-reformat intero imenu-list hy-mode git-timemachine git-link geiser flycheck-pos-tip flycheck-haskell evil-magit emmet-mode cmake-mode anaconda-mode rust-mode elixir-mode flycheck haskell-mode multiple-cursors skewer-mode simple-httpd markdown-mode magit magit-popup git-commit ghub with-editor pythonic emms gmail-message-mode ham-mode html-to-markdown flymd edit-server image-dired+ go-guru go-eldoc company-go go-mode unfill mwim company-web web-completion-data company-tern company-cabal company-c-headers company-auctex company-anaconda elcord xresources-theme sql-indent rainbow-mode php-extras php-mode mmm-mode json-mode js2-mode csv-mode coffee-mode auctex helm-company helm-c-yasnippet fuzzy company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))
+   '(eshell-syntax-highlighting diredfl caddyfile-mode ob-swift wttrin wrap-region pinentry org-tree-slide org-sidebar org-ql peg ov org-super-agenda ts dired-du caddyfile-mode loop xkcd vmd-mode visual-fill-column typit mmt sudoku restclient-helm pony-mode pacmacs ox-reveal outorg ob-restclient ob-http meson-mode ibuffer-projectile lv helm-w3m w3m graphviz-dot-mode flycheck-gometalinter transient ess-smart-equals ess-R-data-view ctable ess julia-mode eshell-git-prompt emoji-cheat-sheet-plus edit-indirect dockerfile-mode docker docker-tramp company-restclient restclient know-your-http-well company-quickhelp company-emoji company-emacs-eclim eclim atomic-chrome websocket 2048-game ox-gfm slime-company slime common-lisp-snippets erlang insert-shebang fish-mode company-shell faceup racket-mode treepy graphql yapfify yaml-mode xterm-color web-beautify twittering-mode toml-mode tagedit stickyfunc-enhance smeargle slim-mode shell-pop selectric-mode scss-mode sass-mode ranger rainbow-identifiers pytest pyenv-mode py-isort pug-mode plantuml-mode phpunit phpcbf php-auto-yasnippets pdf-tools tablist ox-pandoc orgit org-present org-pomodoro alert log4e gntp ob-elixir multi-term markdown-toc magit-gitflow magit-gh-pulls livid-mode live-py-mode json-snatcher js2-refactor js-doc htmlize hlint-refactor hindent helm-pydoc helm-hoogle helm-gitignore helm-css-scss haskell-snippets haml-mode gnuplot glsl-mode gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-messenger gist gh marshal logito pcache ht gh-md flyspell-correct-helm flyspell-correct flycheck-rust pos-tip flycheck-mix flycheck-credo eshell-z eshell-prompt-extras esh-help drupal-mode disaster cython-mode dash-functional tern company-ghci company-ghc ghc color-identifiers-mode cmm-mode clang-format cargo auto-dictionary alchemist modern-cpp-font-lock yasnippet-snippets x86-lookup web-mode srefactor racer pyvenv pip-requirements pandoc-mode org-projectile org-category-capture org-mime org-download nasm-mode json-reformat intero imenu-list hy-mode git-timemachine git-link geiser flycheck-pos-tip flycheck-haskell evil-magit emmet-mode cmake-mode anaconda-mode rust-mode elixir-mode flycheck haskell-mode multiple-cursors skewer-mode simple-httpd markdown-mode magit magit-popup git-commit ghub with-editor pythonic emms gmail-message-mode ham-mode html-to-markdown flymd edit-server image-dired+ go-guru go-eldoc company-go go-mode unfill mwim company-web web-completion-data company-tern company-cabal company-c-headers company-auctex company-anaconda elcord xresources-theme sql-indent rainbow-mode php-extras php-mode mmm-mode json-mode js2-mode csv-mode coffee-mode auctex helm-company helm-c-yasnippet fuzzy company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))
  '(pdf-view-midnight-colors '("#655370" . "#fbf8ef"))
  '(safe-local-variable-values
    '((org-confirm-babel-evaluate)
@@ -182,6 +182,7 @@ This function is called at the very end of Spacemacs initialization."
  '(org-block-begin-line ((t (:inherit fixed-pitch :height 0.8))))
  '(org-checkbox ((t (:inherit (org-todo shadow fixed-pitch)))))
  '(org-code ((t (:inherit (shadow fixed-pitch)))))
+ '(org-date ((t (:inherit fixed-pitch :height 0.8 :foreground "#ebcb8b"))))
  '(org-document-info ((t (:foreground "#d08770"))))
  '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch)))))
  '(org-document-title ((t (:font "Charis SIL" :height 1.0 :inherit default :weight bold :foreground "#bf616a" :height 2.0 :italic t))))

org/config/bin.org

@@ -24,16 +24,16 @@ Because I sometimes switch from window manager to window manager, creating a scr
 #+NAME: autostart-table
 | Command       | Arguments                                                     | Run once? |
 |---------------+---------------------------------------------------------------+-----------|
+| ~mpc~         | ~stop~                                                        | no        |
 | ~set-screens~ |                                                               | no        |
+| ~xwallpaper~  | ~--zoom (cat $HOME/.cache/wallpaper)~                         | no        |
+| ~picom~       | ~--experimental-backends~                                     | yes       |
 | ~pumopm~      |                                                               | yes       |
 | ~xfce-polkit~ |                                                               | yes       |
 | ~xss-lock~    | ~plock~                                                       | yes       |
-| ~picom~       | ~--experimental-backends~                                     | yes       |
 | ~xidlehook~   | ~--not-when-audio --not-when-fullscreen --timer 3600 lock ''~ | yes       |
 | ~nm-applet~   |                                                               | yes       |
 | ~numlockx~    | ~on~                                                          | yes       |
-| ~mpc~         | ~stop~                                                        | no        |
-| ~xwallpaper~  | ~--zoom (cat $HOME/.cache/wallpaper)~                        | no        |
 
 #+NAME: autostart-gen
 #+BEGIN_SRC emacs-lisp :var table=autostart-table :cache yes
@@ -1664,16 +1664,14 @@ Now, if the variable ~URL~ is not empty (i.e. the user specified a link and did
 :END:
 ** pape-update
 :PROPERTIES:
-:HEADER-ARGS: :shebang "#!/usr/bin/env fish" :mkdirp yes :tangle ~/.local/bin/pape-update
+:HEADER-ARGS: :shebang "#!/usr/bin/env sh" :mkdirp yes :tangle ~/.local/bin/pape-update
 :CUSTOM_ID: pape-update-bdecbadf
 :END:
 This little tool sets a random wallpaper using xwallpaper.
-#+BEGIN_SRC fish
+#+BEGIN_SRC sh
-  set -l PAPESDIR ~/Pictures/Wallpapers
+  PAPESDIR=$HOME/Pictures/Wallpapers
-  set -l PAPES (ls $PAPESDIR)
+  PAPE=$(find $PAPESDIR -type f | sort -R | tail -1)
-  set -l PAPE $PAPESDIR/$PAPES[(random 1 (count $PAPES))]
+  [[ -f $PAPE ]] && echo $PAPE > $HOME/.cache/wallpaper && xwallpaper --zoom $PAPE
-  echo $PAPE > $HOME/.cache/wallpaper
-  xwallpaper --zoom $PAPE
 #+END_SRC
 
 ** Select wallpaper
@@ -1684,8 +1682,7 @@ This little tool sets a random wallpaper using xwallpaper.
 This script is base on what sxiv can do as an image viewer as well as xwallpaper.
 #+BEGIN_SRC sh
   PAPE=$(sxiv -orbft ~/Pictures/Wallpapers/*)
-  echo $PAPE > ~/.cache/wallpaper
+  [[ -f $PAPE ]] && echo $PAPE > ~/.cache/wallpaper && xwallpaper --zoom $PAPE
-  xwallpaper --zoom $PAPE
 #+END_SRC
 
 * Weather

org/config/emacs.org

@@ -69,27 +69,28 @@ However, I do have additional packages I installed either from the Elpa or the M
 
 With the variable ~dotspacemacs-additional-packages~, it is possible to install extra packages which are not already included in any layers. Dependencies should be explicitly included as they won’t be resolved automatically. Here is a table of all the extra packages I use:
 #+NAME: extra-packages
-| name of the package | why is it installed                                  |
+| name of the package        | why is it installed                                  |
-|---------------------+------------------------------------------------------|
+|----------------------------+------------------------------------------------------|
-| caddyfile-mode      | Major mode for editing Caddyfiles                    |
+| caddyfile-mode             | Major mode for editing Caddyfiles                    |
-| dired-git-info      | Git information in Dired buffers                     |
+| dired-git-info             | Git information in Dired buffers                     |
-| diredfl             | Extra font lock rules for a more colourful dired     |
+| diredfl                    | Extra font lock rules for a more colourful dired     |
-| edit-indirect       | edit region in separate buffer                       |
+| edit-indirect              | edit region in separate buffer                       |
-| elcord              | rich integration of Emacs in Discord                 |
+| elcord                     | rich integration of Emacs in Discord                 |
-| info-colors         | Extra colors for Emacs's Info-mode                   |
+| eshell-syntax-highlighting | Syntax highlighting for Eshell                       |
-| magit-gitflow       | integrate gitflow in Magit                           |
+| info-colors                | Extra colors for Emacs's Info-mode                   |
-| multiple-cursors    | I don’t like the layer, I prefer this package alone  |
+| magit-gitflow              | integrate gitflow in Magit                           |
-| ob-swift            | org-babel package for Swift                          |
+| multiple-cursors           | I don’t like the layer, I prefer this package alone  |
-| org-sidebar         | display on the side the outline of an Org buffer     |
+| ob-swift                   | org-babel package for Swift                          |
-| org-tree-slide      | presentation tool for org-mode                       |
+| org-sidebar                | display on the side the outline of an Org buffer     |
-| outorg              | edit comments as Org-mode buffers                    |
+| org-tree-slide             | presentation tool for org-mode                       |
-| pinentry            | enter a GPG password from Emacs                      |
+| outorg                     | edit comments as Org-mode buffers                    |
-| s                   | The long lost Emacs string manipulation library.     |
+| pinentry                   | enter a GPG password from Emacs                      |
-| sicp                | Texinfo version of the [[https://mitpress.mit.edu/sites/default/files/sicp/index.html][SICP]]                          |
+| s                          | The long lost Emacs string manipulation library.     |
-| visual-fill-column  | allow the use of ~fill-column~ in ~visual-line-mode~ |
+| sicp                       | Texinfo version of the [[https://mitpress.mit.edu/sites/default/files/sicp/index.html][SICP]]                          |
-| wrap-region         | easily wrap region with delimiters                   |
+| visual-fill-column         | allow the use of ~fill-column~ in ~visual-line-mode~ |
-| wttrin              | weather in Emacs                                     |
+| wrap-region                | easily wrap region with delimiters                   |
-| yasnippet-snippets  | snippets for YaSnippet                               |
+| wttrin                     | weather in Emacs                                     |
+| yasnippet-snippets         | snippets for YaSnippet                               |
 
 #+name: make-extra-pkg
 #+begin_src emacs-lisp :var packages=extra-packages[,0] :tangle no :exports none
@@ -1955,6 +1956,11 @@ I also don't want the banner to be displayed, I know I entered the Elisp shell,
   (setq eshell-banner-message "")
 #+END_SRC
 
+Finally, let’s enable some fish-like syntax highlighting:
+#+BEGIN_SRC emacs-lisp
+  (eshell-syntax-highlighting-global-mode +1)
+#+END_SRC
+
 **** Visual commands
 :PROPERTIES:
 :CUSTOM_ID: User_Configuration-Eshell-Visual_commands-2b15e0dc
@@ -2199,9 +2205,9 @@ In order to make org-mode even sexier, let’s enable ~variable-pitch-mode~ for
 Fonts will play an important part in this, but so will colors and font size. The following code is largely based on the one found [[https://zzamboni.org/post/beautifying-org-mode-in-emacs/][on this blog post]] and [[https://lepisma.xyz/2017/10/28/ricing-org-mode/][this one]].
 #+NAME: beautiful-org-faces
 #+BEGIN_SRC emacs-lisp
-  (let* ((font          `(:font "Charis SIL"   :height 1.0))
+  (let* ((font          `(:font "Charis SIL"    :height 1.0))
-         (head          `(:inherit default     :weight bold))
+         (head          `(:inherit default      :weight bold))
-         (fixed         `(:inherit fixed-pitch :height 0.8)))
+         (fixed         `(:font "Cascadia Code" :height 0.8)))
     (custom-theme-set-faces
      'user
      `(org-level-1               ((t (,@font ,@head :foreground ,phundrak/nord15 :height 1.75))))
@@ -2224,12 +2230,12 @@ Fonts will play an important part in this, but so will colors and font size. The
      `(org-drawer                ((t (,@fixed :foreground ,phundrak/nord10))) t)
      `(org-table                 ((t (,@fixed :foreground ,phundrak/nord14))) t)
      `(org-date                  ((t (,@fixed :foreground ,phundrak/nord13))) t)
-     '(org-code                  ((t (:inherit (shadow fixed-pitch)))))
+     '(org-code                  ((t (:inherit (shadow fixed-pitch) ,@fixed))))
-     '(org-verbatim              ((t (:inherit (shadow fixed-pitch)))))
+     '(org-verbatim              ((t (:inherit (shadow fixed-pitch) ,@fixed))))
-     '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch)))))
+     '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch) ,@fixed))))
-     '(org-tag                   ((t (:inherit (shadow fixed-pitch) :weight bold))))
+     '(org-tag                   ((t (:inherit (shadow fixed-pitch) ,@fixed :weight bold))))
-     '(org-meta-line             ((t (:inherit (font-lock-comment-face fixed-pitch) :height 0.8))))
+     '(org-meta-line             ((t (:inherit (font-lock-comment-face fixed-pitch) ,@fixed :height 0.8))))
-     `(org-special-keyword       ((t (:inherit (font-lock-comment-face fixed-pitch) :height 0.8 :foreground ,phundrak/nord15))))
+     `(org-special-keyword       ((t (:inherit (font-lock-comment-face fixed-pitch) ,@fixed :height 0.8 :foreground ,phundrak/nord15))))
      '(org-checkbox              ((t (:inherit (org-todo shadow fixed-pitch)))))
      `(org-document-info         ((t (:foreground ,phundrak/nord12))))
      `(org-link                  ((t (:foreground ,phundrak/nord8 :underline t))))))