From 9563fec540e63e99d29a8b8fb029f0cd980660da Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 12 Jan 2023 23:34:07 +0000 Subject: [PATCH] Update 6 files - /home/private_dot_config/dconf/settings/org.gnome.desktop.applications - /home/private_dot_config/dconf/settings/system.proxy - /home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl - /home/private_dot_config/dconf/settings/org.gnome.desktop.screensaver - /home/private_dot_config/dconf/settings/org.gnome.desktop.background - /home/private_dot_config/dconf/settings/org.gtk.settings.debug --- .../run_onchange_after_19-theme-files.tmpl | 22 +++++++++---------- .../settings/org.gnome.desktop.applications | 0 .../settings/org.gnome.desktop.background | 7 ++++++ .../settings/org.gnome.desktop.screensaver | 6 +++++ .../dconf/settings/org.gtk.settings.debug | 2 ++ .../dconf/settings/system.proxy | 1 - 6 files changed, 26 insertions(+), 12 deletions(-) delete mode 100644 home/private_dot_config/dconf/settings/org.gnome.desktop.applications create mode 100644 home/private_dot_config/dconf/settings/org.gnome.desktop.screensaver delete mode 100644 home/private_dot_config/dconf/settings/system.proxy diff --git a/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl index bcf9df7b..4e7b1a87 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl @@ -40,26 +40,26 @@ else logg warn '`squash-symlink` is not a script in the PATH' fi -### Copy /usr/local/share/backgrounds to /usr/share/backgrounds (required for GNOME wallpaper on Ubuntu) -if [ -d /usr/local/share/backgrounds ] && command -v rsync > /dev/null; then - sudo rsync -atvu --include "*.jpg" --exclude "*" /usr/local/share/backgrounds/ /usr/share/backgrounds - sudo rsync -atvu --include "*.jpg" --exclude "*" /usr/local/share/backgrounds/images/ /usr/share/backgrounds - logg success 'Synchronized the background images in /usr/local/share/backgrounds to /usr/share/backgrounds' +### Ensure /usr/share/backgrounds/default.png is deleted +if [ -f /usr/share/backgrounds/default.png ]; then + sudo rm -f /usr/share/backgrounds/default.png fi ### Add the default image symlink based on the OS -if [ '{{ .host.os.id }}' == 'archlinux' ]; then +if [ '{{ .host.distro.id }}' == 'archlinux' ]; then sudo ln -s /usr/local/share/wallpapers/Betelgeuse-Archlinux/contents/source.png /usr/share/backgrounds/default.png -elif [ '{{ .host.os.id }}' == 'centos' ]; then +elif [ '{{ .host.distro.id }}' == 'centos' ]; then sudo ln -s /usr/local/share/wallpapers/Betelgeuse-CentOS/contents/source.png /usr/share/backgrounds/default.png -elif [ '{{ .host.os.id }}' == 'darwin' ]; then +elif [ '{{ .host.distro.id }}' == 'darwin' ]; then sudo ln -s /usr/local/share/wallpapers/Betelgeuse-macOS/contents/source.png /usr/share/backgrounds/default.png -elif [ '{{ .host.os.id }}' == 'debian' ]; then +elif [ '{{ .host.distro.id }}' == 'debian' ]; then sudo ln -s /usr/local/share/wallpapers/Betelgeuse-Debian/contents/source.png /usr/share/backgrounds/default.png -elif [ '{{ .host.os.id }}' == 'fedora' ]; then +elif [ '{{ .host.distro.id }}' == 'fedora' ]; then sudo ln -s /usr/local/share/wallpapers/Betelgeuse-Fedora/contents/source.png /usr/share/backgrounds/default.png -elif [ '{{ .host.os.id }}' == 'ubuntu' ]; then +elif [ '{{ .host.distro.id }}' == 'ubuntu' ]; then sudo ln -s /usr/local/share/wallpapers/Betelgeuse-Ubuntu/contents/source.png /usr/share/backgrounds/default.png +elif [ '{{ .host.distro.id }}' == 'windows' ]; then + sudo ln -s /usr/local/share/wallpapers/Betelgeuse-Windows/contents/source.png /usr/share/backgrounds/default.png else sudo ln -s /usr/local/share/wallpapers/Betelgeuse/contents/source.png /usr/share/backgrounds/default.png fi diff --git a/home/private_dot_config/dconf/settings/org.gnome.desktop.applications b/home/private_dot_config/dconf/settings/org.gnome.desktop.applications deleted file mode 100644 index e69de29b..00000000 diff --git a/home/private_dot_config/dconf/settings/org.gnome.desktop.background b/home/private_dot_config/dconf/settings/org.gnome.desktop.background index e69de29b..9babf6fa 100644 --- a/home/private_dot_config/dconf/settings/org.gnome.desktop.background +++ b/home/private_dot_config/dconf/settings/org.gnome.desktop.background @@ -0,0 +1,7 @@ +[/] +color-shading-type='solid' +picture-options='zoom' +picture-uri='file:///usr/local/share/wallpapers/Betelgeuse/contents/source.jpg' +picture-uri-dark='file:///usr/local/share/wallpapers/Betelgeuse/contents/source.jpg' +primary-color='#000000000000' +secondary-color='#000000000000' \ No newline at end of file diff --git a/home/private_dot_config/dconf/settings/org.gnome.desktop.screensaver b/home/private_dot_config/dconf/settings/org.gnome.desktop.screensaver new file mode 100644 index 00000000..44f861c6 --- /dev/null +++ b/home/private_dot_config/dconf/settings/org.gnome.desktop.screensaver @@ -0,0 +1,6 @@ +[/] +color-shading-type='solid' +picture-options='zoom' +picture-uri='file:///usr/local/share/wallpapers/Betelgeuse/contents/source.jpg' +primary-color='#000000000000' +secondary-color='#000000000000' \ No newline at end of file diff --git a/home/private_dot_config/dconf/settings/org.gtk.settings.debug b/home/private_dot_config/dconf/settings/org.gtk.settings.debug index e69de29b..944014b5 100644 --- a/home/private_dot_config/dconf/settings/org.gtk.settings.debug +++ b/home/private_dot_config/dconf/settings/org.gtk.settings.debug @@ -0,0 +1,2 @@ +[/] +enable-inspector-keybinding=true \ No newline at end of file diff --git a/home/private_dot_config/dconf/settings/system.proxy b/home/private_dot_config/dconf/settings/system.proxy deleted file mode 100644 index dcf2c804..00000000 --- a/home/private_dot_config/dconf/settings/system.proxy +++ /dev/null @@ -1 +0,0 @@ -# Placeholder