lxqt: format nix expressions with nixpkgs-fmt

pkgs/desktops/lxqt/compton-conf/default.nix

@@ -1,5 +1,13 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
+{ lib
-  libconfig }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, qtbase
+, qttools
+, lxqt
+, libconfig
+}:
 
 mkDerivation rec {
   pname = "compton-conf";

pkgs/desktops/lxqt/default.nix

@@ -1,5 +1,4 @@
 { pkgs, makeScope, libsForQt5 }:
-
 let
   packages = self: with self; {
 
@@ -107,5 +106,5 @@ let
     ];
 
   };
-
+in
-in makeScope libsForQt5.newScope packages
+makeScope libsForQt5.newScope packages

pkgs/desktops/lxqt/libfm-qt/default.nix

@@ -1,7 +1,16 @@
-{
+{ lib
-  lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+, mkDerivation
-  pcre, libexif, xorg, libfm, menu-cache,
+, fetchFromGitHub
-  qtx11extras, qttools
+, cmake
+, pkgconfig
+, lxqt-build-tools
+, pcre
+, libexif
+, xorg
+, libfm
+, menu-cache
+, qtx11extras
+, qttools
 }:
 
 mkDerivation rec {

pkgs/desktops/lxqt/liblxqt/default.nix

@@ -1,5 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras,
+{ lib
-  qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtx11extras
+, qttools
+, qtsvg
+, libqtxdg
+, polkit-qt
+, kwindowsystem
+, xorg
+}:
 
 mkDerivation rec {
   pname = "liblxqt";

pkgs/desktops/lxqt/libqtxdg/default.nix

@@ -1,4 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qtbase
+, qtsvg
+, lxqt-build-tools
+}:
 
 mkDerivation rec {
   pname = "libqtxdg";
@@ -11,9 +18,15 @@ mkDerivation rec {
     sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5";
   };
 
-  nativeBuildInputs = [ cmake lxqt-build-tools ];
+  nativeBuildInputs = [
+    cmake
+    lxqt-build-tools
+  ];
 
-  buildInputs = [ qtbase qtsvg ];
+  buildInputs = [
+    qtbase
+    qtsvg
+  ];
 
   preConfigure = ''
     cmakeFlagsArray+=(

pkgs/desktops/lxqt/libsysstat/default.nix

@@ -1,4 +1,10 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qtbase
+, lxqt-build-tools
+}:
 
 mkDerivation rec {
   pname = "libsysstat";
@@ -11,9 +17,14 @@ mkDerivation rec {
     sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz";
   };
 
-  nativeBuildInputs = [ cmake lxqt-build-tools ];
+  nativeBuildInputs = [
+    cmake
+    lxqt-build-tools
+  ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [
+    qtbase
+  ];
 
   meta = with lib; {
     description = "Library used to query system info and statistics";

pkgs/desktops/lxqt/lximage-qt/default.nix

@@ -1,5 +1,17 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
+{ lib
-  qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, xorg
+, lxqt-build-tools
+, libfm-qt
+, libexif
+}:
 
 mkDerivation rec {
   pname = "lximage-qt";

pkgs/desktops/lxqt/lxqt-about/default.nix

@@ -1,4 +1,15 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtx11extras
+, qttools
+, qtsvg
+, kwindowsystem
+, liblxqt
+, libqtxdg
+}:
 
 mkDerivation rec {
   pname = "lxqt-about";

pkgs/desktops/lxqt/lxqt-admin/default.nix

@@ -1,4 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtx11extras
+, qttools
+, qtsvg
+, kwindowsystem
+, liblxqt
+, libqtxdg
+, polkit-qt
+}:
 
 mkDerivation rec {
   pname = "lxqt-admin";

pkgs/desktops/lxqt/lxqt-archiver/default.nix

@@ -1,4 +1,15 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, lxqt-build-tools
+, json-glib
+, libfm-qt
+, qtbase
+, qttools
+, qtx11extras
+}:
 
 mkDerivation rec {
   # pname = "lxqt-archiver";

pkgs/desktops/lxqt/lxqt-build-tools/default.nix

@@ -1,4 +1,12 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, pcre
+, qtbase
+, glib
+}:
 
 mkDerivation rec {
   pname = "lxqt-build-tools";
@@ -11,9 +19,17 @@ mkDerivation rec {
     sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig setupHook ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    setupHook
+  ];
 
-  buildInputs = [ qtbase glib pcre ];
+  buildInputs = [
+    qtbase
+    glib
+    pcre
+  ];
 
   setupHook = ./setup-hook.sh;
 

pkgs/desktops/lxqt/lxqt-config/default.nix

@@ -1,6 +1,19 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
+{ lib
-  qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt,
+, mkDerivation
-  libqtxdg, xorg }:
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, lxqt-build-tools
+, qtbase
+, qtx11extras
+, qttools
+, qtsvg
+, kwindowsystem
+, libkscreen
+, liblxqt
+, libqtxdg
+, xorg
+}:
 
 mkDerivation rec {
   pname = "lxqt-config";

pkgs/desktops/lxqt/lxqt-globalkeys/default.nix

@@ -1,4 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, kwindowsystem
+, liblxqt
+, libqtxdg
+}:
 
 mkDerivation rec {
   pname = "lxqt-globalkeys";

pkgs/desktops/lxqt/lxqt-notificationd/default.nix

@@ -1,4 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtsvg
+, kwindowsystem
+, liblxqt
+, libqtxdg
+, qtx11extras
+}:
 
 mkDerivation rec {
   pname = "lxqt-notificationd";

pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix

@@ -1,4 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtsvg
+, qtx11extras
+, kwindowsystem
+, liblxqt
+, libqtxdg
+}:
 
 mkDerivation rec {
   pname = "lxqt-openssh-askpass";

pkgs/desktops/lxqt/lxqt-panel/default.nix

@@ -1,10 +1,30 @@
-{
+{ lib
-  lib, mkDerivation, fetchFromGitHub,
+, mkDerivation
-  cmake, pkgconfig, lxqt-build-tools,
+, fetchFromGitHub
-  qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
+, cmake
-  kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
+, pkgconfig
-  xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
+, lxqt-build-tools
-  lxmenu-data, pcre, libXdamage
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, libdbusmenu
+, kwindowsystem
+, solid
+, kguiaddons
+, liblxqt
+, libqtxdg
+, lxqt-globalkeys
+, libsysstat
+, xorg
+, libstatgrab
+, lm_sensors
+, libpulseaudio
+, alsaLib
+, menu-cache
+, lxmenu-data
+, pcre
+, libXdamage
 }:
 
 mkDerivation rec {

pkgs/desktops/lxqt/lxqt-policykit/default.nix

@@ -1,7 +1,18 @@
-{
+{ lib
-  lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+, mkDerivation
-  qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
+, fetchFromGitHub
-  libqtxdg, pcre
+, cmake
+, pkgconfig
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, polkit-qt
+, kwindowsystem
+, liblxqt
+, libqtxdg
+, pcre
 }:
 
 mkDerivation rec {

pkgs/desktops/lxqt/lxqt-powermanagement/default.nix

@@ -1,4 +1,18 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, kwindowsystem
+, solid
+, kidletime
+, liblxqt
+, libqtxdg
+}:
 
 mkDerivation rec {
   pname = "lxqt-powermanagement";

pkgs/desktops/lxqt/lxqt-qtplugin/default.nix

@@ -1,7 +1,15 @@
-{
+{ lib
-  lib, mkDerivation, fetchFromGitHub,
+, mkDerivation
-  cmake, lxqt-build-tools,
+, fetchFromGitHub
-  qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
+, cmake
+, lxqt-build-tools
+, qtbase
+, qtx11extras
+, qttools
+, qtsvg
+, libdbusmenu
+, libqtxdg
+, libfm-qt
 }:
 
 mkDerivation rec {

pkgs/desktops/lxqt/lxqt-runner/default.nix

@@ -1,5 +1,21 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
+{ lib
-menu-cache, muparser, pcre }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtsvg
+, kwindowsystem
+, liblxqt
+, libqtxdg
+, lxqt-globalkeys
+, qtx11extras
+, menu-cache
+, muparser
+, pcre
+}:
 
 mkDerivation rec {
   pname = "lxqt-runner";

pkgs/desktops/lxqt/lxqt-session/default.nix

@@ -1,4 +1,19 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtsvg
+, qtx11extras
+, kwindowsystem
+, liblxqt
+, libqtxdg
+, xorg
+, xdg-user-dirs
+}:
 
 mkDerivation rec {
   pname = "lxqt-session";

pkgs/desktops/lxqt/lxqt-sudo/default.nix

@@ -1,4 +1,17 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, kwindowsystem
+, liblxqt
+, libqtxdg
+, sudo
+}:
 
 mkDerivation rec {
   pname = "lxqt-sudo";

pkgs/desktops/lxqt/lxqt-themes/default.nix

@@ -1,4 +1,9 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+}:
 
 mkDerivation rec {
   pname = "lxqt-themes";

pkgs/desktops/lxqt/obconf-qt/default.nix

@@ -1,5 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
+{ lib
-  qtx11extras, xorg, lxqt-build-tools, openbox }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, pcre
+, qtbase
+, qttools
+, qtx11extras
+, xorg
+, lxqt-build-tools
+, openbox
+}:
 
 mkDerivation rec {
   pname = "obconf-qt";

pkgs/desktops/lxqt/pavucontrol-qt/default.nix

@@ -1,5 +1,15 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
+{ lib
-  pcre, qtbase, qttools, qtx11extras }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, lxqt
+, libpulseaudio
+, pcre
+, qtbase
+, qttools
+, qtx11extras
+}:
 
 mkDerivation rec {
   pname = "pavucontrol-qt";

pkgs/desktops/lxqt/pcmanfm-qt/default.nix

@@ -1,5 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
+{ lib
-  qtx11extras, libfm-qt, menu-cache, lxmenu-data }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, lxqt
+, qtbase
+, qttools
+, qtx11extras
+, libfm-qt
+, menu-cache
+, lxmenu-data
+}:
 
 mkDerivation rec {
   pname = "pcmanfm-qt";

pkgs/desktops/lxqt/qlipper/default.nix

@@ -1,4 +1,10 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qtbase
+, qttools
+}:
 
 mkDerivation rec {
   pname = "qlipper";
@@ -11,9 +17,14 @@ mkDerivation rec {
     sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+  ];
 
-  buildInputs = [ qtbase qttools ];
+  buildInputs = [
+    qtbase
+    qttools
+  ];
 
   meta = with lib; {
     description = "Cross-platform clipboard history applet";

pkgs/desktops/lxqt/qps/default.nix

@@ -1,5 +1,12 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
+{ lib
-  lxqt-build-tools }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qtbase
+, qtx11extras
+, qttools
+, lxqt-build-tools
+}:
 
 mkDerivation rec {
   pname = "qps";
@@ -12,9 +19,16 @@ mkDerivation rec {
     sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg";
   };
 
-  nativeBuildInputs = [ cmake lxqt-build-tools ];
+  nativeBuildInputs = [
+    cmake
+    lxqt-build-tools
+  ];
 
-  buildInputs = [ qtbase qtx11extras qttools ];
+  buildInputs = [
+    qtbase
+    qtx11extras
+    qttools
+  ];
 
   meta = with lib; {
     description = "Qt based process manager";

pkgs/desktops/lxqt/qterminal/default.nix

@@ -1,5 +1,13 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
+{ lib
-  qtbase, qttools, qtx11extras }:
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, lxqt-build-tools
+, qtermwidget
+, qtbase
+, qttools
+, qtx11extras
+}:
 
 mkDerivation rec {
   pname = "qterminal";

pkgs/desktops/lxqt/qtermwidget/default.nix

@@ -1,4 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qtbase
+, qttools
+, lxqt-build-tools
+}:
 
 mkDerivation rec {
   pname = "qtermwidget";
@@ -11,9 +18,15 @@ mkDerivation rec {
     sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv";
   };
 
-  nativeBuildInputs = [ cmake lxqt-build-tools ];
+  nativeBuildInputs = [
+    cmake
+    lxqt-build-tools
+  ];
 
-  buildInputs = [ qtbase qttools ];
+  buildInputs = [
+    qtbase
+    qttools
+  ];
 
   meta = with lib; {
     description = "A terminal emulator widget for Qt 5";

pkgs/desktops/lxqt/screengrab/default.nix

@@ -1,4 +1,17 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, qtbase
+, qttools
+, qtx11extras
+, qtsvg
+, kwindowsystem
+, libqtxdg
+, xorg
+, autoPatchelfHook
+}:
 
 mkDerivation rec {
   pname = "screengrab";