From 8f2d3208b88a25641ecdda861462823de73fec8a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 21:13:31 -0300
Subject: xfce4-icon-theme: reorder file

A small modification to standardize the directory structure of XFCE expressions.
---
 pkgs/desktops/xfce/art/xfce4-icon-theme.nix        | 44 ----------------------
 .../desktops/xfce/art/xfce4-icon-theme/default.nix | 44 ++++++++++++++++++++++
 pkgs/desktops/xfce/default.nix                     |  2 +-
 3 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/art/xfce4-icon-theme.nix
 create mode 100644 pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix

diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
deleted file mode 100644
index a2339d585680..000000000000
--- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }:
-
-let
-  category = "art";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-icon-theme";
-  version = "4.4.3";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-    gtk3
-  ];
-
-  buildInputs = [
-    gnome-icon-theme
-    tango-icon-theme
-    hicolor-icon-theme
-    # missing parent icon theme Industrial
-  ];
-
-  dontDropIconThemeCache = true;
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://www.xfce.org/";
-    description = "Icons for Xfce";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.eelco ];
-  };
-}
diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix
new file mode 100644
index 000000000000..a2339d585680
--- /dev/null
+++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }:
+
+let
+  category = "art";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-icon-theme";
+  version = "4.4.3";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+    gtk3
+  ];
+
+  buildInputs = [
+    gnome-icon-theme
+    tango-icon-theme
+    hicolor-icon-theme
+    # missing parent icon theme Industrial
+  ];
+
+  dontDropIconThemeCache = true;
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://www.xfce.org/";
+    description = "Icons for Xfce";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
+  };
+}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 3d88cbd92229..a12523765ad4 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -96,7 +96,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   #### ART
 
-  xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { };
+  xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { };
 
   xfwm4-themes = callPackage ./art/xfwm4-themes.nix { };
 
-- 
cgit v1.2.3


From e1dd2a9ff11c658b82d013186ef18bc59f3c0b6b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 21:53:00 -0300
Subject: xfwm4-themes: reorder

---
 pkgs/desktops/xfce/art/xfwm4-themes.nix         | 29 -------------------------
 pkgs/desktops/xfce/art/xfwm4-themes/default.nix | 29 +++++++++++++++++++++++++
 pkgs/desktops/xfce/default.nix                  |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/art/xfwm4-themes.nix
 create mode 100644 pkgs/desktops/xfce/art/xfwm4-themes/default.nix

diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix
deleted file mode 100644
index 569a18a796e8..000000000000
--- a/pkgs/desktops/xfce/art/xfwm4-themes.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, xfce }:
-
-let
-  category = "art";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfwm4-themes";
-  version = "4.10.0";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j";
-  };
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://www.xfce.org/";
-    description = "Themes for Xfce";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.volth ];
-  };
-}
diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix
new file mode 100644
index 000000000000..569a18a796e8
--- /dev/null
+++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchurl, xfce }:
+
+let
+  category = "art";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfwm4-themes";
+  version = "4.10.0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j";
+  };
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://www.xfce.org/";
+    description = "Themes for Xfce";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index a12523765ad4..183807d68b77 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -98,7 +98,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { };
 
-  xfwm4-themes = callPackage ./art/xfwm4-themes.nix { };
+  xfwm4-themes = callPackage ./art/xfwm4-themes { };
 
   #### PANEL PLUGINS
 
-- 
cgit v1.2.3


From 85d7cbb4854f51ba83e72f7b9b173e9b8758daf6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 22:18:28 -0300
Subject: xfce4-cpugraph-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-cpugraph-plugin.nix   | 47 ----------------------
 .../xfce4-cpugraph-plugin/default.nix              | 47 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 183807d68b77..cba9718675b5 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -110,7 +110,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
 
-  xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
+  xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { };
 
   xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
deleted file mode 100644
index aed655eb2bd2..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-cpugraph-plugin";
-  version = "1.1.0";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    glib
-    exo
-    libXtst
-    xorgproto
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    xfconf
-    gtk3
-    hicolor-icon-theme
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
-    description = "CPU graph show for Xfce panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
new file mode 100644
index 000000000000..aed655eb2bd2
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
@@ -0,0 +1,47 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-cpugraph-plugin";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    glib
+    exo
+    libXtst
+    xorgproto
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    xfconf
+    gtk3
+    hicolor-icon-theme
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
+    description = "CPU graph show for Xfce panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From ab06afe57ac751e554798ee156f3baf83d64ac6f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 22:26:06 -0300
Subject: xfce4-dockbarx-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-dockbarx-plugin.nix   | 41 ----------------------
 .../xfce4-dockbarx-plugin/default.nix              | 41 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index cba9718675b5..b98fe8adc8e3 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -114,7 +114,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
 
