summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2023-04-11 11:08:44 +0200
committerAlan Pearce2023-04-11 11:08:44 +0200
commit948b76763a5274ecfefb7627391cc0dd5788c1f7 (patch)
tree44a588d1a6411abf13f51dafeb4a897e4e593567
parentb60cd054519369b3ddf2f742f6bab4b77ba53848 (diff)
downloadnixfiles-948b76763a5274ecfefb7627391cc0dd5788c1f7.tar.lz
nixfiles-948b76763a5274ecfefb7627391cc0dd5788c1f7.tar.zst
nixfiles-948b76763a5274ecfefb7627391cc0dd5788c1f7.zip
emacs: enable completion of commands and envvars in shell scripts
-rw-r--r--user/emacs/init.el6
-rw-r--r--user/settings/emacs.nix1
2 files changed, 7 insertions, 0 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 89d06cb8..1ab91738 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -487,6 +487,12 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
             (when (display-graphic-p)
               (company-posframe-mode +1))))
 
+(use-package company-shell
+  :after company
+  :config (progn
+            (setq company-shell-clean-manpage t)
+            (add-to-list 'company-backends '(company-shell company-shell-env))))
+
 (use-package all-the-icons
   :defer t
   :config (setq all-the-icons-color-icons nil))
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 6d0f7e1c..5f64f36b 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -86,6 +86,7 @@ in
         capf-autosuggest
         company
         company-posframe
+        company-shell
         company-tabnine
         consult
         consult-eglot