diff --git a/roles/home-gui/files/gnome-setup.sh b/roles/home-gui/files/gnome-setup.sh index ff7d5c5..03feabd 100644 --- a/roles/home-gui/files/gnome-setup.sh +++ b/roles/home-gui/files/gnome-setup.sh @@ -1,11 +1,5 @@ #!/bin/sh -if [ "$(cat /sys/devices/virtual/dmi/id/product_name)" = "Latitude 7490" ] -then - # Leave commented for light mode, or uncomment for dark mode. - _acp_dark_mode=1 -fi - test -x /usr/bin/gsettings || (echo "gsettings not found" && exit 1) set_favorites_bar () { @@ -76,12 +70,7 @@ set_nautilus_preferences set_gnome_terminal_preferences () { gsettings set org.gnome.Terminal.Legacy.Settings menu-accelerator-enabled false gsettings set org.gnome.Terminal.Legacy.Settings shortcuts-enabled false - if [ -n "$_acp_dark_mode" ] - then - gsettings set org.gnome.Terminal.Legacy.Settings theme-variant 'dark' - else - gsettings set org.gnome.Terminal.Legacy.Settings theme-variant 'light' - fi + gsettings set org.gnome.Terminal.Legacy.Settings theme-variant 'light' _acp_terminal_profile="org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:$(gsettings get org.gnome.Terminal.ProfilesList default | tr -d \')/" gsettings set "$_acp_terminal_profile" audible-bell false @@ -95,14 +84,8 @@ set_gnome_terminal_preferences () { gsettings set "$_acp_terminal_profile" preserve-working-directory 'always' gsettings set "$_acp_terminal_profile" use-theme-colors false gsettings set "$_acp_terminal_profile" use-system-font true - if [ -n "$_acp_dark_mode" ] - then - gsettings set "$_acp_terminal_profile" background-color '#101010' - gsettings set "$_acp_terminal_profile" foreground-color '#C0C0C0' - else - gsettings set "$_acp_terminal_profile" background-color '#EEEEEC' - gsettings set "$_acp_terminal_profile" foreground-color '#2E3436' - fi + gsettings set "$_acp_terminal_profile" background-color '#EEEEEC' + gsettings set "$_acp_terminal_profile" foreground-color '#2E3436' unset _acp_terminal_profile } set_gnome_terminal_preferences @@ -209,36 +192,29 @@ set_misc_preferences () { gsettings set org.gnome.settings-daemon.plugins.color night-light-enabled 'false' gsettings set org.gnome.settings-daemon.plugins.color night-light-schedule-automatic 'false' - # Remove the wallpaper. - gsettings set org.gnome.desktop.background color-shading-type 'solid' - gsettings set org.gnome.desktop.background picture-options 'zoom' if [ "$(hostname -s)" = "ossanna" ] then - gsettings set org.gnome.desktop.background picture-uri "file://$XDG_DATA_HOME/wallpaper-1995.svg" - gsettings set org.gnome.desktop.background picture-uri-dark "file://$XDG_DATA_HOME/wallpaper-1995.svg" - gsettings set org.gnome.desktop.interface accent-color 'teal' - else - gsettings set org.gnome.desktop.background picture-uri "file://$XDG_DATA_HOME/wallpaper-2015.svg" - gsettings set org.gnome.desktop.background picture-uri-dark "file://$XDG_DATA_HOME/wallpaper-2015.svg" + gsettings reset org.gnome.desktop.background primary-color + gsettings reset org.gnome.desktop.background secondary-color + gsettings set org.gnome.desktop.background color-shading-type 'solid' + gsettings set org.gnome.desktop.background picture-options 'zoom' + gsettings set org.gnome.desktop.background picture-uri "file://$XDG_DATA_HOME/wallpaper-2000.svg" + gsettings set org.gnome.desktop.background picture-uri-dark "file://$XDG_DATA_HOME/wallpaper-2000.svg" gsettings set org.gnome.desktop.interface accent-color 'blue' - fi - if [ -n "$_acp_dark_mode" ] - then - gsettings set org.gnome.desktop.background primary-color '#101010' - gsettings set org.gnome.desktop.background secondary-color '#101010' else - gsettings set org.gnome.desktop.background primary-color '#008080' - gsettings set org.gnome.desktop.background secondary-color '#008080' + # Remove the wallpaper. + gsettings reset org.gnome.desktop.background color-shading-type + gsettings reset org.gnome.desktop.background picture-options + gsettings reset org.gnome.desktop.background picture-uri + gsettings reset org.gnome.desktop.background picture-uri-dark + gsettings reset org.gnome.desktop.background primary-color + gsettings reset org.gnome.desktop.background secondary-color + gsettings reset org.gnome.desktop.interface accent-color fi - if [ -n "$_acp_dark_mode" ] - then - gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' - gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark' - else - gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' - gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita' - fi + # Set light mode. + gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' + gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita' if [ "$(cat /sys/devices/virtual/dmi/id/product_name)" = "Latitude 7490" ] then @@ -279,8 +255,3 @@ if [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/reset-gnome-setup.local" ] then . "${XDG_CONFIG_HOME:-$HOME/.config}/reset-gnome-setup.local" fi - -if [ -n "$_acp_dark_mode" ] -then - unset _acp_dark_mode -fi