updates

34 files changed, 348 insertions, 126 deletions

diff --git a/README.md b/README.md
index c8d13ba..56e2267 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@ Automated, pre-built packages for Wayland (sway/wlroots) tools for NixOS.
 
 Packages from this overlay are regularly updated and built against `nixos-unstable` and `nixpkgs-unstable`.
 
-(Sister repositories: [nixpkgs-kubernetes](https://github.com/colemickens/nixpkgs-kubernetes), [nixpkgs-colemickens](https://github.com/colemickens/nixpkgs-colemickens))
-
 ## Packages
 
 <details><summary><em><b>Full list of Packages</b></em></summary>
@@ -15,29 +13,29 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-04-25 07:41](https://github.com/nixos/nixpkgs-channels/commits/dfd8f84aef129f1978e446b5d45ef05cd4421821) |
-| nixpkgs/nixpkgs-unstable | [2019-04-25 06:56](https://github.com/nixos/nixpkgs-channels/commits/ed1b59a98e7bd61dd7eac266569c294fb6b16300) |
-| pkgs/wlroots | [2019-04-28 21:00](https://github.com/swaywm/wlroots/commits/22dd7d3731634fc8e719768c8154a6e65f9e8f84) |
+| nixpkgs/nixos-unstable | [2019-05-22 00:08](https://github.com/nixos/nixpkgs-channels/commits/4dd5c93998da55002fdec1c715c680531420381c) |
+| nixpkgs/nixpkgs-unstable | [2019-05-20 20:55](https://github.com/nixos/nixpkgs-channels/commits/650a295621b27c4ebe0fa64a63fd25323e64deb3) |
 | pkgs/xdg-desktop-portal-wlr | [2019-02-12 12:09](https://github.com/emersion/xdg-desktop-portal-wlr/commits/74ee43cf37e716d0119f441be96e2b3fc9838797) |
-| pkgs/sway | [2019-04-28 18:07](https://github.com/swaywm/sway/commits/3b3e0560beb9a44f038736fd4c344052fdfe3f81) |
-| pkgs/swayidle | [2019-02-16 16:43](https://github.com/swaywm/swayidle/commits/3e392e31c0684854a9a145cda1bd9a44c99ef24d) |
-| pkgs/swaylock | [2019-04-22 22:14](https://github.com/swaywm/swaylock/commits/f403cc07021d75f54752584ead2f53f5dc50b673) |
+| pkgs/wlroots | [2019-05-22 23:42](https://github.com/swaywm/wlroots/commits/0ab1bb623e58bafef315c9eb33a430e72d40408a) |
+| pkgs/sway | [2019-05-22 19:33](https://github.com/swaywm/sway/commits/00cffb8e20d4bb800134f26dcda8a01afa4467d2) |
+| pkgs/swaybg | [2019-05-04 12:08](https://github.com/swaywm/swaybg/commits/25c6eaf15e64655385f01cbb98bffe28a862fe13) |
+| pkgs/swayidle | [2019-05-23 13:10](https://github.com/swaywm/swayidle/commits/5e7bd5bd21010cb5723acdf449edb341e9880ae2) |
+| pkgs/swaybg | [2019-05-04 12:08](https://github.com/swaywm/swaybg/commits/25c6eaf15e64655385f01cbb98bffe28a862fe13) |
+| pkgs/swaylock | [2019-05-23 06:43](https://github.com/swaywm/swaylock/commits/a9b274eb6c63397273515151324add022a3db2a9) |
 | pkgs/slurp | [2019-03-16 19:52](https://github.com/emersion/slurp/commits/92dc1ea1cf79541d157e98af3fb6aa4df501fef4) |
 | pkgs/grim | [2019-02-20 13:18](https://github.com/emersion/grim/commits/6994df611f55a4089209fdd5ad8d9301e4fb0167) |
-| pkgs/mako | [2019-04-28 08:29](https://github.com/emersion/mako/commits/9a3b0f338907df4ac4e0e81e947343270fc0df31) |
+| pkgs/mako | [2019-05-13 15:35](https://github.com/emersion/mako/commits/e6b9a429bd4d37df87a906e0ac0d92304d605290) |
 | pkgs/kanshi | [2019-02-02 23:21](https://github.com/emersion/kanshi/commits/970267e400c21a6bb51a1c80a0aadfd1e6660a7b) |
-| pkgs/wlstream | [2018-07-15 21:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
 | pkgs/oguri | [2019-02-19 14:19](https://github.com/vilhalmer/oguri/commits/59a51758f4b14f60113aad6ae4ebb92d80060ce5) |
-| pkgs/waybar | [2019-04-26 19:57](https://github.com/Alexays/waybar/commits/e8f31a0c4f659f9ab36eae048b4ef927c6013db3) |
-| pkgs/wayfire | [2019-04-21 07:40](https://github.com/WayfireWM/wayfire/commits/910d745cf2dd043a5a3436e98a5a00ba76642420) |
-| pkgs/wf-config | [2019-03-24 21:20](https://github.com/WayfireWM/wf-config/commits/a0504d822160c5fc69d3af9cf853e2cc2e5ce3e4) |
+| pkgs/waybar | [2019-05-23 08:13](https://github.com/Alexays/waybar/commits/2b34f3a30f48114e9f256d198afc8abfbabae8b6) |
+| pkgs/wayfire | [2019-05-22 12:55](https://github.com/WayfireWM/wayfire/commits/188dfd489ccb5e7889e998fded4070dafe922dda) |
+| pkgs/wf-config | [2019-05-10 12:27](https://github.com/WayfireWM/wf-config/commits/dd6f49522c7f6f4a303d9318cddf67ff38829b0a) |
 | pkgs/redshift-wayland | [2019-04-17 23:13](https://github.com/minus7/redshift/commits/eecbfedac48f827e96ad5e151de8f41f6cd3af66) |
-| pkgs/bspwc | [2018-12-29 23:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) |
 | pkgs/waybox | [2018-11-27 14:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
 | pkgs/wl-clipboard | [2019-04-15 15:53](https://github.com/bugaevc/wl-clipboard/commits/c010972e6b0d2eb3002c49a6a1b5620ff5f7c910) |
-| pkgs/wf-recorder | [2019-04-21 13:25](https://github.com/ammen99/wf-recorder/commits/ddb96690556371007e316577ed1b14f0cb62e13c) |
+| pkgs/wf-recorder | [2019-05-22 13:40](https://github.com/ammen99/wf-recorder/commits/43fb1c25a80ac1e498b4e4db9c28ebd3def5804a) |
 | pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
-| pkgs/i3status-rust | [2019-04-27 18:59](https://github.com/greshake/i3status-rust/commits/d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281) |
+| pkgs/i3status-rust | [2019-05-17 23:12](https://github.com/greshake/i3status-rust/commits/6d52d66b53facd734fea38c61fc7090110dcd46d) |
 <!--pkgs-->
 
 </details>
@@ -65,6 +63,7 @@ in
     nixpkgs.overlays = [ waylandOverlay ];
     programs.sway.enable = true;
     programs.sway.extraPackages = with pkgs; [
+      swaybg   # required by sway for controlling desktop wallpaper
       swayidle # used for controlling idle timeouts and triggers (screen locking, etc)
       swaylock # used for locking Wayland sessions
 
@@ -74,11 +73,16 @@ in
       grim     # screen image capture
       slurp    # screen are selection tool
       mako     # notification daemon
-      wlstream # screen recorder
       oguri    # animated background utility
+      glpaper  # animated background utility
       kanshi   # dynamic display configuration helper
+
       redshift-wayland # patched to work with wayland gamma protocol
+      wl-clipboard # clipboard CLI utilities
+      wf-recorder # wayland screenrecorder
+      gebaar-libinput # libinput utility
 
+      # TODO: more steps required to use this?
       xdg-desktop-portal-wlr # xdg-desktop-portal backend for wlroots
     ];
     environment.systemPackages = with pkgs; [
@@ -86,10 +90,28 @@ in
       wayfire  # 3D wayland compositor
       waybox   # An openbox clone on Wayland
       bspwc    # Wayland compositor based on BSPWM
+
+      wayfire   # wayfire WM
+      wf-config # wayfire config manager
     ];
   }
 ```
 
+### Usage (wlrobs)
+
+OBS Studio Plugins don't really fit into any NixOS infrastructure, so we'll
+follow the instructions provided by.
+
+Note, these instructions can probably be simplified to just consume a latest snapshot of this repo, rather than cloning the repo at a point in time:
+
+```bash
+mkdir -p ~/.config/nixpkgs/overlays
+git clone https://github.com/colemickens/nixpkgs-wayland ~/.config/nixpkgs/overlays/nixpkgs-wayland
+nix-env -iA wlrobs
+mkdir -p ~/.config/obs-studio
+ln -s ~/.nix-profile/share/obs/obs-plugins ~/.config/obs-studio/plugins
+```
+
 ### Quick Tips: `sway`
 
 * Usage of display managers with `sway` is not supported upstream, you should run it from a TTY.
diff --git a/default.nix b/default.nix
index 9cc42e6..a1e37e9 100644
--- a/default.nix
+++ b/default.nix
@@ -3,6 +3,7 @@ let
 waylandPkgs = rec {
   # temp
   sway-beta = sway;
+  spdlog = (pkgs.callPackage ./pkgs-temp/spdlog {}).spdlog_1;
 
   # wlroots-related
   scdoc            = pkgs.callPackage ./pkgs/scdoc {};
@@ -16,24 +17,25 @@ waylandPkgs = rec {
   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 { wlroots = pkgs.wlroots; };
+  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 ./pkgs/bspwc { wlroots = pkgs.wlroots; };
   waybox           = pkgs.callPackage ./pkgs/waybox { wlroots = pkgs.wlroots; };
   wl-clipboard     = pkgs.callPackage ./pkgs/wl-clipboard {};
   wf-recorder      = pkgs.callPackage ./pkgs/wf-recorder {};
-
   gebaar-libinput  = pkgs.callPackage ./pkgs/gebaar-libinput {};
-
-  # i3-related
   i3status-rust    = pkgs.callPackage ./pkgs/i3status-rust {};
+
+  bspwc    = pkgs.callPackage ./pkgs/bspwc { wlroots = pkgs.wlroots; };
+  wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = pkgs.wlroots; };
+  glpaper  = pkgs.callPackage ./pkgs/glpaper {};
+
+  wlrobs   = pkgs.callPackage ./pkgs/wlrobs {};
 };
 in
   waylandPkgs // { inherit waylandPkgs; }
diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index b90c874..f7d85b1 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "dfd8f84aef129f1978e446b5d45ef05cd4421821";
-  sha256 = "0av0q7xyv76jq2csbg10x8gcnlnadlppvlx616s7qz7jahkmymrl";
-  revdate = "2019-04-25T07:41:52Z";
+  rev = "4dd5c93998da55002fdec1c715c680531420381c";
+  sha256 = "06paxakic36nbdnwkkb1094fzp3lpzxxb1r57gmb3py6pb6xrcnh";
+  revdate = "2019-05-22T00:08:04Z";
 }
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index de91b36..93caf72 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ed1b59a98e7bd61dd7eac266569c294fb6b16300";
-  sha256 = "0b2wdbbaqdqccl7q9gskhfjk7xaqvjwcls4b6218anyc247gscnb";
-  revdate = "2019-04-25T06:56:55Z";
+  rev = "650a295621b27c4ebe0fa64a63fd25323e64deb3";
+  sha256 = "0rxjkfiq53ibz0rzggvnp341b6kgzgfr9x6q07m2my7ijlirs2da";
+  revdate = "2019-05-20T20:55:15Z";
 }
diff --git a/pkgs-temp/spdlog/default.nix b/pkgs-temp/spdlog/default.nix
new file mode 100644
index 0000000..5dd1228
--- /dev/null
+++ b/pkgs-temp/spdlog/default.nix
@@ -0,0 +1,47 @@
+{gcc8Stdenv, stdenv, fetchFromGitHub, cmake, gbenchmark }:
+
+let
+  generic = { version, sha256 }:
+    gcc8Stdenv.mkDerivation {
+      name = "spdlog-${version}";
+      inherit version;
+
+      src = fetchFromGitHub {
+        owner  = "gabime";
+        repo   = "spdlog";
+        rev    = "v${version}";
+        inherit sha256;
+      };
+
+      nativeBuildInputs = [ cmake ];
+      buildInputs = [ gbenchmark ];
+
+      cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ];
+
+      outputs = [ "out" "doc" ];
+
+      postInstall = ''
+        mkdir -p $out/share/doc/spdlog
+        cp -rv ../example $out/share/doc/spdlog
+      '';
+
+      meta = with stdenv.lib; {
+        description    = "Very fast, header only, C++ logging library.";
+        homepage       = https://github.com/gabime/spdlog;
+        license        = licenses.mit;
+        maintainers    = with maintainers; [ obadz ];
+        platforms      = platforms.all;
+      };
+    };
+in
+{
+  spdlog_1 = generic {
+    version = "1.3.1";
+    sha256 = "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd";
+  };
+
+  spdlog_0 = generic {
+    version = "0.17.0";
+    sha256 = "112kfh4fbpm5cvrmgbgz4d8s802db91mhyjpg7cwhlywffnzkwr9";
+  };
+}
diff --git a/pkgs/bspwc/default.nix b/pkgs/bspwc/default.nix
index d499354..77d1904 100644
--- a/pkgs/bspwc/default.nix
+++ b/pkgs/bspwc/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchgit
 , meson, ninja, pkgconfig
 , wlroots, wayland, wayland-protocols
 , pixman, libxkbcommon
 , libudev, mesa_noglu, libX11 # not mentioned in meson.build...
+, wltrunk
 }:
 
 let
@@ -12,16 +13,15 @@ stdenv.mkDerivation rec {
   name = "bspwc-${version}";
   version = metadata.rev;
 
-  src = fetchFromGitHub {
-    owner = "Bl4ckb0ne";
-    repo = "bspwc";
+  src = fetchgit {
+    url = "https://git.sr.ht/~bl4ckb0ne/bspwc";
     rev = version;
     sha256 = metadata.sha256;
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja ];
   buildInputs = [
-    wlroots wayland wayland-protocols wlroots
+    wlroots wayland wayland-protocols wlroots wltrunk
     pixman libxkbcommon libudev mesa_noglu libX11
   ];
   mesonFlags = [ "-Dauto_features=enabled" ];
diff --git a/pkgs/bspwc/metadata.nix b/pkgs/bspwc/metadata.nix
index b36f96b..ded22c3 100644
--- a/pkgs/bspwc/metadata.nix
+++ b/pkgs/bspwc/metadata.nix
@@ -1,5 +1,4 @@
 {
-  rev = "e72ff641bd30d3db153d879cea1cffd149931546";
-  sha256 = "1hp5k7fnkxdvbyxkl9yv85i4y4ayzy2cz9ryd7axxy9zs678lrcp";
-  revdate = "2018-12-29T23:21:06Z";
+  rev = "ad5b16a319c76d4ba823397f66f87a0969443a03";
+  sha256 = "0bd0liqxrw5mp368q1m4ivd9xhgz6qlj2rps6sxdg0bhi9gs3iw3";
 }
diff --git a/pkgs/glpaper/default.nix b/pkgs/glpaper/default.nix
new file mode 100644
index 0000000..3041911
--- /dev/null
+++ b/pkgs/glpaper/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchhg
+, pkgconfig
+, wlroots, wayland, wayland-protocols
+, pixman, libxkbcommon
+, libudev, mesa_noglu, libX11
+, libGLU_combined
+}:
+
+let
+  metadata = import ./metadata.nix;
+in
+stdenv.mkDerivation rec {
+  name = "glpaper-${version}";
+  version = metadata.rev;
+
+  src = fetchhg {
+    url = "https://bitbucket.org/Scoopta/glpaper";
+    rev = version;
+    sha256 = metadata.sha256;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    wlroots wayland wayland-protocols wlroots
+    pixman libxkbcommon libudev mesa_noglu libX11
+    libGLU_combined
+  ];
+
+  buildPhase = ''
+    cd Release
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp glpaper $out/bin/glpaper
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "GLPaper is a wallpaper program for wlroots based wayland compositors such as sway that allows you to render glsl shaders as your wallpaper";
+    homepage    = "https://bitbucket.org/Scoopta/glpaper";
+    license     = licenses.none;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/glpaper/metadata.nix b/pkgs/glpaper/metadata.nix
new file mode 100644
index 0000000..3ee1e39
--- /dev/null
+++ b/pkgs/glpaper/metadata.nix
@@ -0,0 +1,4 @@
+{
+  rev = "2e5f6c69c78e7da5e860714f79708d555f60691f";
+  sha256 = "0pal98h8pvd1dqyrj6ykdb46lp5m0lz5bwdz9mw3v59wzrxs0wfy";
+}
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index cc21ef2..22390bc 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281";
-  sha256 = "0x23qv7kwsqy1yx25fn1z56fx8w865qarr5xdx8s22x42ym4zyha";
-  revdate = "2019-04-27T18:59:31Z";
+  rev = "6d52d66b53facd734fea38c61fc7090110dcd46d";
+  sha256 = "12hiz5ylcy8ai4qh8i6rjl2y0hm2fcizqsdvysinsd8vhzzw9x8r";
+  revdate = "2019-05-17T23:12:23Z";
 }
diff --git a/pkgs/kanshi/default.nix b/pkgs/kanshi/default.nix
index 6c6cd04..2ea4f06 100644
--- a/pkgs/kanshi/default.nix
+++ b/pkgs/kanshi/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage {
   };
 
   cargoSha256Version = 2;
-  cargoSha256 = "0lf1zfmq9ypxk86ma0n4nczbklmjs631wdzfx4wd3cvhghyr8nkq";
+  cargoSha256 = "0pvkrdjrg9y38vsrqkrvsknzp78sknpmq14rskvij450a9mpihii";
 
   meta = with stdenv.lib; {
     description = "Dynamic display configuration";
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index 012684f..faab262 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "9a3b0f338907df4ac4e0e81e947343270fc0df31";
-  sha256 = "1d8abz3zh7jpxh8xzibwmznvsqs39czc7cxikyn2p3vc3mdz3gd8";
-  revdate = "2019-04-28T08:29:51Z";
+  rev = "e6b9a429bd4d37df87a906e0ac0d92304d605290";
+  sha256 = "1m6msqi24c3a6rf5d9srpj7hf7b5pyk4696hx58s1bv0fglad9hn";
+  revdate = "2019-05-13T15:35:56Z";
 }
diff --git a/pkgs/sway/default.nix b/pkgs/sway/default.nix
index 491c862..35dc148 100644
--- a/pkgs/sway/default.nix
+++ b/pkgs/sway/default.nix
@@ -5,6 +5,7 @@
 , libglvnd
 , pango, cairo, libinput, libcap, pam, gdk_pixbuf
 , wlroots, wayland-protocols
+, libGLU_combined
 }:
 
 let
@@ -13,7 +14,7 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "sway";
-  version = "1.0";
+  version = metadata.rev;
 
   src = fetchFromGitHub {
     owner = "swaywm";
@@ -24,8 +25,13 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./sway-config-no-nix-store-references.patch
+    ./load-configuration-from-etc.patch
   ];
 
+  postPatch = ''
+    sed -iE "0,/version: '.*',/ s//version: '${version}',/" meson.build
+  '';
+
   nativeBuildInputs = [ pkgconfig meson ninja scdoc ];
 
   buildInputs = [
diff --git a/pkgs/sway/load-configuration-from-etc.patch b/pkgs/sway/load-configuration-from-etc.patch
new file mode 100644
index 0000000..ba88368
--- /dev/null
+++ b/pkgs/sway/load-configuration-from-etc.patch
@@ -0,0 +1,43 @@
+From 26f9c65ef037892977a824f0d7d7111066856b53 Mon Sep 17 00:00:00 2001
+From: Michael Weiss <dev.primeos@gmail.com>
+Date: Sat, 27 Apr 2019 14:26:16 +0200
+Subject: [PATCH] Load configs from /etc but fallback to /nix/store
+
+This change will load all configuration files from /etc, to make it easy
+to override them, but fallback to /nix/store/.../etc/sway/config to make
+Sway work out-of-the-box with the default configuration on non NixOS
+systems.
+---
+ meson.build   | 3 ++-
+ sway/config.c | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02b5d606..c03a9c0f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -129,7 +129,8 @@ if scdoc.found()
+ 	endforeach
+ endif
+ 
+-add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
++add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
++add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
+ 
+ version = '"@0@"'.format(meson.project_version())
+ if git.found()
+diff --git a/sway/config.c b/sway/config.c
+index 4cd21bbc..dd855753 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -317,6 +317,7 @@ static char *get_config_path(void) {
+ 		"$XDG_CONFIG_HOME/i3/config",
+ 		SYSCONFDIR "/sway/config",
+ 		SYSCONFDIR "/i3/config",
++		NIX_SYSCONFDIR "/sway/config",
+ 	};
+ 
+ 	char *config_home = getenv("XDG_CONFIG_HOME");
+-- 
+2.19.2
+
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index 0765097..ffcced9 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3b3e0560beb9a44f038736fd4c344052fdfe3f81";
-  sha256 = "15l4gck4wsps884x0vbx6hlwxfxx857gha99w0pvdk0b84yfxap5";
-  revdate = "2019-04-28T18:07:47Z";
+  rev = "00cffb8e20d4bb800134f26dcda8a01afa4467d2";
+  sha256 = "0gayimaw6rl45d4bkry5k9nj6fdxnsz4fjjbiwyzv1rfzzbj1cr7";
+  revdate = "2019-05-22T19:33:10Z";
 }
diff --git a/pkgs/swaybg/default.nix b/pkgs/swaybg/default.nix
index 7f4347a..738a17f 100644
--- a/pkgs/swaybg/default.nix
+++ b/pkgs/swaybg/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
+  postPatch = ''
+    sed -iE "0,/version: '.*',/ s//version: '${version}',/" meson.build
+  '';
+
   nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs scdoc;
 
   buildInputs = [ cairo wayland wayland-protocols ] ++ stdenv.lib.optional nonPngSupport gdk_pixbuf;
diff --git a/pkgs/swaybg/metadata.nix b/pkgs/swaybg/metadata.nix
index 8acf5f8..877a1e9 100644
--- a/pkgs/swaybg/metadata.nix
+++ b/pkgs/swaybg/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "cf62ace04b82eaf7ad05c55639d1fd04e8380f2a";
-  sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc";
-  revdate = "2019-04-29T18:31:55Z";
+  rev = "25c6eaf15e64655385f01cbb98bffe28a862fe13";
+  sha256 = "1j39al8dnjkbsm68h7c9nf7gm79gf798qqfaks7fq0cphal1gnr0";
+  revdate = "2019-05-04T12:08:26Z";
 }
diff --git a/pkgs/swayidle/default.nix b/pkgs/swayidle/default.nix
index e027266..b495654 100644
--- a/pkgs/swayidle/default.nix
+++ b/pkgs/swayidle/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
+  postPatch = ''
+    sed -iE "0,/version: '.*',/ s//version: '${version}',/" meson.build
+  '';
+
   nativeBuildInputs = [
     pkgconfig meson ninja
   ] ++ stdenv.lib.optional buildDocs scdoc;
diff --git a/pkgs/swayidle/metadata.nix b/pkgs/swayidle/metadata.nix
index 4b6571f..761c551 100644
--- a/pkgs/swayidle/metadata.nix
+++ b/pkgs/swayidle/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "3e392e31c0684854a9a145cda1bd9a44c99ef24d";
-  sha256 = "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v";
-  revdate = "2019-02-16T16:43:36Z";
+  rev = "5e7bd5bd21010cb5723acdf449edb341e9880ae2";
+  sha256 = "0n22ryag6zczr04k4h0fwr23z3sqyzpfch8m27yyap4i6csymybg";
+  revdate = "2019-05-23T13:10:31Z";
 }
diff --git a/pkgs/swaylock/default.nix b/pkgs/swaylock/default.nix
index 905a7dc..2ec64ef 100644
--- a/pkgs/swaylock/default.nix
+++ b/pkgs/swaylock/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
+  postPatch = ''
+    sed -iE "0,/version: '.*',/ s//version: '${version}',/" meson.build
+  '';
+
   nativeBuildInputs = [
     pkgconfig meson ninja
   ] ++ stdenv.lib.optional buildDocs scdoc;
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
index 1b05a71..f75b464 100644
--- a/pkgs/swaylock/metadata.nix
+++ b/pkgs/swaylock/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "f403cc07021d75f54752584ead2f53f5dc50b673";
-  sha256 = "0wmk700nl0csk3bdmvn7vy2xxys986aq15ga7g80jw72cspyqg3z";
-  revdate = "2019-04-22T22:14:09Z";
+  rev = "a9b274eb6c63397273515151324add022a3db2a9";
+  sha256 = "0wmk01x42fhrq3wqdq7ibb9sr07q8bj0rkmzlnvxgp6m4a6mlwsm";
+  revdate = "2019-05-23T06:43:51Z";
 }
diff --git a/pkgs/waybar/default.nix b/pkgs/waybar/default.nix
index 666f72a..d3af301 100644
--- a/pkgs/waybar/default.nix
+++ b/pkgs/waybar/default.nix
@@ -5,6 +5,7 @@
 , fmt, jsoncpp, libdbusmenu-gtk3
 , glib
 , git
+, spdlog
 , mpd_clientlib
 }:
 
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
     libpulseaudio libinput libnl gtkmm3
     git fmt jsoncpp libdbusmenu-gtk3
     glib
+    spdlog
     mpd_clientlib
   ];
   mesonFlags = [
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 56fa307..70839c8 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "e8f31a0c4f659f9ab36eae048b4ef927c6013db3";
-  sha256 = "1wlh6lhlbyi5ril3barg6856zpizabr0lmsg5hd4s04g5kghssyb";
-  revdate = "2019-04-26T19:57:15Z";
+  rev = "2b34f3a30f48114e9f256d198afc8abfbabae8b6";
+  sha256 = "1f97ndr14gbnbydz01l9w5bly0m1rmjr55vzc8krjnlfbcqq3095";
+  revdate = "2019-05-23T08:13:49Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index 3f1d87b..1c3d758 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "910d745cf2dd043a5a3436e98a5a00ba76642420";
-  sha256 = "1pscldd8pip7g0vyw69abz8b816a40acncvy5aiqgr5z40cbvi3j";
-  revdate = "2019-04-21T07:40:39Z";
+  rev = "188dfd489ccb5e7889e998fded4070dafe922dda";
+  sha256 = "021297y93fyz7glljrrrf376hjr2wi16c7lmshd5dyrb8lnp96z9";
+  revdate = "2019-05-22T12:55:54Z";
 }
diff --git a/pkgs/wf-config/metadata.nix b/pkgs/wf-config/metadata.nix
index bbaedb5..f301bb6 100644
--- a/pkgs/wf-config/metadata.nix
+++ b/pkgs/wf-config/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "a0504d822160c5fc69d3af9cf853e2cc2e5ce3e4";
-  sha256 = "1kbk2yg0y5sf9vg5nfdjv5h1pmi38gb4qzca74nwxxp408l0ql6r";
-  revdate = "2019-03-24T21:20:57Z";
+  rev = "dd6f49522c7f6f4a303d9318cddf67ff38829b0a";
+  sha256 = "1b0q52vm02300zdn4gnrz9ivhsra3iirp58r66d8hg271cpgd8ds";
+  revdate = "2019-05-10T12:27:14Z";
 }
diff --git a/pkgs/wf-recorder/metadata.nix b/pkgs/wf-recorder/metadata.nix
index 04bae16..97c22c2 100644
--- a/pkgs/wf-recorder/metadata.nix
+++ b/pkgs/wf-recorder/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ddb96690556371007e316577ed1b14f0cb62e13c";
-  sha256 = "04amfd1kyklcj6nmmmf21dz333ykglvhxb3cbzak06v2fxlrp2w3";
-  revdate = "2019-04-21T13:25:23Z";
+  rev = "43fb1c25a80ac1e498b4e4db9c28ebd3def5804a";
+  sha256 = "0sx0l2l1h7z9zxkhddx18vjv2i0zs22s104ipli8vflza4n1f2hj";
+  revdate = "2019-05-22T13:40:15Z";
 }
diff --git a/pkgs/wlrobs/default.nix b/pkgs/wlrobs/default.nix
new file mode 100644
index 0000000..03f2542
--- /dev/null
+++ b/pkgs/wlrobs/default.nix
@@ -0,0 +1,39 @@
+# We don't have a wrapper which can supply obs-studio plugins so you have to
+# somewhat manually install this:
+
+# nix-env -f . -iA wlrobs
+# mkdir -p ~/.config/obs-studio/plugins
+# ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs ~/.config/obs-studio/plugins/
+
+{ stdenv, fetchhg, obs-studio, cmake, wlroots, wayland
+}:
+
+let
+  metadata = import ./metadata.nix;
+in
+stdenv.mkDerivation rec {
+  name = "wlrobs-${version}";
+  version = metadata.rev;
+  src = fetchhg {
+    url = "https://hg.sr.ht/~scoopta/wlrobs";
+    rev = metadata.rev;
+    sha256 = metadata.sha256;
+  };
+  nativeBuildInputs = [];
+  buildInputs = [ obs-studio wayland wlroots ];
+  buildPhase = ''
+    cd Release
+    make
+  '';
+  installPhase = ''
+    mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit
+    cp libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit
+  '';
+
+  meta = with stdenv.lib; {
+    description = "wlrobs is an obs-studio plugin that allows you to screen capture on wlroots based wayland compositors";
+    homepage = "https://sr.ht/~scoopta/wlrobs";
+    maintainers = with maintainers; [ colemickens ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/wlrobs/metadata.nix b/pkgs/wlrobs/metadata.nix
new file mode 100644
index 0000000..fce58ce
--- /dev/null
+++ b/pkgs/wlrobs/metadata.nix
@@ -0,0 +1,4 @@
+{
+  rev = "500756b7e5f3eeb621e1b2c888c7ff84356554b2";
+  sha256 = "1a4k5rfyw39k8pz50ib6aalkh8yd1jjyjjzxz3nfizr9l7p5i22d";
+}
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index b7f46b8..7a77d78 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pk