desktop-applications: differentiate more qt and gtk apps

3 files changed, 141 insertions, 84 deletions

diff --git a/px/packages/desktop-tools.scm b/px/packages/desktop-tools.scm
index e534c0f..b5ab50a 100644
--- a/px/packages/desktop-tools.scm
+++ b/px/packages/desktop-tools.scm
@@ -212,21 +212,6 @@
     (description "Lightweight and cross-platform clipboard history applet.")
     (license license:gpl2+)))
 
-
-(define-public px-network-manager-applet
-  (package
-   (inherit network-manager-applet)
-   (name "px-network-manager-applet")
-   (arguments
-    (substitute-keyword-arguments (package-arguments network-manager-applet)
-      ((#:phases phases)
-       `(modify-phases ,phases
-          (add-after 'unpack 'patch-menu-item
-            (lambda _
-              (substitute* '("nm-connection-editor.desktop.in")
-                           (("Name=Advanced Network Configuration") "Name=Network"))
-              #t))))))))
-
 (define-public cpputilities
   (package
     (name "cpputilities")
diff --git a/px/packages/desktop.scm b/px/packages/desktop.scm
index a907126..b873cf5 100644
--- a/px/packages/desktop.scm
+++ b/px/packages/desktop.scm
@@ -282,13 +282,11 @@
 ;;
 
 (define %common-desktop-applications
-  (list ; px-backup
+  (list ;; Default applications and so on...
         ; px-contacts
-        px-first-login-welcome-screen
-        ;; Default applications and so on...
-        px-desktop-wiki
-        px-software
+        ; px-backup
         ; px-hub-gui
+        px-software
         px-software-assets-meta
         
         ;; Browser
@@ -299,7 +297,6 @@
 
         ;; Office
         libreoffice
-        speedcrunch
         aspell
         aspell-dict-en
         aspell-dict-de ;; :)
@@ -324,22 +321,14 @@
         ;; WIP
         ;; lxqt-arc-dark-theme
 
-        ;; Multimedia
-        px-image-viewer
-        px-music-player
-        px-video-player
-
         ;; Utils
         albert-launcher
         ;; Userspace virtual file system for GIO
         gvfs
-        lxmenu-data
-        flameshot
-        pinentry-qt
         print-manager
-        ;; CLipboard manager
-        copyq
+
         ;; PGP
+        ;; Does not work on Gnome wayland
         kleopatra
 
         ;; U2F
@@ -364,62 +353,91 @@
         gnome-keyring
         ;; seahorse
 
-        px-user-services
-
         ;; Bluetooth
-        blueman
-
-        ;; Account Service Plugins
-	      ;; px-accounts-service-plugin-etesync  ;; TODO: uncomment whenever we had a working package for `px-contact-calendar`
-	      ; px-accounts-service-plugin-activity-watch
-        ; px-accounts-service-plugin-claws-mail
-        ; px-accounts-service-plugin-github
-        ; px-accounts-service-plugin-gitlab
-        ; px-accounts-service-plugin-oauth2-github
-        ; px-accounts-service-plugin-oauth2-mastodon
-        ; px-accounts-service-plugin-oauth2-google
-        ; px-accounts-service-providers-mail
-        ; px-accounts-service-plugin-imap
-        ; px-accounts-service-plugin-maestral
-        ; px-accounts-service-plugin-smtp
-        ; px-accounts-service-plugin-carddav
-        ; px-accounts-service-plugin-s3
-        ; px-accounts-service-plugin-backup-local
-        ; px-accounts-service-plugin-etherscan
-        ; px-accounts-service-plugin-blockio
-        ; px-accounts-service-plugin-cryptocurrency
-        ; px-accounts-service-plugin-discourse
-
-        ;; Hub Service Plugins
-        ;; px-hub-service-plugin-claws-mail
-        ; px-hub-service-plugin-github
-        ; px-hub-service-plugin-gitlab
-        ; px-hub-service-plugin-discourse
-        ; px-hub-service-plugin-mastodon
-
-        ;; Time Tracking Plugins
-        ; px-time-tracking-plugin-gitlab
-
-        ;; Settings Service Plugins
-        ; px-settings-service-plugin-accounts
-        px-settings-service-plugin-backup
-        px-settings-service-plugin-desktop-search
-        px-settings-service-plugin-maintenance
-        px-settings-service-plugin-software
-        px-settings-service-plugin-theme
-        px-settings-service-plugin-theme-dark-bright))
+        blueman))
 
 (define %gtk-desktop-applications
-  (list ))
+  (list 
+
+      ;; Excludes syncthingtray
+      ;; Does not work on Gnome wayland
+      px-user-services-gtk
+      syncthing-gtk))
 
 (define %qt-desktop-applications
   (list
+      ;; Includes syncthingtray (QT)
+      px-user-services
+
+      ;; Default applications and so on...
+      px-first-login-welcome-screen
+      px-desktop-wiki
       px-about
       px-file-archiver
       px-settings-ui
-      px-network-manager-applet
+
+      ;; Office
+      speedcrunch
+
+      ;; Multimedia
+      px-image-viewer
+      px-music-player
+      px-video-player
+
+      ;; Connectivity
+      ;; This package contains a systray applet for NetworkManager
+      ;; Does not work on Gnome wayland
+      network-manager-applet
       featherpad
-      qpdfview))
+      qpdfview
+
+      ;; Utils
+      flameshot
+      pinentry-qt
+      lxmenu-data
+
+      ;; Clipboard manager
+      copyq
+
+      ;; Account Service Plugins
+      ;; px-accounts-service-plugin-etesync  ;; TODO: uncomment whenever we had a working package for `px-contact-calendar`
+      ; px-accounts-service-plugin-activity-watch
+      ; px-accounts-service-plugin-claws-mail
+      ; px-accounts-service-plugin-github
+      ; px-accounts-service-plugin-gitlab
+      ; px-accounts-service-plugin-oauth2-github
+      ; px-accounts-service-plugin-oauth2-mastodon
+      ; px-accounts-service-plugin-oauth2-google
+      ; px-accounts-service-providers-mail
+      ; px-accounts-service-plugin-imap
+      ; px-accounts-service-plugin-maestral
+      ; px-accounts-service-plugin-smtp
+      ; px-accounts-service-plugin-carddav
+      ; px-accounts-service-plugin-s3
+      ; px-accounts-service-plugin-backup-local
+      ; px-accounts-service-plugin-etherscan
+      ; px-accounts-service-plugin-blockio
+      ; px-accounts-service-plugin-cryptocurrency
+      ; px-accounts-service-plugin-discourse
+
+      ;; Hub Service Plugins
+      ;; px-hub-service-plugin-claws-mail
+      ; px-hub-service-plugin-github
+      ; px-hub-service-plugin-gitlab
+      ; px-hub-service-plugin-discourse
+      ; px-hub-service-plugin-mastodon
+
+      ;; Time Tracking Plugins
+      ; px-time-tracking-plugin-gitlab
+    
+      ;; Settings Service Plugins
+      ; px-settings-service-plugin-accounts
+      px-settings-service-plugin-backup
+      px-settings-service-plugin-desktop-search
+      px-settings-service-plugin-maintenance
+      px-settings-service-plugin-software
+      px-settings-service-plugin-theme
+      px-settings-service-plugin-theme-dark-bright))
 
 ; (define %pantherx-desktop-i3
 ;   (list i3-wm i3lock i3lock-fancy i3status
diff --git a/px/packages/user-services.scm b/px/packages/user-services.scm
index b903c3b..cf62f7f 100644
--- a/px/packages/user-services.scm
+++ b/px/packages/user-services.scm
@@ -60,14 +60,14 @@
        ("gzip" ,gzip)))
     (propagated-inputs
       `(
-        ; ("px-secret-service"   ,px-secret-service)
-        ; ("px-events-service"   ,px-events-service)
-        ; ("px-accounts-service" ,px-accounts-service)
+        ; ("px-secret-service"    ,px-secret-service)
+        ; ("px-events-service"    ,px-events-service)
+        ; ("px-accounts-service"  ,px-accounts-service)
         ; ("px-contacts-calendar" ,px-contacts-calendar)
-        ("px-settings-service" ,px-settings-service)
-        ; ("px-mastodon-service" ,px-mastodon-service)
-        ; ("px-hub-service"      ,px-hub-service)
-        ; ("px-time-tracking"  ,px-time-tracking)
+        ; ("px-settings-service"  ,px-settings-service)
+        ; ("px-mastodon-service"  ,px-mastodon-service)
+        ; ("px-hub-service"       ,px-hub-service)
+        ; ("px-time-tracking"     ,px-time-tracking)
         ("mcron" ,mcron)
       	("syncthing" ,syncthing)
 	      ("syncthingtray" ,syncthingtray)))
@@ -75,3 +75,57 @@
     (synopsis "PantherX user services execution package")
     (description "Run user-level services for PantherX desktop")
     (license license:expat)))
+
+(define-public px-user-services-gtk
+  (package
+    (name "px-user-services")
+    (version "2.0.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://source.pantherx.org/" name "_v" version ".tgz"))
+        (sha256
+          (base32 "0mrqdgcm7z20inf6qrq8agliidn13327gihjassqdlcr9k7fkq1y"))))
+    (build-system trivial-build-system)
+    (arguments
+      `(#:modules ((guix build utils))
+        #:builder 
+        (begin
+          (use-modules (guix build utils))
+	        (let* ((out (assoc-ref %outputs "out"))
+	               (src (assoc-ref %build-inputs "source")))
+	          (setenv "PATH"
+		          (string-append
+		            (assoc-ref %build-inputs "tar") "/bin" ":"
+		            (assoc-ref %build-inputs "gzip") "/bin" ":"))
+            (invoke "tar" "xvf" src)
+            (chdir ,name)
+	          (mkdir-p (string-append out "/etc/xdg/autostart"))
+	          (copy-recursively "etc/xdg/autostart"
+			                        (string-append out "/etc/xdg/autostart"))
+	          (mkdir-p (string-append out "/etc/px/services"))
+	          (copy-recursively "etc/px/services"
+			                        (string-append out "/etc/px/services"))
+	          (substitute* (string-append out "/etc/xdg/autostart/user-services.desktop")
+		          (("Exec=/etc/px/services/start.sh")
+			         (string-append "Exec=" out "/etc/px/services/start.sh")))
+            #t))))
+    (native-inputs
+     `(("tar" ,tar)
+       ("gzip" ,gzip)))
+    (propagated-inputs
+      `(
+        ; ("px-secret-service"    ,px-secret-service)
+        ; ("px-events-service"    ,px-events-service)
+        ; ("px-accounts-service"  ,px-accounts-service)
+        ; ("px-contacts-calendar" ,px-contacts-calendar)
+        ; ("px-settings-service"  ,px-settings-service)
+        ; ("px-mastodon-service"  ,px-mastodon-service)
+        ; ("px-hub-service"       ,px-hub-service)
+        ; ("px-time-tracking"     ,px-time-tracking)
+        ("mcron" ,mcron)
+      	("syncthing" ,syncthing)))
+    (home-page "https://www.pantherx.org/")
+    (synopsis "PantherX user services execution package")
+    (description "Run user-level services for PantherX desktop")
+    (license license:expat)))
\ No newline at end of file