alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Reviews use of old nixos wallpaper to use one with the new logo.

Browse source 
The wallpaper used is *structurally compatible* with the other one,
meaning that the logo is at the same location, and not bigger.

It has one drawback: the logo is brighter, which clashes with the grub
usage. This is to be fixed with new options in grub.
This commit is contained in:
Samuel Dionne-Riel 2018-08-28 23:47:49 -04:00
parent 7db611f2af
commit bc5b26b4ab
4 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -33,10 +33,10 @@ let
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background] [org.gnome.desktop.background]
picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
[org.gnome.desktop.screensaver] [org.gnome.desktop.screensaver]
picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
${cfg.extraGSettingsOverrides} ${cfg.extraGSettingsOverrides}
EOF EOF

2
nixos/modules/services/x11/display-managers/lightdm.nix
View file

@ -115,7 +115,7 @@ in
background = mkOption { background = mkOption {
type = types.str; type = types.str;
default = "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"; default = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png";
description = '' description = ''
The background image or color to use. The background image or color to use.
''; '';

2
nixos/tests/installer.nix
View file

@ -237,7 +237,7 @@ let
docbook_xsl_ns docbook_xsl_ns
unionfs-fuse unionfs-fuse
ntp ntp
nixos-artwork.wallpapers.gnome-dark nixos-artwork.wallpapers.simple-dark-gray-bottom
perlPackages.XMLLibXML perlPackages.XMLLibXML
perlPackages.ListCompare perlPackages.ListCompare
xorg.lndir xorg.lndir

29
pkgs/data/misc/nixos-artwork/wallpapers.nix
View file

@ -23,16 +23,9 @@ let
in in
{ rec {
gnome-dark = mkNixBackground { gnome-dark = simple-dark-gray-bottom;
name = "gnome-dark-2015-02-27";
description = "Gnome Dark background for Nix";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
};
};
mosaic-blue = mkNixBackground { mosaic-blue = mkNixBackground {
name = "mosaic-blue-2016-02-19"; name = "mosaic-blue-2016-02-19";
@ -61,6 +54,24 @@ in
}; };
}; };
simple-dark-gray-bootloader = mkNixBackground {
name = "simple-dark-gray-bootloader-2018-08-28";
description = "Simple dark gray background for NixOS, specifically bootloaders.";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png;
sha256 = "0v26kfydn7alr81f2qpgsqdiq2zk7yrwlgibx2j7k91z9h47dpj9";
};
};
simple-dark-gray-bottom = mkNixBackground {
name = "simple-dark-gray-2018-08-28";
description = "Simple dark gray background for NixOS, specifically bootloaders and graphical login.";
src = fetchurl {
url = https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png;
sha256 = "13hi4jwp5ga06dpdw5l03b4znwn58fdjlkqjkg824isqsxzv6k15";
};
};
simple-light-gray = mkNixBackground { simple-light-gray = mkNixBackground {
name = "simple-light-gray-2016-02-19"; name = "simple-light-gray-2016-02-19";
description = "Simple light gray background for Nix"; description = "Simple light gray background for Nix";