From 3e55894e1a323043480e76a5d40153748fcec9da Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 13 Jul 2023 17:02:36 -0500 Subject: [PATCH] making qt5ct-kde and dolphin work a little better I still need to add a way for dolphin to see icons, but It's coming. --- guix/home.scm | 9 ++++++++- guix/pkgs/dolphin-xyz.scm | 12 ++++++++++-- guix/pkgs/qt5ct.scm | 5 ++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/guix/home.scm b/guix/home.scm index 2c435ea..28343f3 100644 --- a/guix/home.scm +++ b/guix/home.scm @@ -8,7 +8,7 @@ #:use-module (pkgs emacs-xyz) #:use-module (pkgs tridactyl-native) #:use-module (pkgs phinger-cursors-theme) - #:use-module (pkgs qt5ct-kde) + #:use-module (pkgs qt5ct) #:use-module (pkgs kdenlive) #:use-module (home-services pipewire) #:use-module (gnu home) @@ -63,6 +63,11 @@ "curl" "mpv" "mpv-mpris" + "libva" + "libva-utils" + "libvdpau" + "libvdpau-va-gl" + "libvpx" "yt-dlp" "python" "playerctl" @@ -209,6 +214,7 @@ "emacs-org-re-reveal" "emacs-org-ql" "emacs-org-msg" + "emacs-nov-el" "emacs-calfw" "emacs-transmission" "emacs-emojify" @@ -381,6 +387,7 @@ gtk-toolbar-style=3 home-files-service-type `(("bin" ,(local-file "../scripts" #:recursive? #t)) (".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t)) + (".var/app/org.mozilla.firefox/.mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t)) (".Xresources" ,(plain-file "Xresources" "Xcursor.theme: phinger-cursors-light Xcursor.size: 36 ")) diff --git a/guix/pkgs/dolphin-xyz.scm b/guix/pkgs/dolphin-xyz.scm index 5411f1e..97e3ba0 100644 --- a/guix/pkgs/dolphin-xyz.scm +++ b/guix/pkgs/dolphin-xyz.scm @@ -1,6 +1,9 @@ -(define-module (dolphin-xyz) +(define-module (pkgs dolphin-xyz) #:use-module (gnu packages) #:use-module (gnu packages qt) + #:use-module (gnu packages wayland) + #:use-module (gnu packages kde) + #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-systemtools) #:use-module (guix build-system qt) #:use-module (guix utils) @@ -32,9 +35,14 @@ ktextwidgets kuserfeedback kwindowsystem + ffmpegthumbs breeze-icons ;; default icon set + oxygen-icons phonon qtbase-5 qtwayland wayland - solid)))) + solid)) + (propogated-inputs '(kfind)))) + +dolphin-xyz diff --git a/guix/pkgs/qt5ct.scm b/guix/pkgs/qt5ct.scm index 4a7fd64..b11efc6 100644 --- a/guix/pkgs/qt5ct.scm +++ b/guix/pkgs/qt5ct.scm @@ -8,8 +8,7 @@ #:use-module (gnu packages) #:use-module (gnu packages qt) #:use-module (gnu packages kde-frameworks) - #:use-module (guix gexp) - #:use-module (srfi srfi-1)) + #:use-module (guix gexp)) (define-public qt5ct-kde (package @@ -20,7 +19,7 @@ (method url-fetch) (uri (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) - (patches '("./patches/qt5ct-kde.patch")) + (patches '("patches/qt5ct-kde.patch")) (sha256 (base32 "1mxqallxw0b5p4kjfnvv9ndzws54si4a3xlz3gnxyl2cdrm58n7d")))) (inputs (modify-inputs