diff options
Diffstat (limited to 'px/packages')
| -rw-r--r-- | px/packages/base.scm | 8 | ||||
| -rw-r--r-- | px/packages/desktop.scm | 46 |
2 files changed, 29 insertions, 25 deletions
diff --git a/px/packages/base.scm b/px/packages/base.scm index 6be77cc..b835a24 100644 --- a/px/packages/base.scm +++ b/px/packages/base.scm @@ -25,7 +25,7 @@ #:use-module (px packages setup) #:use-module (px packages themes) #:export (%px-core-packages - %px-desktop-core-packages + %px-desktop-minimal-packages %px-desktop-packages-gtk %px-desktop-packages-qt %px-desktop-packages @@ -50,19 +50,21 @@ ;;; ;; Stuff for every desktop; QT / GTK on X / Wayland -(define %px-desktop-core-packages - (append %common-desktop-applications +(define %px-desktop-minimal-packages + (append %minimal-desktop-applications %px-core-packages)) ;; GTK-specific (define %px-desktop-packages-gtk (append %gtk-desktop-applications + %minimal-desktop-applications %common-desktop-applications %px-core-packages)) ;; QT-specific (define %px-desktop-packages-qt (append %qt-desktop-applications + %minimal-desktop-applications %common-desktop-applications %px-core-packages)) diff --git a/px/packages/desktop.scm b/px/packages/desktop.scm index 8b0159a..8e8ce8b 100644 --- a/px/packages/desktop.scm +++ b/px/packages/desktop.scm @@ -53,8 +53,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages syncthing) #:use-module (gnu packages xdisorg) - #:use-module (nongnu packages compression) - #:use-module (nongnu packages mozilla) + #:use-module (px packages accounts) #:use-module (px packages atril-thumbnailer) #:use-module (px packages backup) @@ -70,8 +69,12 @@ #:use-module (px packages images) #:use-module (px packages themes) #:use-module (px packages device) + + #:use-module (nongnu packages compression) + #:use-module (nongnu packages mozilla) #:use-module (srfi srfi-1) - #:export (%common-desktop-applications + #:export (%minimal-desktop-applications + %common-desktop-applications %gtk-desktop-applications %qt-desktop-applications)) @@ -80,7 +83,7 @@ ;; ;; Stuff for every desktop; QT / GTK on X / Wayland -(define %common-desktop-applications +(define %minimal-desktop-applications (list aspell aspell-dict-en @@ -93,7 +96,6 @@ font-openmoji gvfs - print-manager pam-u2f libu2f-host @@ -109,42 +111,43 @@ blueman)) -;; GTK-specific -(define %gtk-desktop-applications - (list syncthing-gtk - ;; Look and feel +(define %common-desktop-applications + (list libreoffice + px-sddm-theme xcursor-themes gnome-themes-standard + sddm-darkine-theme + paper-icon-theme + breeze-gtk ;; Keychain gcr gnome-keyring + ;; Printing + print-manager + + network-manager-applet + )) + +;; GTK-specific +(define %gtk-desktop-applications + (list syncthing-gtk + ;; PGP seahorse)) ;; QT-specific (define %qt-desktop-applications - (list px-sddm-theme - xcursor-themes - gnome-themes-standard - paper-icon-theme - sddm-darkine-theme - breeze-gtk - - ;; Keychain - gcr - gnome-keyring - + (list syncthingtray speedcrunch qimgv ;; strawberry mpv - network-manager-applet featherpad qpdfview @@ -154,7 +157,6 @@ lxmenu-data albert-launcher - kleopatra ;; Clipboard manager |