-  xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { };
+  xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
 
   xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
deleted file mode 100644
index e64d6fbae511..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46
-, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
-
-stdenv.mkDerivation rec {
-  pname = "xfce4-dockbarx-plugin";
-  version = "${ver}-${rev}";
-  ver = "0.5";
-  rev = "a2dcb66";
-
-  src = fetchFromGitHub {
-    owner = "TiZ-EX1";
-    repo = "xfce4-dockbarx-plugin";
-    rev = rev;
-    sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx";
-  };
-
-  pythonPath = [ dockbarx ];
-
-  nativeBuildInputs = [ pkg-config wafHook ];
-  buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ]
-    ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
-    ++ pythonPath;
-
-  postPatch = ''
-    substituteInPlace wscript           --replace /usr/share/            "\''${PREFIX}/share/"
-    substituteInPlace src/dockbarx.vala --replace /usr/share/            $out/share/
-    substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash
-  '';
-
-  postFixup = ''
-    wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin";
-    description = "A plugins to embed DockbarX into xfce4-panel";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.volth ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
new file mode 100644
index 000000000000..e64d6fbae511
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46
+, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
+
+stdenv.mkDerivation rec {
+  pname = "xfce4-dockbarx-plugin";
+  version = "${ver}-${rev}";
+  ver = "0.5";
+  rev = "a2dcb66";
+
+  src = fetchFromGitHub {
+    owner = "TiZ-EX1";
+    repo = "xfce4-dockbarx-plugin";
+    rev = rev;
+    sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx";
+  };
+
+  pythonPath = [ dockbarx ];
+
+  nativeBuildInputs = [ pkg-config wafHook ];
+  buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ]
+    ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
+    ++ pythonPath;
+
+  postPatch = ''
+    substituteInPlace wscript           --replace /usr/share/            "\''${PREFIX}/share/"
+    substituteInPlace src/dockbarx.vala --replace /usr/share/            $out/share/
+    substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash
+  '';
+
+  postFixup = ''
+    wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin";
+    description = "A plugins to embed DockbarX into xfce4-panel";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.volth ];
+  };
+}
-- 
cgit v1.2.3


From 1e586af4b150f912e21ce1acd5032a8acab2bf9a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 22:29:10 -0300
Subject: xfce4-embed-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-embed-plugin.nix      | 42 ----------------------
 .../panel-plugins/xfce4-embed-plugin/default.nix   | 42 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index b98fe8adc8e3..f9ce5a8cb337 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -116,7 +116,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
 
-  xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { };
+  xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
 
   xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
