From c75776e589a92c732ea5be4cd203c380e6d17e77 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 27 Dec 2016 20:41:27 +0100
Subject: [PATCH] add programs.nix-script module

---
 default.nix                     |  1 +
 modules/examples/lnl.nix        | 11 +++-----
 modules/programs/nix-script.nix | 47 +++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 modules/programs/nix-script.nix

diff --git a/default.nix b/default.nix
index 606bad7..f88dee8 100644
--- a/default.nix
+++ b/default.nix
@@ -25,6 +25,7 @@ let
         ./modules/services/activate-system.nix
         ./modules/services/nix-daemon.nix
         ./modules/programs/bash.nix
+        ./modules/programs/nix-script.nix
         ./modules/programs/tmux.nix
         ./modules/programs/vim.nix
         ./modules/programs/zsh.nix
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix
index b4c0ab3..02fd777 100644
--- a/modules/examples/lnl.nix
+++ b/modules/examples/lnl.nix
@@ -22,8 +22,7 @@
   system.defaults.trackpad.Clicking = true;
 
   environment.systemPackages =
-    [ pkgs.lnl.nix-script
-      pkgs.curl
+    [ pkgs.curl
       pkgs.fzf
       pkgs.gettext
       pkgs.git
@@ -40,6 +39,8 @@
 
   services.activate-system.enable = true;
 
+  programs.nix-script.enable = true;
+
   programs.tmux.enable = true;
   programs.tmux.enableSensible = true;
   programs.tmux.enableMouse = true;
@@ -147,11 +148,5 @@
   nixpkgs.config.allowUnfree = true;
 
   nixpkgs.config.packageOverrides = pkgs: {
-    lnl.nix-script = pkgs.substituteAll {
-      name = "nix";
-      src = ../../pkgs/nix-tools/nix-script.sh;
-      dir = "bin";
-      isExecutable = true;
-    };
   };
 }
diff --git a/modules/programs/nix-script.nix b/modules/programs/nix-script.nix
new file mode 100644
index 0000000..d970138
--- /dev/null
+++ b/modules/programs/nix-script.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.nix-script;
+
+  nix-script = pkgs.substituteAll {
+    inherit (cfg) name;
+    src = ../../pkgs/nix-tools/nix-script.sh;
+    dir = "bin";
+    isExecutable = true;
+  };
+
+in
+
+{
+  options = {
+
+    programs.nix-script.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable the nix script.
+      '';
+    };
+
+    programs.nix-script.name = mkOption {
+      type = types.str;
+      default = "nix";
+      description = ''
+        Name to use for the nix script.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages =
+      [ # Nix wrapper script
+        nix-script
+      ];
+
+  };
+}