From 0aa351842cd3498b8fcd8b1a7448932f8c825fc9 Mon Sep 17 00:00:00 2001
From: Patrick Elliott <patrick.d.elliott@gmail.com>
Date: Tue, 17 Jul 2018 09:56:52 +0200
Subject: [PATCH] clean-up + add helm-nixos-options

---
 modules/lang/nix/config.el   | 25 ++++++++++++++-----------
 modules/lang/nix/packages.el |  4 ++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/lang/nix/config.el b/modules/lang/nix/config.el
index 4af40dc4c..48c02ed82 100644
--- a/modules/lang/nix/config.el
+++ b/modules/lang/nix/config.el
@@ -1,21 +1,16 @@
 ;;; config.el --- description -*- lexical-binding: t; -*-
 
-(def-package! company-nixos-options
-  :when (featurep! :completion company)
-  :after nix-mode
-  :config
-  (set-company-backend! 'nix-mode 'company-nixos-options))
-
 (def-package! nix-update
-  :after nix-mode
   :commands (nix-update-fetch))
 
 (def-package! nix-repl
-  :after nix-mode
   :commands (nix-repl-show))
 
-(def-package! nix-mode
-  :config
+(def-package! helm-nixos-options
+  :when (featurep! :completion helm)
+  :commands (helm-nixos-options))
+
+(after! nix-mode
   (map! :map nix-mode-map
         :localleader
         :n "f" #'nix-update-fetch
@@ -23,4 +18,12 @@
         :n "r" #'nix-repl-show
         :n "s" #'nix-shell
         :n "b" #'nix-build
-        :n "u" #'nix-unpack))
+        :n "u" #'nix-unpack)
+
+  (when (featurep! :completion helm)
+    (map! :map nix-mode-map
+          :localleader
+          :n "o" #'helm-nixos-options))
+
+  (when (featurep! :completion company)
+    (set-company-backend! 'nix-mode 'company-nixos-options)))
diff --git a/modules/lang/nix/packages.el b/modules/lang/nix/packages.el
index 2ffe1aab7..47ebff527 100644
--- a/modules/lang/nix/packages.el
+++ b/modules/lang/nix/packages.el
@@ -2,7 +2,11 @@
 ;;; lang/nix/packages.el
 
 (package! nix-mode)
+
 (package! nix-update)
 
 (when (featurep! :completion company)
   (package! company-nixos-options))
+
+(when (featurep! :completion helm)
+  (package! helm-nixos-options))