deleted file mode 100644
index a731c9fcbb53..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-with lib;
-stdenv.mkDerivation rec {
-  pname  = "xfce4-embed-plugin";
-  version = "1.6.0";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    gtk2
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin";
-    description = "Embed arbitrary app windows on Xfce panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix
new file mode 100644
index 000000000000..a731c9fcbb53
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+with lib;
+stdenv.mkDerivation rec {
+  pname  = "xfce4-embed-plugin";
+  version = "1.6.0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    gtk2
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin";
+    description = "Embed arbitrary app windows on Xfce panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From f8955d59bfb303f488385404c9db983489bc8383 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 22:32:18 -0300
Subject: xfce4-eyes-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-eyes-plugin.nix       | 42 ----------------------
 .../panel-plugins/xfce4-eyes-plugin/default.nix    | 42 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index f9ce5a8cb337..1b4f1c52a4da 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -118,7 +118,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
 
-  xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { };
+  xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
 
   xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
deleted file mode 100644
index 8df173d3367f..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-eyes-plugin";
-  version = "4.5.1";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    xfconf
-    gtk3
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin";
-    description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix
new file mode 100644
index 000000000000..8df173d3367f
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-eyes-plugin";
+  version = "4.5.1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    xfconf
+    gtk3
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin";
+    description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From 63d5a1adcc4cef5f3b2febc18fa3b29f311da699 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 22:39:43 -0300
Subject: xfce4-fsguard-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-fsguard-plugin.nix    | 42 ----------------------
 .../panel-plugins/xfce4-fsguard-plugin/default.nix | 42 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 1b4f1c52a4da..172329cbe4fc 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -120,7 +120,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
 
-  xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { };
+  xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
 
   xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
deleted file mode 100644
index 95f93148a912..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-fsguard-plugin";
-  version = "1.1.1";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    xfconf
-    gtk3
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin";
-    description = "Filesystem usage monitor plugin for the Xfce panel";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix
new file mode 100644
index 000000000000..95f93148a912
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-fsguard-plugin";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    xfconf
+    gtk3
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin";
+    description = "Filesystem usage monitor plugin for the Xfce panel";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From 94c5d879ae1898d3a8f3308bd235f08fa16ea8ba Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 22:40:29 -0300
Subject: xfce4-genmon-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-genmon-plugin.nix     | 41 ----------------------
 .../panel-plugins/xfce4-genmon-plugin/default.nix  | 41 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 172329cbe4fc..5a6019609379 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -122,7 +122,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
 
-  xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { };
+  xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
 
   xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
deleted file mode 100644
index 59796ad55b14..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-genmon-plugin";
-  version = "4.0.2";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    gtk3
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin";
-    description = "Generic monitor plugin for the Xfce panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
new file mode 100644
index 000000000000..59796ad55b14
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-genmon-plugin";
+  version = "4.0.2";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    gtk3
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin";
+    description = "Generic monitor plugin for the Xfce panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From 525975e2a18b72bef25628349835cab472fa2392 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:03:23 -0300
Subject: xfce4-hardware-monitor-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce4-hardware-monitor-plugin.nix              | 40 ----------------------
 .../xfce4-hardware-monitor-plugin/default.nix      | 40 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 5a6019609379..4b8bf4db2e17 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -124,7 +124,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
 
-  xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
+  xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
 
   xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
deleted file mode 100644
index 8afff65696d3..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, autoreconfHook, gnome2, gtkmm2,
-  libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce
-}:
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-hardware-monitor-plugin";
-  version = "1.6.0";
-
-  src = fetchurl {
-    url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz";
-    sha256 = "11k7m41jxkaqmpp5njkixw60q517xnw923mz34dnm1llx9ilvfk8";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    gtkmm2
-    gnome2.libgnomecanvas
-    gnome2.libgnomecanvasmm
-    libgtop
-    libxfce4ui
-    libxfce4util
-    xfce4-panel
-    lm_sensors
-   ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin";
-    description = "Hardware monitor plugin for the XFCE4 panel";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix
new file mode 100644
index 000000000000..8afff65696d3
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, autoreconfHook, gnome2, gtkmm2,
+  libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce
+}:
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-hardware-monitor-plugin";
+  version = "1.6.0";
+
+  src = fetchurl {
+    url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz";
+    sha256 = "11k7m41jxkaqmpp5njkixw60q517xnw923mz34dnm1llx9ilvfk8";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    gtkmm2
+    gnome2.libgnomecanvas
+    gnome2.libgnomecanvasmm
+    libgtop
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    lm_sensors
+   ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin";
+    description = "Hardware monitor plugin for the XFCE4 panel";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
-- 
cgit v1.2.3


From e6396dc230127c266f21c17bae1203644119824f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:05:56 -0300
Subject: xfce4-i3-workspaces-plugin.nix: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../panel-plugins/xfce4-i3-workspaces-plugin.nix   | 46 ----------------------
 .../xfce4-i3-workspaces-plugin/default.nix         | 46 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 4b8bf4db2e17..a9f45d9fcb6f 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -126,7 +126,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
 
-  xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin.nix { };
+  xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
 
   xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix
deleted file mode 100644
index 136b91a8a2f8..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, gtk3
-, libxfce4ui, libxfce4util, xfconf, xfce4-dev-tools, xfce4-panel
-, i3ipc-glib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xfce4-i3-workspaces-plugin";
-  version = "1.4.0";
-
-  src = fetchFromGitHub {
-    owner = "denesb";
-    repo = "xfce4-i3-workspaces-plugin";
-    rev = version;
-    sha256 = "sha256-+tjxMr0UbE3BLdxBwNr2mZqKSQOOtw69FmN4rk4loyA=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    gtk3
-    xfconf
-    libxfce4ui
-    libxfce4util
-    xfce4-dev-tools
-    xfce4-panel
-    i3ipc-glib
-   ];
-
-  preConfigure = ''
-    ./autogen.sh
-    patchShebangs .
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://github.com/denesb/xfce4-i3-workspaces-plugin";
-    description = "Workspace switcher plugin for xfce4-panel which can be used for the i3 window manager";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.berbiche ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
new file mode 100644
index 000000000000..136b91a8a2f8
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, gtk3
+, libxfce4ui, libxfce4util, xfconf, xfce4-dev-tools, xfce4-panel
+, i3ipc-glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xfce4-i3-workspaces-plugin";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "denesb";
+    repo = "xfce4-i3-workspaces-plugin";
+    rev = version;
+    sha256 = "sha256-+tjxMr0UbE3BLdxBwNr2mZqKSQOOtw69FmN4rk4loyA=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    gtk3
+    xfconf
+    libxfce4ui
+    libxfce4util
+    xfce4-dev-tools
+    xfce4-panel
+    i3ipc-glib
+   ];
+
+  preConfigure = ''
+    ./autogen.sh
+    patchShebangs .
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://github.com/denesb/xfce4-i3-workspaces-plugin";
+    description = "Workspace switcher plugin for xfce4-panel which can be used for the i3 window manager";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.berbiche ];
+  };
+}
-- 
cgit v1.2.3


