diff --git a/bin/update-default-backgrounds b/bin/update-default-backgrounds new file mode 100755 index 00000000..424238e5 --- /dev/null +++ b/bin/update-default-backgrounds @@ -0,0 +1,19 @@ +#!/bin/sh + +DESTDIR=share/desktop-base/kali-theme/ +DESKTOP_BACKGROUND=$1 +LOGIN_BACKGROUND=$2 + +# login/lockscreen +ln -sfv /usr/share/backgrounds/kali/$LOGIN_BACKGROUND.xml ${DESTDIR}lockscreen/gnome-background.xml +ln -sfv /usr/share/backgrounds/kali/$LOGIN_BACKGROUND-16x9.png ${DESTDIR}login/background +ln -sfv /usr/share/backgrounds/kali/$LOGIN_BACKGROUND.svg ${DESTDIR}login/background.svg + +# desktop background +kde_wallpaper=$(echo $DESKTOP_BACKGROUND | sed -E 's/(^|-)([a-z])/\U\2/g') +ln -sfv /usr/share/backgrounds/kali/$DESKTOP_BACKGROUND.xml ${DESTDIR}wallpaper/gnome-background.xml +ln -sfv /usr/share/wallpapers/$kde_wallpaper/contents ${DESTDIR}wallpaper/contents + +sed -i "s/defaultWallpaperTheme=.*/defaultWallpaperTheme=${kde_wallpaper}/" share/plasma/desktoptheme/kali/metadata.desktop +sed -i "s/\/usr\/share\/backgrounds\/kali-16x9\/[^\"]*/\/usr\/share\/backgrounds\/kali-16x9\/$DESKTOP_BACKGROUND.png/" \ + etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/debian/kali-themes.gsettings-override b/debian/kali-themes.gsettings-override index 6369420c..836532c4 100644 --- a/debian/kali-themes.gsettings-override +++ b/debian/kali-themes.gsettings-override @@ -24,11 +24,11 @@ monospace-font-name='Fira Code Medium 10' # kali-desktop-base is not required) [org.gnome.desktop.background] picture-options='zoom' -picture-uri='file:///usr/share/backgrounds/kali/kali-logo.xml' +picture-uri='file:///usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml' [org.gnome.desktop.screensaver] picture-options='zoom' -picture-uri='file:///usr/share/backgrounds/kali/kali-light.xml' +picture-uri='file:///usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml' [org.gnome.gedit.preferences.editor] scheme='Kali-Dark' diff --git a/etc/lightdm/lightdm-gtk-greeter.conf b/etc/lightdm/lightdm-gtk-greeter.conf index 4700cd42..d638f3b0 100644 --- a/etc/lightdm/lightdm-gtk-greeter.conf +++ b/etc/lightdm/lightdm-gtk-greeter.conf @@ -1,5 +1,5 @@ [greeter] -background = /usr/share/backgrounds/kali/kali-light-16x9.png +background = /usr/share/desktop-base/kali-theme/login/background theme-name = Kali-Dark font-name = Cantarell 11 icon-theme-name = Flat-Remix-Blue-Dark diff --git a/etc/xdg/kscreenlockerrc b/etc/xdg/kscreenlockerrc index 9b070e65..2a9eb055 100644 --- a/etc/xdg/kscreenlockerrc +++ b/etc/xdg/kscreenlockerrc @@ -1,2 +1,2 @@ [Greeter][Wallpaper][org.kde.image][General] -Image=/usr/share/backgrounds/kali/kali-light-16x9.png +Image=/usr/share/desktop-base/kali-theme/login/background diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 628aa46d..e0069672 100644 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -15,12 +15,12 @@ - + - + diff --git a/share/backgrounds/kali/kali-blur.svg b/share/backgrounds/kali/kali-blur.svg new file mode 100644 index 00000000..515b7651 --- /dev/null +++ b/share/backgrounds/kali/kali-blur.svg @@ -0,0 +1 @@ + diff --git a/share/desktop-base/kali-theme/lockscreen/gnome-background.xml b/share/desktop-base/kali-theme/lockscreen/gnome-background.xml index 2b823079..cb514f97 120000 --- a/share/desktop-base/kali-theme/lockscreen/gnome-background.xml +++ b/share/desktop-base/kali-theme/lockscreen/gnome-background.xml @@ -1 +1 @@ -/usr/share/backgrounds/kali/kali-rings.xml \ No newline at end of file +/usr/share/backgrounds/kali/kali-blur.xml \ No newline at end of file diff --git a/share/desktop-base/kali-theme/login/background b/share/desktop-base/kali-theme/login/background new file mode 120000 index 00000000..1cdab406 --- /dev/null +++ b/share/desktop-base/kali-theme/login/background @@ -0,0 +1 @@ +/usr/share/backgrounds/kali/kali-blur-16x9.png \ No newline at end of file diff --git a/share/desktop-base/kali-theme/login/background.svg b/share/desktop-base/kali-theme/login/background.svg index 4a8e9c4c..fa45fd06 120000 --- a/share/desktop-base/kali-theme/login/background.svg +++ b/share/desktop-base/kali-theme/login/background.svg @@ -1 +1 @@ -/usr/share/backgrounds/kali/kali-rings.svg \ No newline at end of file +/usr/share/backgrounds/kali/kali-blur.svg \ No newline at end of file diff --git a/share/desktop-base/kali-theme/wallpaper/gnome-background.xml b/share/desktop-base/kali-theme/wallpaper/gnome-background.xml index 83e97b9f..91e28ca0 120000 --- a/share/desktop-base/kali-theme/wallpaper/gnome-background.xml +++ b/share/desktop-base/kali-theme/wallpaper/gnome-background.xml @@ -1 +1 @@ -/usr/share/backgrounds/kali/kali-logo.xml \ No newline at end of file +/usr/share/backgrounds/kali/kali-mesh.xml \ No newline at end of file diff --git a/share/plasma/desktoptheme/kali/metadata.desktop b/share/plasma/desktoptheme/kali/metadata.desktop index 2b54b881..6e8df599 100644 --- a/share/plasma/desktoptheme/kali/metadata.desktop +++ b/share/plasma/desktoptheme/kali/metadata.desktop @@ -17,10 +17,10 @@ X-Plasma-API=5.0 FallbackTheme=default [Wallpaper] -defaultWallpaperTheme=DebianTheme +defaultWallpaperTheme=KaliMesh defaultFileSuffix=.png -defaultWidth=1920 -defaultHeight=1080 +defaultWidth=3840 +defaultHeight=2160 [ContrastEffect] enabled=true diff --git a/share/sddm/themes/breeze/theme.conf.user b/share/sddm/themes/breeze/theme.conf.user index d671dc82..6ced68e4 100644 --- a/share/sddm/themes/breeze/theme.conf.user +++ b/share/sddm/themes/breeze/theme.conf.user @@ -1,4 +1,4 @@ [General] type=image color=#2777ff -background=/usr/share/backgrounds/kali/kali-light-16x9.png +background=/usr/share/desktop-base/kali-theme/login/background diff --git a/src/backgrounds/kali-blur-base.png b/src/backgrounds/kali-blur-base.png new file mode 100644 index 00000000..b43eec6e Binary files /dev/null and b/src/backgrounds/kali-blur-base.png differ