Merge branch 'master' into devenv

1 files changed, 34 insertions, 20 deletions

diff --git a/pkgs/static/wallpapers/default.nix b/pkgs/static/wallpapers/default.nix
index f0b8d46..a0efda3 100644
--- a/pkgs/static/wallpapers/default.nix
+++ b/pkgs/static/wallpapers/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, fetchurl, imagemagick, lib }:
-
-let
+{
+  stdenv,
+  fetchurl,
+  imagemagick,
+  lib,
+}: let
   fetchWallpaper = lib.makeOverridable (
-    { name, url, sha256, resolution ? "1920x1080", offset ? "0x0" }:
-    stdenv.mkDerivation {
-      inherit name;
-      src = fetchurl {
-        inherit url sha256;
-      };
-      buildInputs = [ imagemagick ];
-      phases = [ "unpackPhase" ];
-      unpackPhase = ''
-        convert "$src" -resize "${resolution}^" \
-                       -crop "${resolution}+${offset}" \
-                "$out"
-      '';
-    });
+    {
+      name,
+      url,
+      sha256,
+      resolution ? "1920x1080",
+      ratio ? "16:9",
+      gravity ? "center",
+    }:
+      stdenv.mkDerivation {
+        inherit name;
+        src = fetchurl {
+          inherit url sha256;
+        };
+        buildInputs = [imagemagick];
+        phases = ["unpackPhase"];
+        unpackPhase = ''
+          convert "$src" -gravity '${gravity}' \
+                         -extent '${ratio}' \
+                         -resize '${resolution}!' \
+                  "$out"
+        '';
+      }
+  );
   sources = lib.importJSON ./sources.json;
-in {
-  fetcher = fetchWallpaper;
-} // builtins.mapAttrs (_: fetchWallpaper) sources
+in
+  {
+    fetcher = fetchWallpaper;
+  }
+  // builtins.mapAttrs (_: fetchWallpaper) sources