diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix index 82b30082d1e1..d461bebcf5b6 100644 --- a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix @@ -13,13 +13,12 @@ , colorVariants ? [] # default: all , opacityVariants ? [] # default: all , themeVariants ? [] # default: default (BigSur-like theme) +, schemeVariants ? [] # default: standard , iconVariant ? null # default: standard (Apple logo) , nautilusStyle ? null # default: stable (BigSur-like style) -, nautilusSize ? null # default: 200px , panelOpacity ? null # default: 15% , panelSize ? null # default: 32px , roundedMaxWindow ? false # default: false -, nordColor ? false # default = false , darkerColor ? false # default = false }: @@ -28,25 +27,25 @@ let 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}: window control buttons 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}: accent color variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: colorscheme style variants" [ "standard" "nord" ] schemeVariants lib.checkListOfEnum "${pname}: activities icon variants" [ "standard" "apple" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant) -lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle) -lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) +lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" "right" ] (single nautilusStyle) 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 = "2024.09.02"; + version = "2024-11-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-a32iHPcbMYuBy65FWm/fkjwJQE3aVScR3WJJzKTVx9k="; + hash = "sha256-SSGb7EdJN8E4N8b98VO7oFTeOmhKEo/0qhso9410ihg="; }; nativeBuildInputs = [ @@ -68,10 +67,10 @@ stdenv.mkDerivation rec { done # Do not provide `sudo`, as it is not needed in our use case of the install script - substituteInPlace shell/lib-core.sh --replace-fail '$(which sudo)' false + substituteInPlace libs/lib-core.sh --replace-fail '$(which sudo)' false # Provides a dummy home directory - substituteInPlace shell/lib-core.sh --replace-fail 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' + substituteInPlace libs/lib-core.sh --replace-fail 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' ''; dontBuild = true; @@ -86,13 +85,12 @@ stdenv.mkDerivation rec { ${toString (map (x: "--color " + x) colorVariants)} \ ${toString (map (x: "--opacity " + x) opacityVariants)} \ ${toString (map (x: "--theme " + x) themeVariants)} \ + ${toString (map (x: "--scheme " + x) schemeVariants)} \ ${lib.optionalString (nautilusStyle != null) ("--nautilus " + nautilusStyle)} \ - ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \ - ${lib.optionalString nordColor "--nordcolor"} \ ${lib.optionalString darkerColor "--darkercolor"} \ ${lib.optionalString (iconVariant != null) ("--gnome-shell -i " + iconVariant)} \ - ${lib.optionalString (panelSize != null) ("--gnome-shell -height " + panelSize)} \ + ${lib.optionalString (panelSize != null) ("--gnome-shell -panelheight " + panelSize)} \ ${lib.optionalString (panelOpacity != null) ("--gnome-shell -panelopacity " + panelOpacity)} \ --dest $out/share/themes