From 6aad44741e2d7ad36945b52d2ae56de8977aa6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:53:28 -0300 Subject: [PATCH 1/3] whitesur-gtk-theme: 2021-12-28 -> 2022-02-21 --- pkgs/data/themes/whitesur/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 6833f473664f..afc9f2282d94 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-12-28"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc"; + sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc"; }; nativeBuildInputs = [ From 612d007dc552d098e3c7c9b28b70f20edb30ba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:55:53 -0300 Subject: [PATCH 2/3] whitesur-gtk-theme: add optional arguments --- pkgs/data/themes/whitesur/default.nix | 33 ++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index afc9f2282d94..92bfbd0dd26e 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -7,8 +7,28 @@ , libxml2 , sassc , util-linux +, altVariants ? [] # default: normal +, colorVariants ? [] # default: all +, opacityVariants ? [] # default: all +, themeVariants ? [] # default: default (BigSur-like theme) +, nautilusSize ? null # default: 200px +, panelOpacity ? null # default: 15% +, panelSize ? null # default: 32px }: +let + pname = "whitesur-gtk-theme"; + single = x: lib.optional (x != null) x; + +in +lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) +lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity) +lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize) + stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; version = "2022-02-21"; @@ -48,8 +68,19 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/share/themes - ./install.sh --dest $out/share/themes --alt all --theme all + + ./install.sh \ + ${toString (map (x: "--alt " + x) altVariants)} \ + ${toString (map (x: "--color " + x) colorVariants)} \ + ${toString (map (x: "--opacity " + x) opacityVariants)} \ + ${toString (map (x: "--theme " + x) themeVariants)} \ + ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ + ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \ + ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ + --dest $out/share/themes + runHook postInstall ''; From c37327d82dbf1e395e7d41922ef33b37bbcedaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:56:34 -0300 Subject: [PATCH 3/3] whitesur-gtk-theme: replace duplicate files with links --- pkgs/data/themes/whitesur/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 92bfbd0dd26e..825772880d6e 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -4,6 +4,7 @@ , glib , gnome-shell , gnome-themes-extra +, jdupes , libxml2 , sassc , util-linux @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib gnome-shell + jdupes libxml2 sassc util-linux @@ -81,6 +83,8 @@ stdenv.mkDerivation rec { ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ --dest $out/share/themes + jdupes --link-soft --recurse $out/share + runHook postInstall '';