From 448430075b56b8417baf6b9a7996a86484ecbe89 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Fri, 9 Oct 2020 16:07:33 -0500
Subject: [PATCH 1/2] Provide means to add extra overlays to devhsell

---
 default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 72aa71bd..69a22ad1 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,8 @@
 { nixpkgs ? import ./nix/nixpkgs.nix
 , system ? builtins.currentSystem
+, overlays ? []
 }:
 import nixpkgs {
   inherit system;
-  overlays = [ (import ./overlay.nix) ];
+  overlays = [ (import ./overlay.nix) ] ++ overlays;
 }

From 92cd0e3c9b79275f5a678db110561e72dc5ffd8b Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Fri, 9 Oct 2020 16:16:30 -0500
Subject: [PATCH 2/2] fmt

---
 default.nix            | 2 +-
 mkDevShell/options.nix | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 69a22ad1..04566338 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { nixpkgs ? import ./nix/nixpkgs.nix
 , system ? builtins.currentSystem
-, overlays ? []
+, overlays ? [ ]
 }:
 import nixpkgs {
   inherit system;
diff --git a/mkDevShell/options.nix b/mkDevShell/options.nix
index 11aff60c..03f2415c 100644
--- a/mkDevShell/options.nix
+++ b/mkDevShell/options.nix
@@ -48,7 +48,7 @@ let
 
       opCat = { name, value }:
         let
-          opCmd = { name, help, ...}:
+          opCmd = { name, help, ... }:
             let
               len = maxCommandLength - (builtins.stringLength name);
             in
@@ -57,7 +57,7 @@ let
             else
               "${pad name len} - ${help}";
         in
-         "\n[${name}]\n" + builtins.concatStringsSep "\n" (map opCmd value);
+        "\n[${name}]\n" + builtins.concatStringsSep "\n" (map opCmd value);
     in
     builtins.concatStringsSep "\n" (map opCat commandByCategoriesSorted)
   ;
@@ -226,7 +226,8 @@ in
     ];
 
     packages =
-      builtins.filter (x: x != null)
+      builtins.filter
+        (x: x != null)
         (map (x: x.package) config.commands);
   };
 }