diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/sterni/emacs/default.nix | 7 | ||||
| -rw-r--r-- | users/sterni/emacs/init.el | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix index 67851d81b0..67f2409ad5 100644 --- a/users/sterni/emacs/default.nix +++ b/users/sterni/emacs/default.nix @@ -52,6 +52,13 @@ let languagetool-server-command "${pkgs.languagetool}/share/languagetool-server.jar" languagetool-java-arguments '("-Dfile.encoding=UTF-8")) + ;; use bash instead of fish from SHELL for some things, as it plays + ;; nicer with TERM=dumb, as I don't need/want vterm anyways. + ;; We want it to source /etc/profile for some extra setup that + ;; kicks in if TERM=dumb, meaning we can't use dash/sh mode. + (setq shell-file-name "${pkgs.bash}/bin/bash" + explicit-bash-args '("-l")) + (provide 'nix-inject) ''; }) diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el index f3942c2f0f..4e2baef921 100644 --- a/users/sterni/emacs/init.el +++ b/users/sterni/emacs/init.el @@ -114,6 +114,11 @@ ;; man (setq Man-notify-method 'pushy) ; display man page in current window +;; shell + +; default, but allows ';' as prompt +(setq shell-prompt-pattern "^[^#$%>;\n]*[#$%>;] *") + ;;; Configure packages (require 'use-package) |