From 22ce06e37b1a12e638206559ef0dddd27879fa5e Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 23 Nov 2024 17:21:51 +0100 Subject: use default gtk theme --- .config/gtk-3.0/settings.ini | 16 ++++++++++++++++ .config/gtk-3.0/settings.ini##template | 20 -------------------- .config/gtk-4.0/env | 5 +++++ .local/share/mode/switch.d/gtk | 7 ++----- 4 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 .config/gtk-3.0/settings.ini delete mode 100644 .config/gtk-3.0/settings.ini##template create mode 100644 .config/gtk-4.0/env diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..5c6573f --- /dev/null +++ b/.config/gtk-3.0/settings.ini @@ -0,0 +1,16 @@ +[Settings] +gtk-application-prefer-light-theme=1 +gtk-icon-theme-name=Adwaita +gtk-font-name=Inter 9 +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-cursor-theme-name=OpenZone_Black_Slim +gtk-theme-name=adw-gtk3-light diff --git a/.config/gtk-3.0/settings.ini##template b/.config/gtk-3.0/settings.ini##template deleted file mode 100644 index c8792aa..0000000 --- a/.config/gtk-3.0/settings.ini##template +++ /dev/null @@ -1,20 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=true -gtk-icon-theme-name=Adwaita -gtk-font-name=Inter 9 -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull -gtk-cursor-theme-name=OpenZone_Black_Slim -{% if yadm.hostname == "thoncc" %} -gtk-theme-name=Skeuos-Blue-Light -{% else %} -gtk-theme-name=Skeuos-Blue-Dark -{% endif %} diff --git a/.config/gtk-4.0/env b/.config/gtk-4.0/env new file mode 100644 index 0000000..42b34f5 --- /dev/null +++ b/.config/gtk-4.0/env @@ -0,0 +1,5 @@ +#!/bin/sh +export GTK_THEME="adw-gtk3" +. "$XDG_CACHE_HOME/mode/state/theme" +[ "$mode" = "dark" ] && GTK_THEME="$GTK_THEME:dark" +export GTK_THEME diff --git a/.local/share/mode/switch.d/gtk b/.local/share/mode/switch.d/gtk index 63a2f83..95d3e53 100755 --- a/.local/share/mode/switch.d/gtk +++ b/.local/share/mode/switch.d/gtk @@ -1,13 +1,10 @@ #!/bin/sh GTK_3_SETTINGS_INI="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" -GTK_4_SETTINGS_ENV="$XDG_CONFIG_HOME/gtk-4.0/env" if [ "$mode" = "light" ]; then - sed 's/^\(export\s\+GTK_THEME=.\+\)-Dark\(.*\)$/\1-Light\2/g' -i "$GTK_4_SETTINGS_ENV" - sed "s/-Dark/-Light/" -i "$GTK_3_SETTINGS_INI" + sed -e 's/-Dark/-Light/' -e 's/-dark/-light/' -i "$GTK_3_SETTINGS_INI" sed "s/gtk-application-prefer-dark-theme.*/gtk-application-prefer-dark-theme=false/" -i "$GTK_3_SETTINGS_INI" else - sed 's/^\(export\s\+GTK_THEME=.\+\)-Light\(.*\)$/\1-Dark\2/g' -i "$GTK_4_SETTINGS_ENV" - sed "s/-Light/-Dark/" -i "$GTK_3_SETTINGS_INI" + sed -e 's/-Dark/-Light/' -e 's/-dark/-light/' -i "$GTK_3_SETTINGS_INI" sed "s/gtk-application-prefer-dark-theme.*/gtk-application-prefer-dark-theme=true/" -i "$GTK_3_SETTINGS_INI" fi grep gtk-theme-name "$GTK_3_SETTINGS_INI" | cut -f2 -d= | xargs xfconf-query -c xsettings -p /Net/ThemeName -s -- cgit v1.2.3