diff --git a/README.md b/README.md index 63f6131c..c6313e66 100644 --- a/README.md +++ b/README.md @@ -40,20 +40,23 @@ or ask on [GitHub Discussions](https://github.com/danth/stylix/discussions). ## Example configurations -![GNOME 44](https://user-images.githubusercontent.com/28959268/233449152-c38d0214-0991-454d-abbf-41b5e89dee3a.png) +### GNOME 46 -| Environment | Wallpaper | Colour scheme | Fonts | Full configuration | -|-------------|-----------------------------------------------------------------------------------------|---------------------|----------------------|----------------------------------------------------------------------------| -| GNOME 44 | [Atlantis Garbage Worker by Grady Frederick](https://www.artstation.com/artwork/W2GERJ) | Generated by Stylix | Cantarell, Fira Code | [See here](https://gist.github.com/danth/5e0b263eeed99aafcef2a2eca3e8548d) | +![GNOME 46](./gnome.png) -![KDE Plasma 5](https://github.com/danth/stylix/assets/28959268/f0ee5ce2-cd4a-4875-b44b-f974f97ecd71) +Photos by [Clay Banks](https://unsplash.com/photos/three-bicycles-parked-in-front-of-building-hwLAI5lRhdM) +and [Derrick Cooper](https://unsplash.com/photos/brown-road-in-forest-during-daytime-L505cPnmIds). -| Environment | Wallpaper | Colour scheme | Fonts | Full configuration | -|--------------|---------------------------------------------------------------|---------------------|----------------------|----------------------------------------------------------------------------| -| KDE Plasma 5 | Taken from [Genshin Impact](https://genshin.hoyoverse.com/en) | Generated by Stylix | Cantarell, Fira Code | [See here](https://gist.github.com/danth/17dd596a9f655a252c14b23a60dd2aaf) | +Try a live demo of this theme by running +`nix run github:danth/stylix#testbed-gnome-light` or +`nix run github:danth/stylix#testbed-gnome-dark`. -![Hyprland](https://raw.githubusercontent.com/SomeGuyNamedMy/Screenshots/60cd34c7c822042e33d0a1d7ae98a64290aa6dab/example2.png) +### KDE Plasma 6 -| Environment | Wallpaper | Colour scheme | Fonts | Full configuration | -|-------------|-----------------------------------------------------------------------------------------|---------------------|----------------------|-----------------------------------------------------| -| Hyprland | Taken from [raison d'etre by Eve](https://www.youtube.com/watch?v=ulfY8WQE_HE) | Generated by Stylix | DeJavu | [See here](https://github.com/SomeGuyNamedMy/users) | +![KDE Plasma 6](./kde.png) + +Photos by [Aniket Deole](https://unsplash.com/photos/mountain-surrounded-by-trees-under-cloudy-sky-T-tOgjWZ0fQ) +and [Tom Gainor](https://unsplash.com/photos/landscape-photography-of-body-of-water-overlooking-mountain-range-ZqLeQDjY6fY). + +KDE theming is still a work in progress - so some manual steps may be needed +to apply the settings completely. diff --git a/docs/default.nix b/docs/default.nix index e20d7e45..85f7b8a7 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -43,6 +43,8 @@ in pkgs.stdenvNoCC.mkDerivation { patchPhase = '' cp ${../README.md} src/README.md + cp ${../gnome.png} src/gnome.png + cp ${../kde.png} src/kde.png cp ${../CONTRIBUTING.md} src/contributing.md # The "declared by" links point to a file which only exists when the docs diff --git a/gnome.png b/gnome.png new file mode 100644 index 00000000..7702581c Binary files /dev/null and b/gnome.png differ diff --git a/kde.png b/kde.png new file mode 100644 index 00000000..9acd4b79 Binary files /dev/null and b/kde.png differ diff --git a/stylix/testbed.nix b/stylix/testbed.nix index 325bf993..c5bc3f5e 100644 --- a/stylix/testbed.nix +++ b/stylix/testbed.nix @@ -82,12 +82,20 @@ let # This generates a copy of each testbed for each of the following themes. makeTestbeds = testbed: map (makeTestbed testbed) [ { - image = "${pkgs.pantheon.elementary-wallpapers}/share/backgrounds/Photo of Valley.jpg"; + image = pkgs.fetchurl { + name = "three-bicycles.jpg"; + url = "https://unsplash.com/photos/hwLAI5lRhdM/download?ixid=M3wxMjA3fDB8MXxhbGx8fHx8fHx8fHwxNzE2MzYxNDcwfA&force=true"; + hash = "sha256-S0MumuBGJulUekoGI2oZfUa/50Jw0ZzkqDDu1nRkFUA="; + }; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; polarity = "light"; } { - image = "${pkgs.pantheon.elementary-wallpapers}/share/backgrounds/Snow-Capped Mountain.jpg"; + image = pkgs.fetchurl { + name = "mountains.jpg"; + url = "https://unsplash.com/photos/ZqLeQDjY6fY/download?ixid=M3wxMjA3fDB8MXxhbGx8fHx8fHx8fHwxNzE2MzY1NDY4fA&force=true"; + hash = "sha256-Dm/0nKiTFOzNtSiARnVg7zM0J1o+EuIdUQ3OAuasM58="; + }; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml"; polarity = "dark"; }