autoupdate, and autoupdate improvements

16 files changed, 56 insertions, 67 deletions

diff --git a/README.md b/README.md
index c6cb3eb..c6a54b4 100644
--- a/README.md
+++ b/README.md
@@ -17,24 +17,24 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 | -------------- | ------------------------- |
 | nixpkgs/nixos-unstable | [2019-02-11 12:02](https://github.com/nixos/nixpkgs-channels/commits/36f316007494c388df1fec434c1e658542e3c3cc) |
 | nixpkgs/nixpkgs-unstable | [2019-02-11 10:30](https://github.com/nixos/nixpkgs-channels/commits/1a88aa9e0cdcbc12acc5cbdc379c0804d208e913) |
-| pkgs/wlroots | [2019-02-12 06:57](https://github.com/swaywm/wlroots/commits/d1409e338175753667097b5e9843dc0841a4df88) |
-| pkgs/sway-beta | [2019-02-11 01:13](https://github.com/swaywm/sway/commits/fb4f29289fd8d1f94975e64fded6657222ed5390) |
-| pkgs/swayidle | [2019-02-05 05:37](https://github.com/swaywm/swayidle/commits/85a680178d1b310788272edd8fb6bf86304cf721) |
-| pkgs/swaylock | [2019-02-12 03:24](https://github.com/swaywm/swaylock/commits/ec78bb121f3bdf580ee97261e29f327cf57c0abb) |
-| pkgs/slurp | [2019-02-12 12:24](https://github.com/emersion/slurp/commits/0d1186f03d7db8ee8ae870087920bb538aaa522c) |
+| pkgs/wlroots | [2019-02-16 15:12](https://github.com/swaywm/wlroots/commits/3c9f791d0e0a0f0b3437b0b26ea606ce3344cfe2) |
+| pkgs/sway-beta | [2019-02-16 16:11](https://github.com/swaywm/sway/commits/7baaa3a0f80a28f58a3f95f7c3c832cb109b2aab) |
+| pkgs/swayidle | [2019-02-16 08:43](https://github.com/swaywm/swayidle/commits/3e392e31c0684854a9a145cda1bd9a44c99ef24d) |
+| pkgs/swaylock | [2019-02-12 14:27](https://github.com/swaywm/swaylock/commits/6b3be42264b9eaa8524ea4f0d93fbd1d82495d90) |
+| pkgs/slurp | [2019-02-13 02:39](https://github.com/emersion/slurp/commits/11cdf7795134fbe3fc633c2fe08bf94bfcfcbee6) |
 | pkgs/grim | [2019-02-05 07:32](https://github.com/emersion/grim/commits/c00f545e0f514ed192337657be4854bbb5a7caef) |
-| pkgs/mako | [2019-01-20 23:01](https://github.com/emersion/mako/commits/b30c786bdf8b90807e45ec0f52b292ee147ae1ff) |
+| pkgs/mako | [2019-02-16 12:18](https://github.com/emersion/mako/commits/05a3e4bf9cabf14585fde561b9c025e09abd2822) |
 | pkgs/kanshi | [2019-02-02 15:21](https://github.com/emersion/kanshi/commits/970267e400c21a6bb51a1c80a0aadfd1e6660a7b) |
 | pkgs/wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
-| pkgs/oguri | [2019-01-19 14:57](https://github.com/vilhalmer/oguri/commits/88996939e8fb55c0a8d34596604660c87c585462) |
-| pkgs/waybar | [2019-02-12 08:55](https://github.com/Alexays/waybar/commits/3e186734510a056e5949dfa9f0675dfcb711a99b) |
-| pkgs/wayfire | [2019-02-11 11:44](https://github.com/WayfireWM/wayfire/commits/f2017397471a7595c903b12970ab51e7f26045d0) |
-| pkgs/wf-config | [2019-02-11 11:42](https://github.com/WayfireWM/wf-config/commits/714ac10717bb7732db03225780395724deeb0f9f) |
+| pkgs/oguri | [2019-02-13 15:13](https://github.com/vilhalmer/oguri/commits/e39148b197f01c8674f850d85a0e416cca1738b9) |
+| pkgs/waybar | [2019-02-16 00:56](https://github.com/Alexays/waybar/commits/6bf4f65228d3fc053c27b89e248b2c0e2b7c5d32) |
+| pkgs/wayfire | [2019-02-16 02:44](https://github.com/WayfireWM/wayfire/commits/2faf01437450cba8fdf383a4acbf47f53a30e4e9) |
+| pkgs/wf-config | [2019-02-13 07:49](https://github.com/WayfireWM/wf-config/commits/52a7963f8a77bfa98b657c76304d7ad515b69878) |
 | pkgs/redshift-wayland | [2018-11-07 12:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
 | pkgs/bspwc | [2018-12-29 15:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) |
 | pkgs/waybox | [2018-11-27 06:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
 | pkgs/wl-clipboard | [2019-02-12 07:59](https://github.com/bugaevc/wl-clipboard/commits/a60fba0fad8399071bd36dbd2fb8fe0ef4cf6f11) |
-| pkgs/i3status-rust | [2019-02-02 06:04](https://github.com/greshake/i3status-rust/commits/550b60039a688d33df1439b7a003499fdd2ee90c) |
+| pkgs/i3status-rust | [2019-02-15 10:03](https://github.com/greshake/i3status-rust/commits/2dc958995834b529a245c22c510b57d5c928c747) |
 <!--pkgs-->
 
 </details>
diff --git a/build.nix b/build.nix
new file mode 100644
index 0000000..b985826
--- /dev/null
+++ b/build.nix
@@ -0,0 +1,10 @@
+let
+  # TODO: convert to callPackages and non-overlay style? more reliable and usable by others, but can cause more pkg dupe?
+  nixosUnstable = (import (import ./nixpkgs/nixos-unstable) { overlays = [ (import ./default.nix) ]; }).waylandPkgs;
+  nixpkgsUnstable = (import (import ./nixpkgs/nixos-unstable) { overlays = [ (import ./default.nix) ]; }).waylandPkgs;
+in
+  {
+    all = [ nixosUnstable nixpkgsUnstable ];
+    inherit nixosUnstable nixpkgsUnstable;
+  }
+
diff --git a/build.nixos-unstable.nix b/build.nixos-unstable.nix
deleted file mode 100644
index c167df4..0000000
--- a/build.nixos-unstable.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-let
-  pkgs = import (import ./nixpkgs/nixos-unstable) {
-    overlays = [ (import ./default.nix) ];
-  };
-in
-  pkgs.waylandPkgs
diff --git a/build.nixpkgs-unstable.nix b/build.nixpkgs-unstable.nix
deleted file mode 100644
index ba75ace..0000000
--- a/build.nixpkgs-unstable.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-let
-  pkgs = import (import ./nixpkgs/nixpkgs-unstable) {
-    overlays = [ (import ./default.nix) ];
-  };
-in
-  pkgs.waylandPkgs
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index c7309cb..761d625 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "550b60039a688d33df1439b7a003499fdd2ee90c";
-  sha256 = "1s52d5r7bag0cqjbw77cyf7y9i3c2ja01jm5hwy4xx9ags6j7mdd";
-  revdate = "2019-02-02T14:04:26Z";
+  rev = "2dc958995834b529a245c22c510b57d5c928c747";
+  sha256 = "091a2pqgkiwnya2xv5rw5sj730hf6lvkp2kk5midsa3wz2dfbc2j";
+  revdate = "2019-02-15T18:03:08Z";
 }
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index 9ce99fa..3090668 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "b30c786bdf8b90807e45ec0f52b292ee147ae1ff";
-  sha256 = "1dw75cdvn34kmwdgzm228zvm0apd10rw1hx1k9xbmhihzf7jg76y";
-  revdate = "2019-01-21T07:01:30Z";
+  rev = "05a3e4bf9cabf14585fde561b9c025e09abd2822";
+  sha256 = "0d8bp9p5wqgwpb2m2c1xvchncqdzajjm902lhqycnp1qaxrx39rw";
+  revdate = "2019-02-16T20:18:18Z";
 }
diff --git a/pkgs/oguri/metadata.nix b/pkgs/oguri/metadata.nix
index ca17c6a..75321a7 100644
--- a/pkgs/oguri/metadata.nix
+++ b/pkgs/oguri/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "88996939e8fb55c0a8d34596604660c87c585462";
-  sha256 = "0070gp76nmfpa2p79sazah59n5105p8mjr2q6k6p4h6d53qq56j0";
-  revdate = "2019-01-19T22:57:31Z";
+  rev = "e39148b197f01c8674f850d85a0e416cca1738b9";
+  sha256 = "0jgpijv6vlra78y1kimh461ca8cm3y4lnr9g7h1pqv9y9wqi87zp";
+  revdate = "2019-02-13T23:13:25Z";
 }
diff --git a/pkgs/slurp/metadata.nix b/pkgs/slurp/metadata.nix
index 0f53cea..6aa8756 100644
--- a/pkgs/slurp/metadata.nix
+++ b/pkgs/slurp/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "0d1186f03d7db8ee8ae870087920bb538aaa522c";
-  sha256 = "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y";
-  revdate = "2019-02-12T20:24:23Z";
+  rev = "11cdf7795134fbe3fc633c2fe08bf94bfcfcbee6";
+  sha256 = "1p5kpjs9547ddh0jjdaccmjnr0s1dx840lp2vplqxv4s0ifsqbw8";
+  revdate = "2019-02-13T10:39:05Z";
 }
diff --git a/pkgs/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix
index eb30c71..f451b66 100644
--- a/pkgs/sway-beta/metadata.nix
+++ b/pkgs/sway-beta/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "fb4f29289fd8d1f94975e64fded6657222ed5390";
-  sha256 = "052if3nagmwg5zh79nhrq75fbc9v2x950lcs1mal52p801qiv8f1";
-  revdate = "2019-02-11T09:13:16Z";
+  rev = "7baaa3a0f80a28f58a3f95f7c3c832cb109b2aab";
+  sha256 = "0mhw7grl5p0fdnsddy006jmmz0hjpl8b0zhf2dliwy11vcqd2x67";
+  revdate = "2019-02-17T00:11:22Z";
 }
diff --git a/pkgs/swayidle/metadata.nix b/pkgs/swayidle/metadata.nix
index 34c53e0..4b6571f 100644
--- a/pkgs/swayidle/metadata.nix
+++ b/pkgs/swayidle/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "85a680178d1b310788272edd8fb6bf86304cf721";
-  sha256 = "1xca5zb82zzac7410lwsxfb16kjxy3x94pqqgkkfrqjp2va44cag";
-  revdate = "2019-02-05T13:37:55Z";
+  rev = "3e392e31c0684854a9a145cda1bd9a44c99ef24d";
+  sha256 = "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v";
+  revdate = "2019-02-16T16:43:36Z";
 }
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
index 51811f0..0bc0baa 100644
--- a/pkgs/swaylock/metadata.nix
+++ b/pkgs/swaylock/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ec78bb121f3bdf580ee97261e29f327cf57c0abb";
-  sha256 = "026ancl2w2g4ll7z1chs4lp2hwxpgdpyb4jds7jg2a3c6ah494mw";
-  revdate = "2019-02-12T11:24:21Z";
+  rev = "6b3be42264b9eaa8524ea4f0d93fbd1d82495d90";
+  sha256 = "0al63s2690y2k9ymd7l13p2r28wpy6svziwcgjpasmyga9vckgxv";
+  revdate = "2019-02-12T22:27:26Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 8bf3aa9..7e33fe7 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3e186734510a056e5949dfa9f0675dfcb711a99b";
-  sha256 = "1njdp3jdp10sg0dhimkzq3gd0n39j8fac2sdppvxzjjfq95f6h3r";
-  revdate = "2019-02-12T16:55:50Z";
+  rev = "6bf4f65228d3fc053c27b89e248b2c0e2b7c5d32";
+  sha256 = "129zc0yfwn1rdhz2pl8r4xa2nr19jm0grp809h0i8j0zzkw15n1l";
+  revdate = "2019-02-16T08:56:53Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index 1b0b7f2..95f4213 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "f2017397471a7595c903b12970ab51e7f26045d0";
-  sha256 = "11qsfzjmdgjx6j3y842kl6m0wlnqlyjn2vn3wi1fnkx3y60v090i";
-  revdate = "2019-02-11T19:44:16Z";
+  rev = "2faf01437450cba8fdf383a4acbf47f53a30e4e9";
+  sha256 = "1gww1jjnbfkap4bd5sbd6dywl54hbi1q47w9qq8mz6z12b8mc9cp";
+  revdate = "2019-02-16T10:44:02Z";
 }
diff --git a/pkgs/wf-config/metadata.nix b/pkgs/wf-config/metadata.nix
index 2c0df8f..5fcc309 100644
--- a/pkgs/wf-config/metadata.nix
+++ b/pkgs/wf-config/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "714ac10717bb7732db03225780395724deeb0f9f";
-  sha256 = "1m84rjhjc4qhxkfhv63kz5gn2mx1iy2sf3z4hl1ri7kl5g7qs0j8";
-  revdate = "2019-02-11T19:42:10Z";
+  rev = "52a7963f8a77bfa98b657c76304d7ad515b69878";
+  sha256 = "14njrrlrvf25dv36zn3pxi9isppz4z3awys77ddcpbq42qi72ykj";
+  revdate = "2019-02-13T15:49:35Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 558c1ea..898a7b9 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "d1409e338175753667097b5e9843dc0841a4df88";
-  sha256 = "09rm2fa8svwds5ig07ydh5zl3mksrq2nfqrlpmjy1z58ilf7ih80";
-  revdate = "2019-02-12T14:57:56Z";
+  rev = "3c9f791d0e0a0f0b3437b0b26ea606ce3344cfe2";
+  sha256 = "1ybsnqsjbl6vibvnyrb057kmh8b777nl8834355qqzk6m0nwq7mh";
+  revdate = "2019-02-16T23:12:59Z";
 }
diff --git a/update.sh b/update.sh
index 5217511..c020013 100755
--- a/update.sh
+++ b/update.sh
@@ -73,15 +73,6 @@ rg --multiline '(?s)(.*)<!--pkgs-->(.*)<!--pkgs-->(.*)' "README.md" \
   --replace "\$1${replace}\$3" \
     > README2.md; mv README2.md README.md
 
-# build all
-nix-build --no-out-link --keep-going build.nixos-unstable.nix || true
-nix-build --no-out-link --keep-going build.nixpkgs-unstable.nix || true
-
-# push all to cachix
-nix-build --no-out-link --keep-going build.nixos-unstable.nix   | cachix push "${cachixremote}" || true
-nix-build --no-out-link --keep-going build.nixpkgs-unstable.nix | cachix push "${cachixremote}" || true
-
-# these should be noops if all went well
-nix-build --no-out-link build.nixos-unstable.nix   | cachix push "${cachixremote}"
-nix-build --no-out-link build.nixpkgs-unstable.nix | cachix push "${cachixremote}"
+# build and push
+nix-build --no-out-link build.nix -A all | cachix push "${cachixremote}"