From fd0323f40fc81ced9c0bfd7c46bfdf57690d668a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 16 Mar 2019 14:48:13 +0100
Subject: [PATCH] move images into ./images

having a folder with all of the images makes things easier
---
 {bash => images/bash}/default.nix                |  0
 {busybox => images/busybox}/default.nix          |  0
 {curl => images/curl}/default.nix                |  0
 .../docker-compose}/default.nix                  |  0
 {kubectl => images/kubectl}/default.nix          |  0
 .../kubernetes-helm}/default.nix                 |  0
 .../nix-unstable}/default.nix                    |  0
 {nix => images/nix}/default.nix                  |  0
 {nix => images/nix}/root/etc/group               |  0
 {nix => images/nix}/root/etc/nsswitch.conf       |  0
 {nix => images/nix}/root/etc/passwd              |  0
 overlay.nix                                      | 16 ++++++++--------
 12 files changed, 8 insertions(+), 8 deletions(-)
 rename {bash => images/bash}/default.nix (100%)
 rename {busybox => images/busybox}/default.nix (100%)
 rename {curl => images/curl}/default.nix (100%)
 rename {docker-compose => images/docker-compose}/default.nix (100%)
 rename {kubectl => images/kubectl}/default.nix (100%)
 rename {kubernetes-helm => images/kubernetes-helm}/default.nix (100%)
 rename {nix-unstable => images/nix-unstable}/default.nix (100%)
 rename {nix => images/nix}/default.nix (100%)
 rename {nix => images/nix}/root/etc/group (100%)
 rename {nix => images/nix}/root/etc/nsswitch.conf (100%)
 rename {nix => images/nix}/root/etc/passwd (100%)

diff --git a/bash/default.nix b/images/bash/default.nix
similarity index 100%
rename from bash/default.nix
rename to images/bash/default.nix
diff --git a/busybox/default.nix b/images/busybox/default.nix
similarity index 100%
rename from busybox/default.nix
rename to images/busybox/default.nix
diff --git a/curl/default.nix b/images/curl/default.nix
similarity index 100%
rename from curl/default.nix
rename to images/curl/default.nix
diff --git a/docker-compose/default.nix b/images/docker-compose/default.nix
similarity index 100%
rename from docker-compose/default.nix
rename to images/docker-compose/default.nix
diff --git a/kubectl/default.nix b/images/kubectl/default.nix
similarity index 100%
rename from kubectl/default.nix
rename to images/kubectl/default.nix
diff --git a/kubernetes-helm/default.nix b/images/kubernetes-helm/default.nix
similarity index 100%
rename from kubernetes-helm/default.nix
rename to images/kubernetes-helm/default.nix
diff --git a/nix-unstable/default.nix b/images/nix-unstable/default.nix
similarity index 100%
rename from nix-unstable/default.nix
rename to images/nix-unstable/default.nix
diff --git a/nix/default.nix b/images/nix/default.nix
similarity index 100%
rename from nix/default.nix
rename to images/nix/default.nix
diff --git a/nix/root/etc/group b/images/nix/root/etc/group
similarity index 100%
rename from nix/root/etc/group
rename to images/nix/root/etc/group
diff --git a/nix/root/etc/nsswitch.conf b/images/nix/root/etc/nsswitch.conf
similarity index 100%
rename from nix/root/etc/nsswitch.conf
rename to images/nix/root/etc/nsswitch.conf
diff --git a/nix/root/etc/passwd b/images/nix/root/etc/passwd
similarity index 100%
rename from nix/root/etc/passwd
rename to images/nix/root/etc/passwd
diff --git a/overlay.nix b/overlay.nix
index 4b6d31d..1497acd 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -5,14 +5,14 @@ _: pkgs: {
   # docker images must be lower-cased
   docker-nixpkgs = {
 
-    bash = pkgs.callPackage ./bash {};
-    busybox = pkgs.callPackage ./busybox {};
-    curl = pkgs.callPackage ./curl {};
-    docker-compose = pkgs.callPackage ./docker-compose {};
-    kubectl = pkgs.callPackage ./kubectl {};
-    kubernetes-helm = pkgs.callPackage ./kubernetes-helm {};
-    nix = pkgs.callPackage ./nix {};
-    nix-unstable = pkgs.callPackage ./nix-unstable {};
+    bash = pkgs.callPackage ./images/bash {};
+    busybox = pkgs.callPackage ./images/busybox {};
+    curl = pkgs.callPackage ./images/curl {};
+    docker-compose = pkgs.callPackage ./images/docker-compose {};
+    kubectl = pkgs.callPackage ./images/kubectl {};
+    kubernetes-helm = pkgs.callPackage ./images/kubernetes-helm {};
+    nix = pkgs.callPackage ./images/nix {};
+    nix-unstable = pkgs.callPackage ./images/nix-unstable {};
 
   };
 }