diff --git a/default.nix b/default.nix index f5c20f4..40febfd 100644 --- a/default.nix +++ b/default.nix @@ -10,20 +10,34 @@ pkgs ? import { }, }: +let + inherit (pkgs) callPackage; +in + { # The `lib`, `modules`, and `overlays` names are special lib = import ./lib { inherit pkgs; }; # functions modules = import ./modules; # NixOS modules overlays = import ./overlays; # nixpkgs overlays - imports = [ ./pkgs/wallpaper ]; - # Fonts - otf-pingfang = pkgs.callPackage ./pkgs/fonts/otf-pingfang { }; - otf-sf-pro = pkgs.callPackage ./pkgs/fonts/otf-sf-pro { }; - "wallpaper-ventura" = pkgs.callPackage ./pkgs/wallpapers/build.nix { - name = "Ventura"; - format = "png"; - hash = "sha256-d1BtZZm5bRnPGMs3e9k/XpIEa4tGxuqOrg4SA//NQxg="; + otf-pingfang = callPackage ./pkgs/fonts/otf-pingfang { }; + otf-sf-pro = callPackage ./pkgs/fonts/otf-sf-pro { }; + customGnomeWallpaper = { + ventura = callPackage ./pkgs/wallpapers/build.nix { + name = "ventura"; + format = "png"; + hash = "sha256-sgR3O2NFHf+bycjt2+Qo+dLhO5mjWPxPoEiVu4r19aY="; + }; + moon-far-view = callPackage ./pkgs/wallpapers/build.nix { + name = "moon-far-view"; + format = "png"; + hash = "sha256-PLqZ1BEP4kaWZfuM8R4sSBNu3Y8bRCWF6IIhEl3KT80="; + }; + sonoma = callPackage ./pkgs/wallpapers/build.nix { + name = "sonoma"; + format = "png"; + hash = "sha256-k2+1kzKrWgPErHOF9GMbnA/8Tl/uQwLq+H9rorUb0sQ="; + }; }; } diff --git a/pkgs/wallpapers/build.nix b/pkgs/wallpapers/build.nix index bd5d378..1a62442 100644 --- a/pkgs/wallpapers/build.nix +++ b/pkgs/wallpapers/build.nix @@ -10,13 +10,13 @@ let inherit name format hash; pname = "wallpaper-${name}"; - version = "2024.08.00-01"; + version = "2024.08.00-02"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { # url = "https://github.com/Erven2016/custom-gnome-wallpapers-for-nixos/raw/main/${name}.zip"; - url = "https://github.com/Erven2016/custom-gnome-wallpapers-for-nixos/releases/download/${name}/${name}.zip"; + url = "https://github.com/Erven2016/custom-gnome-wallpapers-for-nixos/releases/download/${name}/wallpaper.zip"; hash = hash; stripRoot = false; };