From e0f2c260a1a303e11c0ef81c517dd725a90f7788 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 13 Aug 2018 16:07:10 +0200 Subject: [PATCH] Update lang/nix to reflect changes upstream + Restore nix-mode entry in auto-mode-alist + Add .drv entry to auto-mode-alist + Minor refactor for def-package! blocks --- modules/lang/nix/config.el | 13 +++++++++---- modules/lang/nix/packages.el | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/lang/nix/config.el b/modules/lang/nix/config.el index b03095541..ca0ea6adc 100644 --- a/modules/lang/nix/config.el +++ b/modules/lang/nix/config.el @@ -1,8 +1,10 @@ ;;; lang/nix/config.el -*- lexical-binding: t; -*- -(after! nix-mode +(def-package! nix-mode + :mode "\\.nix\\'" + :config (set-company-backend! 'nix-mode 'company-nixos-options) - + (map! :map nix-mode-map :localleader :n "f" #'nix-update-fetch @@ -14,8 +16,11 @@ (:when (featurep! :completion helm) :n "o" #'helm-nixos-options))) +(def-package! nix-drv-mode + :mode "\\.drv\\'") + (def-package! nix-update - :commands (nix-update-fetch)) + :commands nix-update-fetch) (def-package! nix-repl - :commands (nix-repl-show)) + :commands nix-repl-show) diff --git a/modules/lang/nix/packages.el b/modules/lang/nix/packages.el index 47ebff527..eb3256b84 100644 --- a/modules/lang/nix/packages.el +++ b/modules/lang/nix/packages.el @@ -2,7 +2,6 @@ ;;; lang/nix/packages.el (package! nix-mode) - (package! nix-update) (when (featurep! :completion company)