From a77768f8077377205deccd4b6b327829dcb95879 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:07:03 -0300
Subject: xfce4-mailwatch-plugin.nix: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-mailwatch-plugin.nix  | 45 ----------------------
 .../xfce4-mailwatch-plugin/default.nix             | 45 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index a9f45d9fcb6f..65ebbc812961 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -128,7 +128,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
 
-  xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
+  xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { };
 
   xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
deleted file mode 100644
index df31ea3b9b59..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui,
-  gtk2, exo, gnutls, libgcrypt, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-mailwatch-plugin";
-  version = "1.2.0";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2";
-  };
-
-  nativeBuildInputs = [
-    intltool
-    pkg-config
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    gtk2
-    exo # needs exo with gtk2 support
-    gnutls
-    libgcrypt
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin";
-    description = "Mail watcher plugin for Xfce panel";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
new file mode 100644
index 000000000000..df31ea3b9b59
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui,
+  gtk2, exo, gnutls, libgcrypt, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-mailwatch-plugin";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2";
+  };
+
+  nativeBuildInputs = [
+    intltool
+    pkg-config
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    gtk2
+    exo # needs exo with gtk2 support
+    gnutls
+    libgcrypt
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin";
+    description = "Mail watcher plugin for Xfce panel";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}
-- 
cgit v1.2.3


From ac99266415ceb1760dc6c6afe66927397ff2baf6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:11:30 -0300
Subject: xfce4-mpc-plugin.nix: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-mpc-plugin.nix        | 43 ----------------------
 .../panel-plugins/xfce4-mpc-plugin/default.nix     | 43 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 65ebbc812961..18f2df93a734 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -136,7 +136,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { };
 
-  xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { };
+  xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
 
   xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
deleted file mode 100644
index 37f64021c72a..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel,
-  libxfce4ui, gtk3, exo, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-mpc-plugin";
-  version = "0.5.2";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    gtk3
-    exo
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin";
-    description = "MPD plugin for Xfce panel";
-    platforms = platforms.linux;
-    license = licenses.bsd2;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix
new file mode 100644
index 000000000000..37f64021c72a
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel,
+  libxfce4ui, gtk3, exo, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-mpc-plugin";
+  version = "0.5.2";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    gtk3
+    exo
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin";
+    description = "MPD plugin for Xfce panel";
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = [ ];
+  };
+}
-- 
cgit v1.2.3


From 3d51ede8b2d009ab04f22a45338b605dbf9cc6f9 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:15:16 -0300
Subject: xfce4-notes-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-notes-plugin.nix      | 45 ----------------------
 .../panel-plugins/xfce4-notes-plugin/default.nix   | 45 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 18f2df93a734..0a2970728739 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -132,7 +132,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
 
-  xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
+  xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { };
 
   xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
deleted file mode 100644
index 09ff309c05fc..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-notes-plugin";
-  version = "1.8.1";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    xfconf
-    gtk2
-    libunique
-  ];
-
-  hardeningDisable = [ "format" ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin";
-    description = "Sticky notes plugin for Xfce panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
new file mode 100644
index 000000000000..09ff309c05fc
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-notes-plugin";
+  version = "1.8.1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    xfconf
+    gtk2
+    libunique
+  ];
+
+  hardeningDisable = [ "format" ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin";
+    description = "Sticky notes plugin for Xfce panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From 0f6a865dd9fac8014327ca22b5fc54b11701b646 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:25:12 -0300
Subject: xfce4-systemload-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-systemload-plugin.nix | 41 ----------------------
 .../xfce4-systemload-plugin/default.nix            | 41 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 0a2970728739..3e28163a55d4 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -140,7 +140,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { };
 
-  xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
+  xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
 
   xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
deleted file mode 100644
index a313510fded5..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-systemload-plugin";
-  version = "1.2.3";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4util
-    libxfce4ui
-    xfce4-panel
-    gtk3
-  ];
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin";
-    description = "System load plugin for Xfce panel";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
new file mode 100644
index 000000000000..a313510fded5
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-systemload-plugin";
+  version = "1.2.3";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    libxfce4util
+    libxfce4ui
+    xfce4-panel
+    gtk3
+  ];
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin";
+    description = "System load plugin for Xfce panel";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
-- 
cgit v1.2.3


