From e8cfeb6396499b450361a4aa284fb94e5c3c33a8 Mon Sep 17 00:00:00 2001 From: Raphael Roberts Date: Tue, 29 Oct 2019 23:53:09 -0500 Subject: [PATCH 1/2] Setup better shell --- custom.el | 3 ++- settings.org | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/custom.el b/custom.el index 5eb4485..93c5395 100644 --- a/custom.el +++ b/custom.el @@ -71,7 +71,8 @@ '(org-imenu-depth 5) '(package-selected-packages (quote - (ahk-mode + (better-shell + ahk-mode realgud format-all autodisass-java-bytecode diff --git a/settings.org b/settings.org index a2fae15..cd92325 100644 --- a/settings.org +++ b/settings.org @@ -541,6 +541,14 @@ put executables in elpy-rpc-venv in path :config (elmacro-mode +1)) #+END_SRC +** Better shell +#+BEGIN_SRC emacs-lisp + (use-package better-shell + :bind + (("C-M-;" . better-shell-shell) + ("C-M-:" . better-shell-remote-open) + ("C-#" . better-shell-sudo-here))) +#+END_SRC * Navigation/auto-completion ** Ace window #+BEGIN_SRC emacs-lisp From 2e7ec7f37af3fc4d9388fe4a86989001064806e3 Mon Sep 17 00:00:00 2001 From: Raphael Roberts Date: Wed, 30 Oct 2019 01:49:31 -0500 Subject: [PATCH 2/2] Updated regexp for android config to match scp in addition to ssh --- settings.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.org b/settings.org index cd92325..ff6f364 100644 --- a/settings.org +++ b/settings.org @@ -184,7 +184,7 @@ This handy function is a customized ripoff of custom-save-all "remote-shell" (expand-file-name "usr/bin/sh") "remote-process-environment" (append (list (concat "PREFIX=" default-directory "usr")) tramp-remote-process-environment) "remote-path" (append (mapcar 'expand-file-name '("home/.local/bin" "usr/bin" "usr/bin/applets")) '("/sbin" "/vendor/bin" "/system/sbin" "/system/bin" "/system/xbin")))))) - (rlbr/add-config-to-tramp "/ssh:termux.*:" android-config))) + (rlbr/add-config-to-tramp (rx "/" (or "scp" "ssh") (zero-or-one "x") ":" "termux" (zero-or-more any) ":") android-config))) #+END_SRC * Major modes ** C