From b4bc56bf675fb6e50687980dabf6d079655d499d Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Thu, 8 Feb 2024 13:28:30 -0500
Subject: [PATCH] gtk: force override libadwaita and set stuff consistently

---
 archpkgs                                       | 6 ++----
 bin/setup                                      | 7 +------
 dconf/:com:solus-project:                      | 2 +-
 dconf/:org:gnome:desktop:interface:            | 8 ++++++++
 dconf/:org:gnome:desktop:peripherals:touchpad: | 2 ++
 fish/config.fish                               | 2 +-
 gtk-3.0/settings.ini                           | 5 -----
 gtk-4.0/gtk.css                                | 1 +
 8 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 dconf/:org:gnome:desktop:interface:
 create mode 100644 dconf/:org:gnome:desktop:peripherals:touchpad:
 delete mode 100644 gtk-3.0/settings.ini
 create mode 120000 gtk-4.0/gtk.css

diff --git a/archpkgs b/archpkgs
index 5badd0d..7c78168 100644
--- a/archpkgs
+++ b/archpkgs
@@ -23,12 +23,12 @@ clang
 cmake
 cpupower
 dart-sass
-dnsmasq
 doas-sudo-shim
 dolphin-emu
 dolphin-emu-tool
 dracula-gtk-theme-git
 dracula-kde-theme-git
+elvish
 expac
 fd
 firejail
@@ -56,7 +56,6 @@ intel-media-driver
 intel-ucode
 inxi
 jack2
-jaq
 jdupes
 jless
 jpegoptim
@@ -93,6 +92,7 @@ neovim
 netsurf
 network-manager-applet
 networkmanager
+networkmanager-openconnect
 nicotine+
 ninja
 nnn
@@ -106,7 +106,6 @@ parallel
 pcmanfm-gtk3
 perl-parallel-forkmanager
 php
-picocom
 pipewire
 pngquant
 poppler
@@ -141,7 +140,6 @@ sof-firmware
 squashfs-tools
 starship
 steam
-stlink
 stow
 sxiv
 syncthing
diff --git a/bin/setup b/bin/setup
index cc08b2a..23edcee 100755
--- a/bin/setup
+++ b/bin/setup
@@ -15,6 +15,7 @@ echo kernel.core_pattern=/dev/null | s tee -a /etc/sysctl.d/50-coredump.conf
 echo options i915 enable_rc6=1 enable_fbc=1 lvds_downclock=1 enable__psr=1 | s tee -a /etc/modprobe.d/i915.conf
 echo options lsm=landlock,lockdown,yama,integrity,apparmor,bpf | s tee -a /boot/loader/entries/*.conf
 
+mkdir -p ~/.parallel/will-cite
 stow --no-folding -d ~/.dotfiles -t ~/.config .
 fish -c "aliases"
 
@@ -32,12 +33,6 @@ nvim +PaqInstall +q
 g g p:appdwarf ~/.local/appdwarf
 g g p:haiku-icons ~/.local/share/icons/Haiku
 
-mkdir -p ~/.parallel/will-cite
-parallel gsettings set org.gnome.desktop.interface {}-theme Haiku ::: cursor icon
-
-gsettings set org.gnome.desktop.interface gtk-theme Dracula
-gsettings set org.gnome.desktop.peripherals.touchpad disable-while-typing false
-
 for i in ~/.dotfiles/dconf/*; do
     dconf reset -f "$(basename "$i" | tr : /)"
     #shellcheck disable=SC2094
diff --git a/dconf/:com:solus-project: b/dconf/:com:solus-project:
index 7bd0aac..b9d9407 100644
--- a/dconf/:com:solus-project:
+++ b/dconf/:com:solus-project:
@@ -1,5 +1,5 @@
 [budgie-panel]
-builtin-theme=true
+builtin-theme=false
 confirm-remove-applet=false
 dark-theme=true
 migration-level=1
diff --git a/dconf/:org:gnome:desktop:interface: b/dconf/:org:gnome:desktop:interface:
new file mode 100644
index 0000000..b274396
--- /dev/null
+++ b/dconf/:org:gnome:desktop:interface:
@@ -0,0 +1,8 @@
+[/]
+color-scheme='prefer-dark'
+cursor-theme='Haiku'
+enable-animations=false
+gtk-theme='Dracula'
+icon-theme='Haiku'
+show-battery-percentage=true
+text-scaling-factor=1.25
diff --git a/dconf/:org:gnome:desktop:peripherals:touchpad: b/dconf/:org:gnome:desktop:peripherals:touchpad:
new file mode 100644
index 0000000..081589a
--- /dev/null
+++ b/dconf/:org:gnome:desktop:peripherals:touchpad:
@@ -0,0 +1,2 @@
+[/]
+disable-while-typing=false
diff --git a/fish/config.fish b/fish/config.fish
index 468f926..f325e3c 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,6 +1,6 @@
 fish_add_path -g ~/{.dotfiles,.local{/appdwarf,},Games}/bin /usr/lib64/ccache/bin
 export EDITOR=nvim MANPAGER='nvim +Man!' USE_CCACHE=1 PAGER=nvimpager
-export QT_STYLE_OVERRIDE=kvantum
+export QT_STYLE_OVERRIDE=kvantum GTK_THEME=Dracula
 export NNN_PLUG='f:fzcd;i:imgur;j:autojump;m:nmount;s:imgview'
 
 set fish_greeting
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
deleted file mode 100644
index 7433945..0000000
--- a/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Settings]
-gtk-theme-name=Ant-Dracula
-gtk-cursor-theme-name=Haiku
-gtk-icon-theme-name=Haiku
-gtk-font-name = Clear Sans 13
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
new file mode 120000
index 0000000..beb3b06
--- /dev/null
+++ b/gtk-4.0/gtk.css
@@ -0,0 +1 @@
+../gtk-3.0/gtk.css
\ No newline at end of file