From 7f49ba11d8dcdd52896f28bea65367b9dfe0f79b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:26:16 -0300
Subject: xfce4-windowck-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-windowck-plugin.nix   | 54 ----------------------
 .../xfce4-windowck-plugin/default.nix              | 54 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 3e28163a55d4..ffa4f6310412 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -152,7 +152,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
 
-  xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
+  xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { };
 
   xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
deleted file mode 100644
index ec6ef0e7b62c..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, gtk2
-, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-windowck-plugin";
-  version = "0.4.6";
-
-  src = fetchFromGitHub {
-    owner = "cedl38";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    python3
-    imagemagick
-    libwnck
-    gtk2
-    exo
-    libxfce4ui
-    libxfce4util
-    xfce4-panel
-    xfconf
-    xfce4-dev-tools
-  ];
-
-  preConfigure = ''
-    ./autogen.sh
-    patchShebangs .
-  '';
-
-  enableParallelBuilding = true;
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.gitLister src.meta.homepage;
-    rev-prefix = "v";
-  };
-
-  meta = with lib; {
-    homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin";
-    description = "Xfce plugins which allows to put the maximized window title and buttons on the panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.volth ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
new file mode 100644
index 000000000000..ec6ef0e7b62c
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@@ -0,0 +1,54 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, gtk2
+, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-windowck-plugin";
+  version = "0.4.6";
+
+  src = fetchFromGitHub {
+    owner = "cedl38";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    python3
+    imagemagick
+    libwnck
+    gtk2
+    exo
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
+    xfce4-dev-tools
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+    patchShebangs .
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.gitLister src.meta.homepage;
+    rev-prefix = "v";
+  };
+
+  meta = with lib; {
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin";
+    description = "Xfce plugins which allows to put the maximized window title and buttons on the panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.volth ];
+  };
+}
-- 
cgit v1.2.3


From a75a5c403fc1a1a349bdd45afce4583ceca7fa51 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:27:42 -0300
Subject: xfce4-weather-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-weather-plugin.nix    | 48 ----------------------
 .../panel-plugins/xfce4-weather-plugin/default.nix | 48 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index ffa4f6310412..fcb965303eb1 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -148,7 +148,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
 
-  xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
+  xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { };
 
   xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
deleted file mode 100644
index 18639946ce8b..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxml2, libsoup, upower,
-  libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }:
-
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
-  pname  = "xfce4-weather-plugin";
-  version = "0.10.1";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-
-  buildInputs = [
-    gtk3
-    libxml2
-    libsoup
-    upower
-    libxfce4ui
-    libxfce4util
-    xfce4-panel
-    hicolor-icon-theme
-  ];
-
-  enableParallelBuilding = true;
-
-  passthru.updateScript = xfce.updateScript {
-    inherit pname version;
-    attrPath = "xfce.${pname}";
-    versionLister = xfce.archiveLister category pname;
-  };
-
-  meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin";
-    description = "Weather plugin for the Xfce desktop environment";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
new file mode 100644
index 000000000000..18639946ce8b
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
@@ -0,0 +1,48 @@
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxml2, libsoup, upower,
+  libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }:
+
+let
+  category = "panel-plugins";
+in
+
+stdenv.mkDerivation rec {
+  pname  = "xfce4-weather-plugin";
+  version = "0.10.1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    gtk3
+    libxml2
+    libsoup
+    upower
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    hicolor-icon-theme
+  ];
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = xfce.updateScript {
+    inherit pname version;
+    attrPath = "xfce.${pname}";
+    versionLister = xfce.archiveLister category pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin";
+    description = "Weather plugin for the Xfce desktop environment";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
-- 
cgit v1.2.3


From 9fc7c3391a039c17e53f950d8b637d0cd5e04704 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 30 Jan 2021 23:29:58 -0300
Subject: xfce4-timer-plugin: reorder

---
 pkgs/desktops/xfce/default.nix                     |  2 +-
 .../xfce/panel-plugins/xfce4-timer-plugin.nix      | 44 ----------------------
 .../panel-plugins/xfce4-timer-plugin/default.nix   | 44 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix

diff --git a/pkgs/desktops/xfce/default.