From 7f3c4b5df206656f05c3b2c55159a3bf721e3d18 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:12:32 -0300
Subject: [PATCH 01/12] clipman: rename from tools/misc to tools/wayland

---
 pkgs/tools/{misc => wayland}/clipman/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename pkgs/tools/{misc => wayland}/clipman/default.nix (86%)

diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix
similarity index 86%
rename from pkgs/tools/misc/clipman/default.nix
rename to pkgs/tools/wayland/clipman/default.nix
index 80a0afe68d3..3a2c2ca6015 100644
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/pkgs/tools/wayland/clipman/default.nix
@@ -1,4 +1,9 @@
-{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }:
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, wl-clipboard
+, makeWrapper
+}:
 
 buildGoModule rec {
   pname = "clipman";
@@ -24,9 +29,9 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/yory8/clipman";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ ma27 ];
     description = "A simple clipboard manager for Wayland";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ma27 ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d70c6f9bda0..e9bf3f79b6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1964,7 +1964,7 @@ in
 
   chntpw = callPackage ../tools/security/chntpw { };
 
-  clipman = callPackage ../tools/misc/clipman { };
+  clipman = callPackage ../tools/wayland/clipman { };
 
   clipster = callPackage ../tools/misc/clipster { };
 

From fa1d3eee74718a1b1dbbac699d040ca049971f18 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:15:25 -0300
Subject: [PATCH 02/12] kanshi: rename from tools/misc to tools/wayland

---
 pkgs/tools/{misc => wayland}/kanshi/default.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                 |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)
 rename pkgs/tools/{misc => wayland}/kanshi/default.nix (87%)

diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix
similarity index 87%
rename from pkgs/tools/misc/kanshi/default.nix
rename to pkgs/tools/wayland/kanshi/default.nix
index 90ee2a3446b..c661c98a24b 100644
--- a/pkgs/tools/misc/kanshi/default.nix
+++ b/pkgs/tools/wayland/kanshi/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, scdoc
+, wayland
+}:
 
 stdenv.mkDerivation rec {
   pname = "kanshi";
@@ -15,6 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ wayland ];
 
   meta = with lib; {
+    homepage = "https://github.com/emersion/kanshi";
     description = "Dynamic display configuration tool";
     longDescription = ''
       kanshi allows you to define output profiles that are automatically enabled
@@ -24,8 +33,6 @@ stdenv.mkDerivation rec {
       kanshi can be used on Wayland compositors supporting the
       wlr-output-management protocol.
     '';
-    homepage = "https://github.com/emersion/kanshi";
-    downloadPage = "https://github.com/emersion/kanshi";
     license = licenses.mit;
     maintainers = with maintainers; [ balsoft ];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9bf3f79b6c..59051acbf70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,6 +1966,8 @@ in
 
   clipman = callPackage ../tools/wayland/clipman { };
 
+  kanshi = callPackage ../tools/wayland/kanshi { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -23122,8 +23124,6 @@ in
 
   kanboard = callPackage ../applications/misc/kanboard { };
 
-  kanshi = callPackage ../tools/misc/kanshi { };
-
   kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { };
 
   kapow = libsForQt5.callPackage ../applications/misc/kapow { };

From 70066b0191d46fd87f0fb53af202eb0796010767 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:19:45 -0300
Subject: [PATCH 03/12] slurp: rename from tools/misc to tools/wayland

---
 pkgs/tools/{misc => wayland}/slurp/default.nix | 14 +++++++++++---
 pkgs/top-level/all-packages.nix                |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename pkgs/tools/{misc => wayland}/slurp/default.nix (86%)

diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix
similarity index 86%
rename from pkgs/tools/misc/slurp/default.nix
rename to pkgs/tools/wayland/slurp/default.nix
index ed4bb0037fb..107ef68da56 100644
--- a/pkgs/tools/misc/slurp/default.nix
+++ b/pkgs/tools/wayland/slurp/default.nix
@@ -1,5 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
-, cairo, libxkbcommon, wayland, wayland-protocols
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, cairo
+, libxkbcommon
+, wayland
+, wayland-protocols
 , buildDocs ? true, scdoc
 }:
 
@@ -33,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Select a region in a Wayland compositor";
     homepage = "https://github.com/emersion/slurp";
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ buffet ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59051acbf70..e366d56108b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1968,6 +1968,8 @@ in
 
   kanshi = callPackage ../tools/wayland/kanshi { };
 
+  slurp = callPackage ../tools/wayland/slurp { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -24823,8 +24825,6 @@ in
 
   slrn = callPackage ../applications/networking/newsreaders/slrn { };
 
-  slurp = callPackage ../tools/misc/slurp { };
-
   sniproxy = callPackage ../applications/networking/sniproxy { };
 
   sooperlooper = callPackage ../applications/audio/sooperlooper { };

From e72435ba8ebc12a548224e4a522c5306007da0f4 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:23:16 -0300
Subject: [PATCH 04/12] wev: rename from tools/misc to tools/wayland

---
 pkgs/tools/{misc => wayland}/wev/default.nix | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix              |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)
 rename pkgs/tools/{misc => wayland}/wev/default.nix (88%)

diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/wayland/wev/default.nix
similarity index 88%
rename from pkgs/tools/misc/wev/default.nix
rename to pkgs/tools/wayland/wev/default.nix
index c1debfd924d..83e4113f7ea 100644
--- a/pkgs/tools/misc/wev/default.nix
+++ b/pkgs/tools/wayland/wev/default.nix
@@ -1,6 +1,11 @@
-{ lib, stdenv, fetchurl
-, pkg-config, scdoc, wayland
-, wayland-protocols, libxkbcommon
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, scdoc
+, wayland
+, wayland-protocols
+, libxkbcommon
 }:
 
 stdenv.mkDerivation rec {
@@ -18,14 +23,14 @@ stdenv.mkDerivation rec {
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
+    homepage = "https://git.sr.ht/~sircmpwn/wev";
     description = "Wayland event viewer";
     longDescription = ''
       This is a tool for debugging events on a Wayland window, analagous to the
       X11 tool xev.
     '';
-    homepage = "https://git.sr.ht/~sircmpwn/wev";
     license = licenses.mit;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e366d56108b..8a07b8155a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1970,6 +1970,8 @@ in
 
   slurp = callPackage ../tools/wayland/slurp { };
 
+  wev = callPackage ../tools/wayland/wev { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -3856,8 +3858,6 @@ in
 
   wayland-utils = callPackage ../tools/wayland/wayland-utils { };
 
-  wev = callPackage ../tools/misc/wev { };
-
   wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
 
   wlsunset = callPackage ../tools/wayland/wlsunset { };

From e6070d1e084df2baeb2e2d028b71f86888d57a26 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:27:54 -0300
Subject: [PATCH 05/12] wl-clipboard: rename from tools/misc to tools/wayland

---
 .../{misc => wayland}/wl-clipboard/default.nix      | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                     |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)
 rename pkgs/tools/{misc => wayland}/wl-clipboard/default.nix (86%)

diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix
similarity index 86%
rename from pkgs/tools/misc/wl-clipboard/default.nix
rename to pkgs/tools/wayland/wl-clipboard/default.nix
index 676ff03ad9b..0c94e98335f 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard/default.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
-, wayland, wayland-protocols }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, wayland
+, wayland-protocols
+}:
 
 stdenv.mkDerivation rec {
   pname = "wl-clipboard";
@@ -16,8 +23,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ wayland ];
 
   meta = with lib; {
-    description = "Command-line copy/paste utilities for Wayland";
     homepage = "https://github.com/bugaevc/wl-clipboard";
+    description = "Command-line copy/paste utilities for Wayland";
     license = licenses.gpl3;
     maintainers = with maintainers; [ dywedir ];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a07b8155a4..b30769eb21b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1972,6 +1972,8 @@ in
 
   wev = callPackage ../tools/wayland/wev { };
 
+  wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -3858,8 +3860,6 @@ in
 
   wayland-utils = callPackage ../tools/wayland/wayland-utils { };
 
-  wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
-
   wlsunset = callPackage ../tools/wayland/wlsunset { };
 
   wob = callPackage ../tools/misc/wob { };

From 34688a7fb0f0b0f7799ffc3b8ff0b8f2cc1e1fdf Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:30:42 -0300
Subject: [PATCH 06/12] wlr-randr: rename from tools/misc to tools/wayland

---
 pkgs/tools/{misc => wayland}/wlr-randr/default.nix | 13 +++++++++++--
 pkgs/top-level/all-packages.nix                    |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)
 rename pkgs/tools/{misc => wayland}/wlr-randr/default.nix (82%)

diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix
similarity index 82%
rename from pkgs/tools/misc/wlr-randr/default.nix
rename to pkgs/tools/wayland/wlr-randr/default.nix
index b635316bf77..9788878a3d5 100644
--- a/pkgs/tools/misc/wlr-randr/default.nix
+++ b/pkgs/tools/wayland/wlr-randr/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, cmake
+, pkg-config
+, wayland
+}:
 
 stdenv.mkDerivation rec {
   pname = "wlr-randr";
@@ -15,9 +23,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ wayland ];
 
   meta = with lib; {
-    license = licenses.mit;
     description = "An xrandr clone for wlroots compositors";
     homepage = "https://github.com/emersion/wlr-randr";
+    license = licenses.mit;
     maintainers = with maintainers; [ ma27 ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b30769eb21b..a0d0df6f953 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1974,6 +1974,8 @@ in
 
   wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
 
+  wlr-randr = callPackage ../tools/wayland/wlr-randr { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -22818,8 +22820,6 @@ in
 
   super-productivity = callPackage ../applications/networking/super-productivity { };
 
-  wlr-randr = callPackage ../tools/misc/wlr-randr { };
-
   wlroots = callPackage ../development/libraries/wlroots { };
 
   sway-unwrapped = callPackage ../applications/window-managers/sway { };

From c0cec33cbad387945c38ce28c8e49d473df17cb3 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:33:21 -0300
Subject: [PATCH 07/12] wob: rename from tools/misc to tools/wayland

---
 pkgs/tools/{misc => wayland}/wob/default.nix | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix              |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)
 rename pkgs/tools/{misc => wayland}/wob/default.nix (87%)

diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/wayland/wob/default.nix
similarity index 87%
rename from pkgs/tools/misc/wob/default.nix
rename to pkgs/tools/wayland/wob/default.nix
index e0622e5416a..3567ed6eea4 100644
--- a/pkgs/tools/misc/wob/default.nix
+++ b/pkgs/tools/wayland/wob/default.nix
@@ -1,6 +1,13 @@
-{ lib, stdenv, fetchFromGitHub
-, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner
-, wayland-protocols, libseccomp
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, scdoc
+, libseccomp
+, wayland # wayland-scanner
+, wayland-protocols
 }:
 
 stdenv.mkDerivation rec {
@@ -21,15 +28,15 @@ stdenv.mkDerivation rec {
   mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled";
 
   meta = with lib; {
+    inherit (src.meta) homepage;
     description = "A lightweight overlay bar for Wayland";
     longDescription = ''
       A lightweight overlay volume/backlight/progress/anything bar for Wayland,
       inspired by xob.
     '';
-    inherit (src.meta) homepage;
     changelog = "https://github.com/francma/wob/releases/tag/${version}";
     license = licenses.isc;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0d0df6f953..649825cbb7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1976,6 +1976,8 @@ in
 
   wlr-randr = callPackage ../tools/wayland/wlr-randr { };
 
+  wob = callPackage ../tools/wayland/wob { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -3864,8 +3866,6 @@ in
 
   wlsunset = callPackage ../tools/wayland/wlsunset { };
 
-  wob = callPackage ../tools/misc/wob { };
-
   wtype = callPackage ../tools/wayland/wtype { };
 
   wrangler = callPackage ../development/tools/wrangler { };

From 7d7036b5e71213898533547509d0eba73473a871 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 00:33:51 -0300
Subject: [PATCH 08/12] Aglomerating all tools/wayland

---
 pkgs/top-level/all-packages.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 649825cbb7a..fcaa5830416 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1970,14 +1970,24 @@ in
 
   slurp = callPackage ../tools/wayland/slurp { };
 
+  wayland-utils = callPackage ../tools/wayland/wayland-utils { };
+
   wev = callPackage ../tools/wayland/wev { };
 
   wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
 
   wlr-randr = callPackage ../tools/wayland/wlr-randr { };
 
+  wlsunset = callPackage ../tools/wayland/wlsunset { };
+
   wob = callPackage ../tools/wayland/wob { };
 
+  wshowkeys = callPackage ../tools/wayland/wshowkeys { };
+
+  wtype = callPackage ../tools/wayland/wtype { };
+
+  ydotool = callPackage ../tools/wayland/ydotool { };
+
   clipster = callPackage ../tools/misc/clipster { };
 
   contrast = callPackage ../applications/accessibility/contrast { };
@@ -3862,16 +3872,8 @@ in
 
   wallutils = callPackage ../tools/graphics/wallutils { };
 
-  wayland-utils = callPackage ../tools/wayland/wayland-utils { };
-
-  wlsunset = callPackage ../tools/wayland/wlsunset { };
-
-  wtype = callPackage ../tools/wayland/wtype { };
-
   wrangler = callPackage ../development/tools/wrangler { };
 
-  wshowkeys = callPackage ../tools/wayland/wshowkeys { };
-
   wsl-open = callPackage ../tools/misc/wsl-open { };
 
   xkcdpass = with python3Packages; toPythonApplication xkcdpass;
@@ -17323,8 +17325,6 @@ in
 
   yder = callPackage ../development/libraries/yder { };
 
-  ydotool = callPackage ../tools/wayland/ydotool { };
-
   yojimbo = callPackage ../development/libraries/yojimbo { };
 
   yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { };

From 973473e2499f7a4476176702a18e8a6a30803d49 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 03:33:02 -0300
Subject: [PATCH 09/12] wlogout: init at 1.1.1

---
 pkgs/tools/wayland/wlogout/default.nix | 54 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/wayland/wlogout/default.nix

diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix
new file mode 100644
index 00000000000..2625405808c
--- /dev/null
+++ b/pkgs/tools/wayland/wlogout/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, meson
+, ninja
+, scdoc
+, gtk3
+, libxkbcommon
+, wayland
+, wayland-protocols
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wlogout";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "ArtsyMacaw";
+    repo = "wlogout";
+    rev = version;
+    sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs=";
+  };
+
+  nativeBuildInputs = [ pkg-config meson ninja scdoc ];
+  buildInputs = [
+    gtk3
+    libxkbcommon
+    wayland
+    wayland-protocols
+  ];
+
+  postPatch = ''
+    substituteInPlace style.css \
+      --replace "/usr/share/wlogout" "$out/share/${pname}"
+
+    substituteInPlace main.c \
+      --replace "/etc/wlogout" "$out/etc/${pname}"
+  '';
+
+  mesonFlags = [
+    "--datadir=${placeholder "out"}/share"
+    "--sysconfdir=${placeholder "out"}/etc"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/ArtsyMacaw/wlogout";
+    description = "A wayland based logout menu";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
+# TODO: shell completions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcaa5830416..d8a61d5afda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1976,6 +1976,8 @@ in
 
   wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
 
+  wlogout = callPackage ../tools/wayland/wlogout { };
+
   wlr-randr = callPackage ../tools/wayland/wlr-randr { };
 
   wlsunset = callPackage ../tools/wayland/wlsunset { };

From f529ec396f71659e469e8a1a8fbee8dc3fdd1e7e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 12:36:31 -0300
Subject: [PATCH 10/12] oguri: init at unstable-2020-12-19

---
 pkgs/tools/wayland/oguri/default.nix | 39 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/wayland/oguri/default.nix

diff --git a/pkgs/tools/wayland/oguri/default.nix b/pkgs/tools/wayland/oguri/default.nix
new file mode 100644
index 00000000000..458ea310a01
--- /dev/null
+++ b/pkgs/tools/wayland/oguri/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, meson
+, ninja
+, cairo
+, gdk-pixbuf
+, wayland
+, wayland-protocols
+}:
+
+stdenv.mkDerivation rec {
+  pname = "oguri";
+  version = "unstable-2020-12-19";
+
+  src = fetchFromGitHub {
+    owner = "vilhalmer";
+    repo = pname;
+    rev = "6937fee10a9b0ef3ad8f94f606c0e0d9e7dec564";
+    sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ=";
+  };
+
+  nativeBuildInputs = [ pkg-config meson ninja ];
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    wayland
+    wayland-protocols
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/vilhalmer/oguri/";
+    description = "A very nice animated wallpaper daemon for Wayland compositors";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8a61d5afda..595dd63b250 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1968,6 +1968,8 @@ in
 
   kanshi = callPackage ../tools/wayland/kanshi { };
 
+  oguri = callPackage  ../tools/wayland/oguri { };
+
   slurp = callPackage ../tools/wayland/slurp { };
 
   wayland-utils = callPackage ../tools/wayland/wayland-utils { };

From baa730958207ee7bcb5c87f8e3e0d5f15c96440b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 17:24:46 -0300
Subject: [PATCH 11/12] wl-clipboard: update license

---
 pkgs/tools/wayland/wl-clipboard/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix
index 0c94e98335f..0bc195e9626 100644
--- a/pkgs/tools/wayland/wl-clipboard/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/bugaevc/wl-clipboard";
     description = "Command-line copy/paste utilities for Wayland";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dywedir ];
     platforms = platforms.linux;
   };
 }
+# TODO: is wayland-protocols a nativeBuildInput or a buildInput?

From 90ca606afdb94b908230b93d9bf4dd4ac5dbf9e6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 16 Feb 2021 17:25:32 -0300
Subject: [PATCH 12/12] wlr-randr: eliminate unneeded cmake dependency

---
 pkgs/tools/wayland/wlr-randr/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix
index 9788878a3d5..e2c941998a9 100644
--- a/pkgs/tools/wayland/wlr-randr/default.nix
+++ b/pkgs/tools/wayland/wlr-randr/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , meson
 , ninja
-, cmake
 , pkg-config
 , wayland
 }:
@@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ=";
   };
 
-  nativeBuildInputs = [ meson ninja cmake pkg-config ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ wayland ];
 
   meta = with lib; {