diff --git a/ha-programming.org b/ha-programming.org index d1a28f5..c20b914 100644 --- a/ha-programming.org +++ b/ha-programming.org @@ -1300,8 +1300,8 @@ While filename extensions work fine most of the time, I don't like to pre-pend = :mode (rx (or (seq ".sh" eol) "/bin/")) :init - (setq sh-basic-offset 2 - sh-indentation 2) + (setq sh-basic-offset 4 + sh-indentation 4) :config (ha-auto-insert-file (rx (or (seq ".sh" eol) "/bin/")) diff --git a/ha-remoting.org b/ha-remoting.org index cbe0992..bc282ba 100644 --- a/ha-remoting.org +++ b/ha-remoting.org @@ -214,14 +214,6 @@ Let's begin by defining some variables used for communication between the functi See =ha-ssh-add-favorite-host= for easily adding to this list.") #+end_src -Also, let's make it easy for me to change my default shell: - -#+begin_src emacs-lisp - (defvar ha-shell "bash" ;; Eat works better with Bash/Zsh - ;; (string-trim (shell-command-to-string "type -p fish")) - "The executable to the shell I want to use locally.") -#+end_src - ** Terminal Abstractions Could I abstract the different ways I start terminals in Emacs? The =ha-ssh-term= starts either a [[VTerm]] or [[Eat]] terminals, depending on what is available. This replaces (wraps) the default [[help:make-term][make-term]]. @@ -232,11 +224,11 @@ or [[Eat]] terminals, depending on what is available. This replaces (wraps) the The PROGRAM, if non-nil, is executed, otherwise, this is `ha-shell'. STARTFILE is the initial text given to the PROGRAM, and the SWITCHES are the command line options." - (unless program (setq program ha-shell)) (cond ((fboundp 'vterm) (progn (vterm name) - (vterm-send-string (append program switches)) - (vterm-send-return))) + (when program + (vterm-send-string (append program switches)) + (vterm-send-return)))) ((fboundp 'eat) (progn (switch-to-buffer (apply 'eat-make (append (list name program startfile) switches)))