places packages into a pkgs/ directory

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>

45 files changed, 63 insertions, 75 deletions

diff --git a/README.md b/README.md
index 94165cb..b45e254 100644
--- a/README.md
+++ b/README.md
@@ -12,28 +12,27 @@ This overlay is built and (somewhat) tested against `nixos-unstable`.
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| pkgs-unstable | [2018-11-06 15:05](https://github.com/nixos/nixpkgs-channels/commits/6141939d6e0a77c84905efd560c03c3032164ef1) |
-| pkgs-18.09 | [2018-11-07 17:13](https://github.com/nixos/nixpkgs-channels/commits/a4c4cbb613cc3e15186de0fdb04082fa7e38f6a0) |
-| fmt | [2018-11-08 16:26](https://github.com/fmtlib/fmt/commits/1385050e267d645259d9fb66f016bdb2addb70a6) |
-| wlroots | [2018-11-10 06:38](https://github.com/swaywm/wlroots/commits/3181c4bec06d2fe51da052c0a08c8287725ec900) |
-| sway-beta | [2018-11-11 13:16](https://github.com/swaywm/sway/commits/ee6b0ce24ae74cfae5d41985cacdff6065c8f534) |
-| slurp | [2018-10-24 12:37](https://github.com/emersion/slurp/commits/0dbd03991462397eb92bb40af712c837c898ebf1) |
-| grim | [2018-10-24 12:39](https://github.com/emersion/grim/commits/61df6f0a9531520c898718874c460826bc7e2b42) |
-| mako | [2018-11-11 13:05](https://github.com/emersion/mako/commits/ecc483a6a8da89f05d33010f3b49d372a186ae9a) |
-| kanshi | [2018-11-05 02:42](https://github.com/emersion/kanshi/commits/ed21acce0c52f7893c903f46b09b4a3b55e2c198) |
-| wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
-| oguri | [2018-10-28 11:30](https://github.com/vilhalmer/oguri/commits/23bbd965f4744039c1c5a8e1d9604d6b8f6ab75f) |
-| waybar | [2018-11-11 04:41](https://github.com/Alexays/waybar/commits/3dc0f7ccf9cbfacf8c5eed13e19320bbd43288e8) |
-| wayfire | [2018-11-09 01:00](https://github.com/WayfireWM/wayfire/commits/7ee5a6524145584b38690bd9a75b23638db4152d) |
-| wf-config | [2018-10-22 00:05](https://github.com/WayfireWM/wf-config/commits/8f7046e6c67d4a277b0793b56ff6535f53997bc5) |
-| redshift-wayland | [2018-11-07 12:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
-| bspwc | [2018-10-19 05:58](https://github.com/Bl4ckb0ne/bspwc/commits/6a8ba7bc17146544f6e0446f473ff290e77e3256) |
-| waybox | [2018-10-06 13:44](https://github.com/wizbright/waybox/commits/24669f24f6ce41f99088483f5c55c41498a57662) |
-| wmfocus | [2018-11-01 11:17](https://github.com/svenstaro/wmfocus/commits/d6f5ff88b7fb5d2eedde3c5989ae49a656ac5adb) |
-| i3status-rust | [2018-11-09 14:22](https://github.com/greshake/i3status-rust/commits/47cb862c6e1763ae038d79915c2a4c28b073dd8e) |
+| nixpkgs/nixos-unstable | [2018-11-06 15:05](https://github.com/nixos/nixpkgs-channels/commits/6141939d6e0a77c84905efd560c03c3032164ef1) |
+| pkgs/fmt | [2018-11-08 16:26](https://github.com/fmtlib/fmt/commits/1385050e267d645259d9fb66f016bdb2addb70a6) |
+| pkgs/wlroots | [2018-11-10 06:38](https://github.com/swaywm/wlroots/commits/3181c4bec06d2fe51da052c0a08c8287725ec900) |
+| pkgs/sway-beta | [2018-11-11 13:16](https://github.com/swaywm/sway/commits/ee6b0ce24ae74cfae5d41985cacdff6065c8f534) |
+| pkgs/slurp | [2018-10-24 12:37](https://github.com/emersion/slurp/commits/0dbd03991462397eb92bb40af712c837c898ebf1) |
+| pkgs/grim | [2018-10-24 12:39](https://github.com/emersion/grim/commits/61df6f0a9531520c898718874c460826bc7e2b42) |
+| pkgs/mako | [2018-11-11 13:05](https://github.com/emersion/mako/commits/ecc483a6a8da89f05d33010f3b49d372a186ae9a) |
+| pkgs/kanshi | [2018-11-05 02:42](https://github.com/emersion/kanshi/commits/ed21acce0c52f7893c903f46b09b4a3b55e2c198) |
+| pkgs/wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
+| pkgs/oguri | [2018-10-28 11:30](https://github.com/vilhalmer/oguri/commits/23bbd965f4744039c1c5a8e1d9604d6b8f6ab75f) |
+| pkgs/waybar | [2018-11-11 04:41](https://github.com/Alexays/waybar/commits/3dc0f7ccf9cbfacf8c5eed13e19320bbd43288e8) |
+| pkgs/wayfire | [2018-11-09 01:00](https://github.com/WayfireWM/wayfire/commits/7ee5a6524145584b38690bd9a75b23638db4152d) |
+| pkgs/wf-config | [2018-10-22 00:05](https://github.com/WayfireWM/wf-config/commits/8f7046e6c67d4a277b0793b56ff6535f53997bc5) |
+| pkgs/redshift-wayland | [2018-11-07 12:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
+| pkgs/bspwc | [2018-10-19 05:58](https://github.com/Bl4ckb0ne/bspwc/commits/6a8ba7bc17146544f6e0446f473ff290e77e3256) |
+| pkgs/waybox | [2018-10-06 13:44](https://github.com/wizbright/waybox/commits/24669f24f6ce41f99088483f5c55c41498a57662) |
+| pkgs/wmfocus | [2018-11-01 11:17](https://github.com/svenstaro/wmfocus/commits/d6f5ff88b7fb5d2eedde3c5989ae49a656ac5adb) |
+| pkgs/i3status-rust | [2018-11-09 14:22](https://github.com/greshake/i3status-rust/commits/47cb862c6e1763ae038d79915c2a4c28b073dd8e) |
 <!--pkgs-->
 
-Auto-update script last run: <!--update-->2018-11-12 03:20<!--update-->.
+Auto-update script last run: <!--update-->2018-11-12 03:41<!--update-->.
 
 Please open an issue if something is out of date.
 
diff --git a/build.nix b/build.nix
index 213fcce..9653507 100644
--- a/build.nix
+++ b/build.nix
@@ -1,7 +1,9 @@
 let
-  overlays = [ (import ./default.nix) ];
-  pkgs-unstable= import (import ./pkgs-unstable) { inherit overlays; };
-  pkgs-release = import (import ./pkgs-18.09) { inherit overlays; };
+  pkgs = import (import ./nixpkgs/nixos-unstable) {
+    overlays = [ (import ./default.nix) ];
+  };
 in
-  pkgs-unstable.swaypkgs
+  [
+    pkgs.waylandpkgs
+  ]
 
diff --git a/default.nix b/default.nix
index 87321fa..36c98ec 100644
--- a/default.nix
+++ b/default.nix
@@ -1,32 +1,32 @@
 self: pkgs:
 let
-swaypkgs = {
+waylandpkgs = {
   # patched deps
-  fmt              = pkgs.callPackage ./fmt {};
+  fmt              = pkgs.callPackage ./pkgs/fmt {};
 
   # wlroots-related
-  wlroots          = pkgs.callPackage ./wlroots {};
-  sway-beta        = pkgs.callPackage ./sway-beta {};
-  grim             = pkgs.callPackage ./grim {};
-  slurp            = pkgs.callPackage ./slurp {};
-  mako             = pkgs.callPackage ./mako {};
-  kanshi           = pkgs.callPackage ./kanshi {};
-  wlstream         = pkgs.callPackage ./wlstream {};
-  oguri            = pkgs.callPackage ./oguri {};
-  waybar           = pkgs.callPackage ./waybar {};
-  wf-config        = pkgs.callPackage ./wf-config {};
-  wayfire          = pkgs.callPackage ./wayfire {};
-  redshift-wayland = pkgs.callPackage ./redshift-wayland {
+  wlroots          = pkgs.callPackage ./pkgs/wlroots {};
+  sway-beta        = pkgs.callPackage ./pkgs/sway-beta {};
+  grim             = pkgs.callPackage ./pkgs/grim {};
+  slurp            = pkgs.callPackage ./pkgs/slurp {};
+  mako             = pkgs.callPackage ./pkgs/mako {};
+  kanshi           = pkgs.callPackage ./pkgs/kanshi {};
+  wlstream         = pkgs.callPackage ./pkgs/wlstream {};
+  oguri            = pkgs.callPackage ./pkgs/oguri {};
+  waybar           = pkgs.callPackage ./pkgs/waybar {};
+  wf-config        = pkgs.callPackage ./pkgs/wf-config {};
+  wayfire          = pkgs.callPackage ./pkgs/wayfire {};
+  redshift-wayland = pkgs.callPackage ./pkgs/redshift-wayland {
     inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
     geoclue = pkgs.geoclue2;
   };
-  bspwc            = pkgs.callPackage ./bspwc {};
-  waybox           = pkgs.callPackage ./waybox {};
+  bspwc            = pkgs.callPackage ./pkgs/bspwc {};
+  waybox           = pkgs.callPackage ./pkgs/waybox {};
 
   # i3-related
-  wmfocus          = pkgs.callPackage ./wmfocus {};
-  i3status-rust    = pkgs.callPackage ./i3status-rust {};
+  wmfocus          = pkgs.callPackage ./pkgs/wmfocus {};
+  i3status-rust    = pkgs.callPackage ./pkgs/i3status-rust {};
 };
 in
-  swaypkgs // { inherit swaypkgs; }
+  waylandpkgs // { inherit waylandpkgs; }
 
diff --git a/pkgs-18.09/default.nix b/nixpkgs/nixos-unstable/default.nix
index 1d43220..1d43220 100644
--- a/pkgs-18.09/default.nix
+++ b/nixpkgs/nixos-unstable/default.nix
diff --git a/pkgs-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index 19ebd3c..19ebd3c 100644
--- a/pkgs-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
diff --git a/pkgs-18.09/metadata.nix b/pkgs-18.09/metadata.nix
deleted file mode 100644
index b626d7f..0000000
--- a/pkgs-18.09/metadata.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  rev = "a4c4cbb613cc3e15186de0fdb04082fa7e38f6a0";
-  sha256 = "1lagfycy2lvfc8cdxk98dz2rxjlrbmv9hj42x0x40sy66bck1w0y";
-  revdate = "2018-11-08T01:13:53Z";
-}
diff --git a/pkgs-unstable/default.nix b/pkgs-unstable/default.nix
deleted file mode 100644
index 1d43220..0000000
--- a/pkgs-unstable/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  meta = import ./metadata.nix;
-in
-  builtins.fetchTarball {
-    url = "https://github.com/nixos/nixpkgs-channels/archive/${meta.rev}.tar.gz";
-    sha256 = meta.sha256;
-  }
diff --git a/bspwc/default.nix b/pkgs/bspwc/default.nix
index d499354..d499354 100644
--- a/bspwc/default.nix
+++ b/pkgs/bspwc/default.nix
diff --git a/bspwc/metadata.nix b/pkgs/bspwc/metadata.nix
index 6d39631..6d39631 100644
--- a/bspwc/metadata.nix
+++ b/pkgs/bspwc/metadata.nix
diff --git a/fmt/0001-cmake-output-share-fmt.pc.patch b/pkgs/fmt/0001-cmake-output-share-fmt.pc.patch
index ab6100e..ab6100e 100644
--- a/fmt/0001-cmake-output-share-fmt.pc.patch
+++ b/pkgs/fmt/0001-cmake-output-share-fmt.pc.patch
diff --git a/fmt/default.nix b/pkgs/fmt/default.nix
index 45f4581..45f4581 100644
--- a/fmt/default.nix
+++ b/pkgs/fmt/default.nix
diff --git a/fmt/metadata.nix b/pkgs/fmt/metadata.nix
index a5784b4..a5784b4 100644
--- a/fmt/metadata.nix
+++ b/pkgs/fmt/metadata.nix
diff --git a/grim/default.nix b/pkgs/grim/default.nix
index 4d458f2..4d458f2 100644
--- a/grim/default.nix
+++ b/pkgs/grim/default.nix
diff --git a/grim/metadata.nix b/pkgs/grim/metadata.nix
index 64f2686..64f2686 100644
--- a/grim/metadata.nix
+++ b/pkgs/grim/metadata.nix
diff --git a/i3status-rust/0001-Cargo.lock-regenerate.patch b/pkgs/i3status-rust/0001-Cargo.lock-regenerate.patch
index ac2935d..ac2935d 100644
--- a/i3status-rust/0001-Cargo.lock-regenerate.patch
+++ b/pkgs/i3status-rust/0001-Cargo.lock-regenerate.patch
diff --git a/i3status-rust/default.nix b/pkgs/i3status-rust/default.nix
index f72ccc5..f72ccc5 100644
--- a/i3status-rust/default.nix
+++ b/pkgs/i3status-rust/default.nix
diff --git a/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 5213f50..5213f50 100644
--- a/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
diff --git a/kanshi/default.nix b/pkgs/kanshi/default.nix
index e4241b2..e4241b2 100644
--- a/kanshi/default.nix
+++ b/pkgs/kanshi/default.nix
diff --git a/kanshi/metadata.nix b/pkgs/kanshi/metadata.nix
index 6243fff..6243fff 100644
--- a/kanshi/metadata.nix
+++ b/pkgs/kanshi/metadata.nix
diff --git a/mako/default.nix b/pkgs/mako/default.nix
index 5dc42c2..5dc42c2 100644
--- a/mako/default.nix
+++ b/pkgs/mako/default.nix
diff --git a/mako/metadata.nix b/pkgs/mako/metadata.nix
index ab74006..ab74006 100644
--- a/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
diff --git a/oguri/default.nix b/pkgs/oguri/default.nix
index b0d1bb7..b0d1bb7 100644
--- a/oguri/default.nix
+++ b/pkgs/oguri/default.nix
diff --git a/oguri/metadata.nix b/pkgs/oguri/metadata.nix
index bff6325..bff6325 100644
--- a/oguri/metadata.nix
+++ b/pkgs/oguri/metadata.nix
diff --git a/redshift-wayland/575.patch b/pkgs/redshift-wayland/575.patch
index d731d8e..d731d8e 100644
--- a/redshift-wayland/575.patch
+++ b/pkgs/redshift-wayland/575.patch
diff --git a/redshift-wayland/default.nix b/pkgs/redshift-wayland/default.nix
index 992e460..992e460 100644
--- a/redshift-wayland/default.nix
+++ b/pkgs/redshift-wayland/default.nix
diff --git a/redshift-wayland/metadata.nix b/pkgs/redshift-wayland/metadata.nix
index a0d2a2b..a0d2a2b 100644
--- a/redshift-wayland/metadata.nix
+++ b/pkgs/redshift-wayland/metadata.nix
diff --git a/slurp/default.nix b/pkgs/slurp/default.nix
index 3a67c70..3a67c70 100644
--- a/slurp/default.nix
+++ b/pkgs/slurp/default.nix
diff --git a/slurp/metadata.nix b/pkgs/slurp/metadata.nix
index ff7c38d..ff7c38d 100644
--- a/slurp/metadata.nix
+++ b/pkgs/slurp/metadata.nix
diff --git a/sway-beta/default.nix b/pkgs/sway-beta/default.nix
index 2c873f0..2c873f0 100644
--- a/sway-beta/default.nix
+++ b/pkgs/sway-beta/default.nix
diff --git a/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix
index 1a99df4..1a99df4 100644
--- a/sway-beta/metadata.nix
+++ b/pkgs/sway-beta/metadata.nix
diff --git a/waybar/default.nix b/pkgs/waybar/default.nix
index d70b401..d70b401 100644
--- a/waybar/default.nix
+++ b/pkgs/waybar/default.nix
diff --git a/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 381ec60..381ec60 100644
--- a/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
diff --git a/waybox/default.nix b/pkgs/waybox/default.nix
index 22357ec..22357ec 100644
--- a/waybox/default.nix
+++ b/pkgs/waybox/default.nix
diff --git a/waybox/metadata.nix b/pkgs/waybox/metadata.nix
index a82988d..a82988d 100644
--- a/waybox/metadata.nix
+++ b/pkgs/waybox/metadata.nix
diff --git a/wayfire/default.nix b/pkgs/wayfire/default.nix
index d3c7c71..d3c7c71 100644
--- a/wayfire/default.nix
+++ b/pkgs/wayfire/default.nix
diff --git a/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index ab95070..ab95070 100644
--- a/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
diff --git a/wf-config/default.nix b/pkgs/wf-config/default.nix
index 8146916..8146916 100644
--- a/wf-config/default.nix
+++ b/pkgs/wf-config/default.nix
diff --git a/wf-config/metadata.nix b/pkgs/wf-config/metadata.nix
index d59e38f..d59e38f 100644
--- a/wf-config/metadata.nix
+++ b/pkgs/wf-config/metadata.nix
diff --git a/wlroots/default.nix b/pkgs/wlroots/default.nix
index 74b0900..74b0900 100644
--- a/wlroots/default.nix
+++ b/pkgs/wlroots/default.nix
diff --git a/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 62c4a17..62c4a17 100644
--- a/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
diff --git a/wlstream/default.nix b/pkgs/wlstream/default.nix
index 25ae554..25ae554 100644
--- a/wlstream/default.nix
+++ b/pkgs/wlstream/default.nix
diff --git a/wlstream/metadata.nix b/pkgs/wlstream/metadata.nix
index 33ca45a..33ca45a 100644
--- a/wlstream/metadata.nix
+++ b/pkgs/wlstream/metadata.nix
diff --git a/wmfocus/default.nix b/pkgs/wmfocus/default.nix
index d12e795..d12e795 100644
--- a/wmfocus/default.nix
+++ b/pkgs/wmfocus/default.nix
diff --git a/wmfocus/metadata.nix b/pkgs/wmfocus/metadata.nix
index 19889ce..19889ce 100644
--- a/wmfocus/metadata.nix
+++ b/pkgs/wmfocus/metadata.nix
diff --git a/update.sh b/update.sh
index 5ba7b9a..738a78b 100755
--- a/update.sh
+++ b/update.sh
@@ -33,30 +33,29 @@ function update() {
 }
 
 
-#      attr_name          repo_owner   repo_name          repo_rev
-update "pkgs-unstable"    "nixos"      "nixpkgs-channels" "nixos-unstable"
-update "pkgs-18.09"       "nixos"      "nixpkgs-channels" "nixos-18.09"
+# update <attr_name> <repo_owner> <repo_name> <repo_rev>
+update "nixpkgs/nixos-unstable" "nixos" "nixpkgs-channels" "nixos-unstable"
 
-update "fmt"              "fmtlib"     "fmt"              "master"
+update "pkgs/fmt"              "fmtlib"     "fmt"              "master"
 
-update "wlroots"          "swaywm"     "wlroots"          "master"
-update "sway-beta"        "swaywm"     "sway"             "master"
-update "slurp"            "emersion"   "slurp"            "master"
-update "grim"             "emersion"   "grim"             "master"
-update "mako"             "emersion"   "mako"             "master"
-update "kanshi"           "emersion"   "kanshi"           "master"
-update "wlstream"         "atomnuker"  "wlstream"         "master"
-update "oguri"            "vilhalmer"  "oguri"            "master"
-update "waybar"           "Alexays"    "waybar"           "master"
-update "wayfire"          "WayfireWM"  "wayfire"          "master"
-update "wf-config"        "WayfireWM"  "wf-config"        "master"
-update "redshift-wayland" "minus7"     "redshift"         "wayland"
-update "bspwc"            "Bl4ckb0ne"  "bspwc"            "master"
-update "waybox"           "wizbright"  "waybox"           "master"
+update "pkgs/wlroots"          "swaywm"     "wlroots"          "master"
+update "pkgs/sway-beta"        "swaywm"     "sway"             "master"
+update "pkgs/slurp"            "emersion"   "slurp"            "master"
+update "pkgs/grim"             "emersion"   "grim"             "master"
+update "pkgs/mako"             "emersion"   "mako"             "master"
+update "pkgs/kanshi"           "emersion"   "kanshi"           "master"
+update "pkgs/wlstream"         "atomnuker"  "wlstream"         "master"
+update "pkgs/oguri"            "vilhalmer"  "oguri"            "master"
+update "pkgs/waybar"           "Alexays"    "waybar"           "master"
+update "pkgs/wayfire"          "WayfireWM"  "wayfire"          "master"
+update "pkgs/wf-config"        "WayfireWM"  "wf-config"        "master"
+update "pkgs/redshift-wayland" "minus7"     "redshift"         "wayland"
+update "pkgs/bspwc"            "Bl4ckb0ne"  "bspwc"            "master"
+update "pkgs/waybox"           "wizbright"  "waybox"           "master"
 
 # i3-related
-update "wmfocus"          "svenstaro"  "wmfocus"          "master"
-update "i3status-rust"    "greshake"   "i3status-rust"    "master"
+update "pkgs/wmfocus"          "svenstaro"  "wmfocus"          "master"
+update "pkgs/i3status-rust"    "greshake"   "i3status-rust"    "master"
 
 # update README.md
 set +x