From dc2bb9234291af67951e55b541e8889eef078b58 Mon Sep 17 00:00:00 2001
From: Simon Rieger <srieger@spectreos.de>
Date: Tue, 28 Mar 2023 23:08:34 +0200
Subject: [PATCH] add override gtk-theme lxqt-config-appearance add new
 gsettings-import script

---
 .../gtk-3.0/executable_settings-backup.ini    | 15 -----------
 dot_config/gtk-3.0/executable_settings.ini    | 23 ++++++----------
 .../executable_settings.ini-1667168286~       | 20 --------------
 .../gtk-3.0/executable_settings.ini.old       | 20 --------------
 dot_config/lxqt/executable_archiver.conf      |  2 +-
 .../executable_lxqt-config-appearance.conf    |  4 +--
 dot_gtkrc-2.0                                 | 26 +++++++------------
 {scripte => scripts}/executable_i3exit        |  0
 scripts/executable_import-gsettings           | 15 +++++++++++
 {scripte => scripts}/executable_swayexit      |  0
 10 files changed, 35 insertions(+), 90 deletions(-)
 delete mode 100644 dot_config/gtk-3.0/executable_settings-backup.ini
 delete mode 100644 dot_config/gtk-3.0/executable_settings.ini-1667168286~
 delete mode 100644 dot_config/gtk-3.0/executable_settings.ini.old
 rename {scripte => scripts}/executable_i3exit (100%)
 create mode 100644 scripts/executable_import-gsettings
 rename {scripte => scripts}/executable_swayexit (100%)

diff --git a/dot_config/gtk-3.0/executable_settings-backup.ini b/dot_config/gtk-3.0/executable_settings-backup.ini
deleted file mode 100644
index defeabc..0000000
--- a/dot_config/gtk-3.0/executable_settings-backup.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[Settings]
-gtk-theme-name=Arc-Darker
-gtk-icon-theme-name=Arc
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=capitaine-cursors
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
diff --git a/dot_config/gtk-3.0/executable_settings.ini b/dot_config/gtk-3.0/executable_settings.ini
index a583619..065c0e6 100644
--- a/dot_config/gtk-3.0/executable_settings.ini
+++ b/dot_config/gtk-3.0/executable_settings.ini
@@ -1,19 +1,12 @@
 
 # Created by lxqt-config-appearance (DO NOT EDIT!)
-
 [Settings]
-gtk-theme-name=Arc-Dark
-gtk-icon-theme-name=Arc
+gtk-theme-name = Arc-Dark
+gtk-icon-theme-name = Arc
 # GTK3 ignores bold or italic attributes.
-gtk-font-name=Cantarell 11
-gtk-menu-images=1
-gtk-button-images=1
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-cursor-theme-name=capitaine-cursors
-gtk-cursor-theme-size=24
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
+gtk-font-name = Cantarell 12
+gtk-menu-images = 1
+gtk-button-images = 1
+gtk-toolbar-style = GTK_TOOLBAR_BOTH_HORIZ
+gtk-cursor-theme-name = capitaine-cursors
+gtk-cursor-theme-size = 24
diff --git a/dot_config/gtk-3.0/executable_settings.ini-1667168286~ b/dot_config/gtk-3.0/executable_settings.ini-1667168286~
deleted file mode 100644
index ff2968c..0000000
--- a/dot_config/gtk-3.0/executable_settings.ini-1667168286~
+++ /dev/null
@@ -1,20 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=false
-gtk-button-images=1
-gtk-cursor-theme-name=capitaine-cursors
-gtk-cursor-theme-size=24
-gtk-decoration-layout=icon:minimize,maximize,close
-gtk-enable-animations=true
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-font-name=Noto Sans,  10
-gtk-icon-theme-name=Arc
-gtk-menu-images=1
-gtk-modules=colorreload-gtk-module
-gtk-primary-button-warps-slider=false
-gtk-theme-name=Arc-Darker
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
diff --git a/dot_config/gtk-3.0/executable_settings.ini.old b/dot_config/gtk-3.0/executable_settings.ini.old
deleted file mode 100644
index 8f2507d..0000000
--- a/dot_config/gtk-3.0/executable_settings.ini.old
+++ /dev/null
@@ -1,20 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=true
-gtk-button-images=1
-gtk-cursor-theme-name=capitaine-cursors
-gtk-cursor-theme-size=24
-gtk-decoration-layout=icon:minimize,maximize,close
-gtk-enable-animations=true
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-font-name=Noto Sans,  10
-gtk-icon-theme-name=Arc
-gtk-menu-images=1
-gtk-modules=colorreload-gtk-module
-gtk-primary-button-warps-slider=false
-gtk-theme-name=Arc-Darker
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
diff --git a/dot_config/lxqt/executable_archiver.conf b/dot_config/lxqt/executable_archiver.conf
index c4c245d..4f63fb7 100644
--- a/dot_config/lxqt/executable_archiver.conf
+++ b/dot_config/lxqt/executable_archiver.conf
@@ -1,7 +1,7 @@
 [Sizes]
 SplitterPos=200
 ViewsIconSize=24
