From 301606e2df12912a0a52e2a7162acd279bbe29be Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 13 Mar 2020 23:52:54 +0100 Subject: [PATCH] packages/config/extras: remove all plymouth/wallpaper customizations, use Debian defaults --- Makefile.extra | 12 ------------ .../etc/lightdm/lightdm-gtk-greeter.conf | 2 +- config/includes.chroot/etc/plymouth/plymouthd.conf | 5 ----- .../etc/skel/.config/xfce4/desktop/backdrop.list | 11 ++++++----- .../xfconf/xfce-perchannel-xml/xfce4-desktop.xml | 8 ++++---- config/package-lists/system.list.chroot | 2 -- 6 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 config/includes.chroot/etc/plymouth/plymouthd.conf diff --git a/Makefile.extra b/Makefile.extra index 117a415..b617dff 100644 --- a/Makefile.extra +++ b/Makefile.extra @@ -4,18 +4,6 @@ download_extra: # Download unpackaged/third-party software # TODO file ITPs on bugs.debian.org, package for Debian mkdir -p cache/downloads/ - # https://gitlab.com/nodiscc/plymouth-theme-debian-logo - -rm -rf config/includes.chroot/usr/share/plymouth/themes/debian-logo cache/downloads/plymouth-theme-debian-logo-1.0 - $(WGET) https://gitlab.com/nodiscc/plymouth-theme-debian-logo/-/archive/1.0/plymouth-theme-debian-logo-1.0.zip - unzip -q cache/downloads/plymouth-theme-debian-logo-1.0.zip -d cache/downloads/ - mkdir -p config/includes.chroot/usr/share/plymouth/themes/ - mv cache/downloads/plymouth-theme-debian-logo-1.0 config/includes.chroot/usr/share/plymouth/themes/debian-logo - # https://gitlab.com/nodiscc/cc0-wallpapers - -rm -rf config/includes.chroot/usr/share/backgrounds/cc0-wallpapers cache/downloads/cc0-wallpapers-1.0 - $(WGET) https://gitlab.com/nodiscc/cc0-wallpapers/-/archive/1.0/cc0-wallpapers-1.0.zip - unzip -q cache/downloads/cc0-wallpapers-1.0.zip -d cache/downloads/ - mkdir -p config/includes.chroot/usr/share/backgrounds/ - mv cache/downloads/cc0-wallpapers-1.0 config/includes.chroot/usr/share/backgrounds/cc0-wallpapers # https://gitlab.com/nodiscc/xfce4-terminal-colorschemes -rm -rf config/includes.chroot/usr/share/xfce4/terminal/colorschemes cache/downloads/xfce4-terminal-colorschemes-1.0 $(WGET) https://gitlab.com/nodiscc/xfce4-terminal-colorschemes/-/archive/1.0/xfce4-terminal-colorschemes-1.0.zip diff --git a/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf b/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf index c749237..5cd5e8a 100644 --- a/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf +++ b/config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf @@ -45,7 +45,7 @@ # transition-duration = overrides default value # [greeter] -background = /usr/share/backgrounds/cc0-wallpapers/unsplash10.jpg +background = /usr/share/desktop-base/futureprototype-theme/wallpaper/contents/images/1600x1200.svg user-background = false theme-name = Arc-Darker icon-theme-name = Papirus diff --git a/config/includes.chroot/etc/plymouth/plymouthd.conf b/config/includes.chroot/etc/plymouth/plymouthd.conf deleted file mode 100644 index 3f70990..0000000 --- a/config/includes.chroot/etc/plymouth/plymouthd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Administrator customizations go in this file -#[Daemon] -#Theme=text -[Daemon] -Theme=debian-logo diff --git a/config/includes.chroot/etc/skel/.config/xfce4/desktop/backdrop.list b/config/includes.chroot/etc/skel/.config/xfce4/desktop/backdrop.list index 84efdc5..a734042 100644 --- a/config/includes.chroot/etc/skel/.config/xfce4/desktop/backdrop.list +++ b/config/includes.chroot/etc/skel/.config/xfce4/desktop/backdrop.list @@ -1,6 +1,7 @@ # xfce backdrop list -/usr/share/backgrounds/cc0-wallpapers/unsplash1.jpg -/usr/share/backgrounds/cc0-wallpapers/unsplash2.jpg -/usr/share/backgrounds/cc0-wallpapers/unsplash5.jpg -/usr/share/backgrounds/cc0-wallpapers/unsplash6.jpg -/usr/share/backgrounds/cc0-wallpapers/unsplash10.jpg +/usr/share/desktop-base/futureprototype-theme/wallpaper/contents/images/1600x1200.svg +/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/1600x1200.svg +/usr/share/desktop-base/moonlight-theme/wallpaper/contents/images/1600x1200.svg +/usr/share/desktop-base/lines-theme/wallpaper/contents/images/1600x1200.svg +/usr/share/desktop-base/joy-theme/wallpaper/contents/images/1600x1200.svg +/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images/1600x1200.svg diff --git a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 1387b06..e90a8d5 100644 --- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -4,19 +4,19 @@ - + - + - + - + diff --git a/config/package-lists/system.list.chroot b/config/package-lists/system.list.chroot index 33a1923..dea3e43 100644 --- a/config/package-lists/system.list.chroot +++ b/config/package-lists/system.list.chroot @@ -212,11 +212,9 @@ light-locker #Alt: xscreensaver-gl #Alt: xscreensaver-gl-extra - # Boot screen plymouth plymouth-x11 -plymouth-themes # Boot/init/permissions management systemd