reorganize

1 files changed, 13 insertions, 22 deletions

diff --git a/default.nix b/default.nix
index b53ede7..8b9f798 100644
--- a/default.nix
+++ b/default.nix
@@ -1,27 +1,18 @@
 self: super:
-
 let
-  wlroots          = super.callPackage ./wlroots { inherit self super; };
-  sway-beta        = super.callPackage ./sway-beta { inherit self super; };
-  grim             = super.callPackage ./grim {};
-  slurp            = super.callPackage ./slurp {};
-  wlstream         = super.callPackage ./wlstream {};
-  waybar           = super.callPackage ./waybar {};
-  redshift-wayland = super.callPackage ./redshift-wayland {
-    inherit (super.python3Packages) python pygobject3 pyxdg wrapPython;
-    geoclue = super.geoclue2;
-  };
-
-  swaypkgs = {
-    inherit wlroots;
-    inherit sway-beta;
-    inherit grim;
-    inherit slurp;
-    inherit wlstream;
-    inherit waybar;
-    inherit redshift-wayland;
+swaypkgs = {
+  fmt              = self.callPackage ./fmt { inherit self super; };
+  wlroots          = self.callPackage ./wlroots {};
+  sway-beta        = self.callPackage ./sway-beta {};
+  grim             = self.callPackage ./grim {};
+  slurp            = self.callPackage ./slurp {};
+  wlstream         = self.callPackage ./wlstream {};
+  waybar           = self.callPackage ./waybar {};
+  redshift-wayland = self.callPackage ./redshift-wayland {
+    inherit (self.python3Packages) python pygobject3 pyxdg wrapPython;
+    geoclue = self.geoclue2;
   };
+};
 in
-  # also expose the list of packages as a package for
-  # easy building from `build.nix`.
   swaypkgs // { inherit swaypkgs; }
+