diff options
| -rw-r--r-- | px/packages/desktop-tools.scm | 58 | ||||
| -rw-r--r-- | px/packages/desktop.scm | 70 | ||||
| -rw-r--r-- | px/packages/multimedia.scm | 34 | ||||
| -rw-r--r-- | px/packages/themes.scm | 2 |
4 files changed, 36 insertions, 128 deletions
diff --git a/px/packages/desktop-tools.scm b/px/packages/desktop-tools.scm index 1cfd004..e9e423b 100644 --- a/px/packages/desktop-tools.scm +++ b/px/packages/desktop-tools.scm @@ -143,64 +143,6 @@ "Albert is a desktop agnostic launcher. Its goals are usability and beauty, performance and extensibility. It is written in C++ and based on the Qt framework.") (license license:gpl3+))) -(define-public px-file-archiver - (package - (inherit lxqt-archiver) - (name "px-file-archiver") - (version "0.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/lxqt/lxqt-archiver.git")) - (commit version))) - (file-name (git-file-name "lxqt-archiver" version)) - (sha256 - (base32 "0qz3j0qby78ngck60rv7kgwygya8cr1v4kn575wrsg3w287v33qb")))) - (arguments - '(#:tests? #f - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-app-name - (lambda _ - (substitute* (find-files "src/translations" - "\\.desktop.yaml") - (("LXQt File Archiver") - "File Archiver")) #t))))))) - -(define-public px-image-viewer - (package - (inherit qimgv) - (name "px-image-viewer") - (arguments - '(#:tests? #f - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-menu-item - (lambda _ - (substitute* '("qimgv/distrib/qimgv.desktop") - (("Name=qimgv") - "Name=Pictures")) #t))))))) - -(define-public px-terminal - (package - (inherit qterminal) - (name "px-terminal") - (arguments - '(#:tests? #f - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-menu-item - (lambda _ - (substitute* (find-files "src/translations" - "\\.desktop.yaml") - (("QTerminal") - "Terminal")) - (substitute* (find-files "src/translations" - "\\.desktop.yaml") - (("Qterminal") - "Terminal")) - (substitute* '("CMakeLists.txt") - (("qterminal-drop.desktop.in") - "")) #t))))))) - (define-public qlipper (package (name "qlipper") diff --git a/px/packages/desktop.scm b/px/packages/desktop.scm index 4427018..9c2bc1a 100644 --- a/px/packages/desktop.scm +++ b/px/packages/desktop.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages libreoffice) #:use-module (gnu packages lxde) #:use-module (gnu packages lxqt) + #:use-module (gnu packages music) #:use-module (gnu packages mail) #:use-module (gnu packages maths) #:use-module (gnu packages openbox) @@ -51,15 +52,15 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages pdf) #:use-module (gnu packages syncthing) - #:use-module (gnu packages xdisorg) ;copyq + #: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) ;px-backup - #:use-module (px packages common) ;capnproto - #:use-module (px packages contacts-calendar) ;px-contacts - #:use-module (px packages desktop-tools) ;px-about + #:use-module (px packages backup) + #:use-module (px packages common) + #:use-module (px packages contacts-calendar) + #:use-module (px packages desktop-tools) #:use-module (px packages document) #:use-module (px packages hub) #:use-module (px packages kde-frameworks) @@ -78,7 +79,7 @@ #:use-module (px packages backup) #:use-module (px packages user-services) #:use-module (px packages wiki) - #:use-module (px packages device) ;px-remote-access + #:use-module (px packages device) #:use-module (px packages time-tracking) #:use-module (srfi srfi-1) #:export (%common-desktop-applications @@ -127,28 +128,23 @@ (substitute* "config/pcmanfm-qt/lxqt/settings.conf.in" (("Wallpaper=.*") (string-append "Wallpaper=" wallpaper "\n"))) - (substitute* (find-files "pcmanfm/translations" - "\\.desktop.yaml") - (("PCManFM-Qt File Manager") - "File Manager")) (substitute* '("config/pcmanfm-qt/lxqt/settings.conf.in") (("WallpaperMode=stretch") "WallpaperMode=zoom") - ;; Patch FONT + ;; Patch default font (("Font=\"Sans Serif,10,-1,5,50,0,0,0,0,0\"") "Font=\"IBM Plex Sans,10,-1,5,50,0,0,0,0,0,Regular\"") - ;; Patch DEFAULT APPLICATIONS + ;; Patch default applications (("TerminalDirCommand=xterm") "TerminalDirCommand=qterminal") (("TerminalExecCommand=xterm") "TerminalExecCommand=qterminal") - ;; Patch TUMBNAILS + ;; Patch thumbnail size (("MaxThumbnailFileSize=4096") - "MaxThumbnailFileSize=30720")) - (substitute* '("config/CMakeLists.txt") - (("\\$\\{CMAKE_INSTALL_DATADIR\\}") - "etc/xdg"))))))))) + "MaxThumbnailFileSize=30720"))))))))) (inputs (list libfm-qt qtbase-5 qtx11extras px-lxqt-themes)) + (native-inputs + (list pkg-config qttools-5 lxqt-build-tools)) (propagated-inputs `(("atril-thumbnailer" ,atril-thumbnailer) ("ffmpegthumbnailer" ,ffmpegthumbnailer) ("freetype" ,freetype) @@ -192,15 +188,12 @@ ;; ("libqtxdg" ,libqtxdg) ;; Apply default wallpaper and so on to pcmanfm-qt: ("px-file-manager" ,px-file-manager) - ;; Rename QTerminal to Terminal: - ("px-terminal" ,px-terminal) - ("px-icons" ,px-icons) - ("px-lxqt-themes" ,px-lxqt-themes) + ;; ("px-icons" ,px-icons) + ;; ("px-lxqt-themes" ,px-lxqt-themes) ;; "lxqt-panel" ,@(fold alist-delete (package-propagated-inputs lxqt) - '("lximage-qt" "pcmanfm-qt" "qterminal" - "lxqt-themes" "breeze-icons")))))) + '("lximage-qt" "pcmanfm-qt")))))) ;; ;; Desktop Configuration @@ -265,8 +258,9 @@ ("tar" ,tar) ("gzip" ,compression:gzip))) (propagated-inputs `(("albert-launcher" ,albert-launcher) - ("px-widget-style" ,px-widget-style) - ("px-icons" ,px-icons) + ;;("px-widget-style" ,px-widget-style) replaced with default 'breeze' + ("breeze", breeze) + ("px-icons" ,px-icons) ("px-first-login-welcome-screen" ,px-first-login-welcome-screen) ("px-openbox-theme" ,px-openbox-theme) ("copyq" ,copyq))) @@ -284,8 +278,8 @@ ;; px-contacts ;; px-backup ;; px-hub-gui - px-software - px-software-assets-meta + ; px-software + ; px-software-assets-meta ;; Browser firefox @@ -297,19 +291,16 @@ libreoffice aspell aspell-dict-en - aspell-dict-de ;:) + aspell-dict-de aspell-dict-uk ;; Look and Feel - paper-icon-theme - sddm-darkine-theme px-sddm-theme xcursor-themes gnome-themes-standard font-liberation font-adobe-source-sans-pro font-adobe-source-code-pro - breeze-gtk font-cns11643-swjz ;? font-wqy-zenhei ;? font-ibm-plex @@ -320,7 +311,6 @@ ;; lxqt-arc-dark-theme ;; Utils - albert-launcher ;; Userspace virtual file system for GIO gvfs print-manager @@ -363,6 +353,12 @@ (define %qt-desktop-applications (list + ;; Primarily for LXQt + paper-icon-theme + sddm-darkine-theme + breeze-gtk + + ;; Includes syncthingtray (QT) px-user-services @@ -370,16 +366,16 @@ px-first-login-welcome-screen px-desktop-wiki px-about - px-file-archiver + lxqt-archiver px-settings-ui ;; Office speedcrunch ;; Multimedia - px-image-viewer - px-music-player - px-video-player + qimgv + strawberry + mpv ;; Connectivity ;; This package contains a systray applet for NetworkManager @@ -393,6 +389,8 @@ pinentry-qt lxmenu-data + albert-launcher + ;; PGP kleopatra diff --git a/px/packages/multimedia.scm b/px/packages/multimedia.scm deleted file mode 100644 index 307ceda..0000000 --- a/px/packages/multimedia.scm +++ /dev/null @@ -1,34 +0,0 @@ -(define-module (px packages multimedia) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages music) - #:use-module (gnu packages video)) - -(define-public px-music-player - (package - (inherit strawberry) - (name "px-music-player") - (arguments - (substitute-keyword-arguments (package-arguments strawberry) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'patch-app-name - (lambda _ - (substitute* '("dist/unix/org.strawberrymusicplayer.strawberry.desktop") - (("Name=Strawberry\n") - "Name=Music\n")) #t)))))))) - -(define-public px-video-player - (package - (inherit mpv) - (name "px-video-player") - (arguments - (substitute-keyword-arguments (package-arguments mpv) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "etc/mpv.desktop" - (("mpv Media Player") - "Px Video Player")))))))))) - diff --git a/px/packages/themes.scm b/px/packages/themes.scm index f3c889d..465336a 100644 --- a/px/packages/themes.scm +++ b/px/packages/themes.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages web)) +;; TODO: DROP IF OBSOLETE (define-public px-widget-style (package (name "px-widget-style") @@ -261,6 +262,7 @@ (description "Paper is an open source FreeDesktop icon project") (license license:expat))) +;; TODO: DROP IF OBSOLETE (define-public px-lxqt-themes (package (name "px-lxqt-themes") |