From 9022a61c8d19b8ac7eaff784f521555915dfb9a8 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Sun, 1 Sep 2024 17:25:36 +0200 Subject: [PATCH] feat: add gtk dconf config This fixes gtk4 using only values from dconf, instead of respecting what is in ~/.config/gtk-4.0 --- home/modules/ruther/home/services/gtk.scm | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/home/modules/ruther/home/services/gtk.scm b/home/modules/ruther/home/services/gtk.scm index bb37aba..6b0d999 100644 --- a/home/modules/ruther/home/services/gtk.scm +++ b/home/modules/ruther/home/services/gtk.scm @@ -5,6 +5,8 @@ #:use-module (guix gexp) #:use-module (guix build-system trivial) #:use-module (gnu home services) + #:use-module (ruther home services dconf) + #:use-module (ruther home themes) #:export (home-gtk-configuration gtk-theme-configuration home-gtk-service-type)) @@ -121,12 +123,24 @@ (gtk-theme-configuration-package (home-gtk-configuration-gtk-theme config)) (gtk-theme-configuration-name (home-gtk-configuration-gtk-theme config))))))))) +(define (add-gtk-dconf-config config) + (let* ((data `((font-name . ,(home-gtk-configuration-font-name config)) + (gtk-theme . ,(gtk-theme-configuration-name (home-gtk-configuration-gtk-theme config))) + (cursor-theme . ,(gtk-theme-configuration-name (home-gtk-configuration-cursor-theme config))) + (icon-theme . ,(gtk-theme-configuration-name (home-gtk-configuration-icon-theme config))))) + (filtered-data (filter (lambda (x) (not (nil? (cdr x)))) data))) + `((org/gnome/desktop/interface + ,filtered-data)))) + (define-public home-gtk-service-type (service-type (name 'home-gtk) (extensions (list (service-extension home-files-service-type add-gtk-config-file) + (service-extension + home-dconf-service-type + add-gtk-dconf-config) (service-extension home-profile-service-type add-gtk-theme-packages) @@ -134,3 +148,23 @@ home-environment-variables-service-type add-xcursor-environment))) (description "Create gtk theme configuration files for gtk2 and gtk3"))) + +(define-public dconf-config + (let ((gtk-theme (make-graphite-gtk-theme #:theme "orange" #:color "dark")) + (icon-theme (make-tela-circle-icon-theme #:variant "orange")) + (cursor-theme (make-catppuccin-cursors #:flavor "frappe" #:accent "sapphire"))) + (home-gtk-configuration + (gtk-theme + (gtk-theme-configuration + (package gtk-theme) + (name (assoc-ref (package-properties gtk-theme) 'theme-name)))) + (cursor-theme + (gtk-theme-configuration + (package cursor-theme) + (name (assoc-ref (package-properties cursor-theme) 'cursor-theme-name)) + (size 16))) + (icon-theme + (gtk-theme-configuration + (package icon-theme) + (name (assoc-ref (package-properties icon-theme) 'dark-icon-theme-name)))) + (font-name "Ubuntu 10")))) -- 2.48.1