-WindowSize=@Size(944 1031)
+WindowSize=@Size(938 1024)
 
 [Window]
 DirTree=true
diff --git a/dot_config/lxqt/executable_lxqt-config-appearance.conf b/dot_config/lxqt/executable_lxqt-config-appearance.conf
index c0b6e7b..f15ab88 100644
--- a/dot_config/lxqt/executable_lxqt-config-appearance.conf
+++ b/dot_config/lxqt/executable_lxqt-config-appearance.conf
@@ -1,4 +1,4 @@
 [General]
-ControlGTKThemeEnabled=false
+ControlGTKThemeEnabled=true
 __userfile__=true
-size=@Size(675 1031)
+size=@Size(938 1024)
diff --git a/dot_gtkrc-2.0 b/dot_gtkrc-2.0
index e65fbf9..b134cea 100644
--- a/dot_gtkrc-2.0
+++ b/dot_gtkrc-2.0
@@ -1,18 +1,10 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-include "/home/simono41/.gtkrc-2.0.mine"
-gtk-theme-name="Arc-Dark"
-gtk-icon-theme-name="Arc"
-gtk-font-name="Cantarell 11"
-gtk-cursor-theme-name="capitaine-cursors"
-gtk-cursor-theme-size=24
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-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="hintmedium"
+# Created by lxqt-config-appearance (DO NOT EDIT!)
+gtk-theme-name = "Arc-Dark"
+gtk-icon-theme-name = "Arc"
+gtk-font-name = "Cantarell 12"
+gtk-button-images = 1
+gtk-menu-images = 1
+gtk-toolbar-style = GTK_TOOLBAR_BOTH_HORIZ
+gtk-cursor-theme-name = capitaine-cursors
+gtk-cursor-theme-size = 24
diff --git a/scripte/executable_i3exit b/scripts/executable_i3exit
similarity index 100%
rename from scripte/executable_i3exit
rename to scripts/executable_i3exit
diff --git a/scripts/executable_import-gsettings b/scripts/executable_import-gsettings
new file mode 100644
index 0000000..967620f
--- /dev/null
+++ b/scripts/executable_import-gsettings
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# usage: import-gsettings
+config="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini"
+if [ ! -f "$config" ]; then exit 1; fi
+
+gnome_schema="org.gnome.desktop.interface"
+gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')"
+icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')"
+cursor_theme="$(grep 'gtk-cursor-theme-name' "$config" | sed 's/.*\s*=\s*//')"
+font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
+gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
+gsettings set "$gnome_schema" icon-theme "$icon_theme"
+gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
+gsettings set "$gnome_schema" font-name "$font_name"
diff --git a/scripte/executable_swayexit b/scripts/executable_swayexit
similarity index 100%
rename from scripte/executable_swayexit
rename to scripts/executable_swayexit