emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix (cached-)nix-shell interpreter-mode-alist entries

Browse source 
By combining them. Also emit a more helpful message if the
sub-interpreter cannot be read.
This commit is contained in:
Henrik Lissner 2020-04-14 15:37:11 -04:00
parent 169fe6a7f4
commit 483a7caf0f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/lang/nix/autoload.el
View file

@ -46,7 +46,8 @@
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(save-match-data (save-match-data
(when (re-search-forward "#! *\\(?:cached-\\)?nix-shell +-i +\\([^ \n]+\\)" 256 t) (if (not (re-search-forward "#! *\\(?:cached-\\)?nix-shell +-i +\\([^ \n]+\\)" 256 t))
(message "Couldn't determine mode for this script")
(let* ((interp (match-string 1)) (let* ((interp (match-string 1))
(mode (mode
(assoc-default (assoc-default

3
modules/lang/nix/config.el
View file

@ -1,8 +1,7 @@
;;; lang/nix/config.el -*- lexical-binding: t; -*- ;;; lang/nix/config.el -*- lexical-binding: t; -*-
(use-package! nix-mode (use-package! nix-mode
:interpreter ("cached-nix-shell" . +nix-shell-init-mode) :interpreter ("\\(?:cached-\\)?nix-shell" . +nix-shell-init-mode)
:interpreter ("nix-shell" . +nix-shell-init-mode)
:mode "\\.nix\\'" :mode "\\.nix\\'"
:config :config
(set-company-backend! 'nix-mode 'company-nixos-options) (set-company-backend! 'nix-mode 'company-nixos-options)