diff options
| -rw-r--r-- | libqtxdg-update-pixmaps-path.patch | 60 | ||||
| -rw-r--r-- | manifest.txt | 76 | ||||
| -rw-r--r-- | px-file-manager-0001-update-config.patch | 15 | ||||
| -rw-r--r-- | px/packages/desktop-tools.scm | 13 | ||||
| -rw-r--r-- | px/packages/desktop.scm | 194 | ||||
| -rw-r--r-- | px/packages/development.scm | 37 | ||||
| -rw-r--r-- | px/packages/lxqt-dev.scm | 114 | ||||
| -rw-r--r-- | px/packages/pantherx-panel.scm | 43 | ||||
| -rw-r--r-- | px/services/base.scm | 17 | ||||
| -rw-r--r-- | px/services/databases.scm | 6 | ||||
| -rw-r--r-- | px/services/desktop.scm | 32 | ||||
| -rw-r--r-- | px/system/config.scm | 2 |
12 files changed, 23 insertions, 586 deletions
diff --git a/libqtxdg-update-pixmaps-path.patch b/libqtxdg-update-pixmaps-path.patch deleted file mode 100644 index 1ed7117..0000000 --- a/libqtxdg-update-pixmaps-path.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed38c3b..27b50f2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,7 +68,7 @@ message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt5Core_VERSION}") - if (QTXDG_INSTALL_DEFAPPS_CONFIG) - file(GLOB QTXDG_CONFIG_FILES config/*.conf) - set(QTXDG_DEFAPPS_CONF_INSTALL_DIR -- "${LXQT_ETC_XDG_DIR}" CACHE PATH "Path to qtxdg default apps conf files install dir") -+ "/etc/xdg" CACHE PATH "Path to qtxdg default apps conf files install dir") - mark_as_advanced(QTXDG_DEFAPPS_CONF_INSTALL_DIR) - endif() - -@@ -168,7 +168,7 @@ install(EXPORT - - if (QTXDG_INSTALL_DEFAPPS_CONFIG) - install(FILES ${QTXDG_CONFIG_FILES} -- DESTINATION "${QTXDG_DEFAPPS_CONF_INSTALL_DIR}" -+ DESTINATION "etc/xdg" - COMPONENT Runtime - ) - endif() -diff --git a/src/xdgiconloader/CMakeLists.txt b/src/xdgiconloader/CMakeLists.txt -index 1269bd7..cf7bdd0 100644 ---- a/src/xdgiconloader/CMakeLists.txt -+++ b/src/xdgiconloader/CMakeLists.txt -@@ -9,10 +9,12 @@ set(xdgiconloader_PRIVATE_H_FILES - - set(xdgiconloader_CPP_FILES - xdgiconloader.cpp -+ ../qtxdg/xdgdirs.cpp - ) - - set(xdgiconloader_PRIVATE_INSTALLABLE_H_FILES - xdgiconloader_p.h -+ ../qtxdg/xdgdirs.h - ) - - -diff --git a/src/xdgiconloader/xdgiconloader.cpp b/src/xdgiconloader/xdgiconloader.cpp -index 91515ca..41d5aa2 100644 ---- a/src/xdgiconloader/xdgiconloader.cpp -+++ b/src/xdgiconloader/xdgiconloader.cpp -@@ -56,6 +56,7 @@ - #include <QSvgRenderer> - - #include <private/qhexstring_p.h> -+#include "../qtxdg/xdgdirs.h" - - //QT_BEGIN_NAMESPACE - -@@ -574,7 +575,7 @@ QThemeIconInfo XdgIconLoader::loadIcon(const QString &name) const - const auto unthemedInfo = unthemedFallback(name, QIcon::themeSearchPaths()); - if (unthemedInfo.entries.isEmpty()) { - /* Freedesktop standard says to look in /usr/share/pixmaps last */ -- const QStringList pixmapPath = (QStringList() << QString::fromLatin1("/usr/share/pixmaps")); -+ const QStringList pixmapPath = XdgDirs::dataDirs(QString::fromLatin1("/pixmaps")); - const auto pixmapInfo = unthemedFallback(name, pixmapPath); - if (pixmapInfo.entries.isEmpty()) { - return QThemeIconInfo(); diff --git a/manifest.txt b/manifest.txt deleted file mode 100644 index c68b53c..0000000 --- a/manifest.txt +++ /dev/null @@ -1,76 +0,0 @@ -# Upstream Modified Packages -guix - -# Customer related softwares -# kyc - -# Drivers -xf86-video-intel - -# Libraries -mastodonpp -nanomsg -nng -python-pycapnp -qtbase-with-bundled-sqlite -qtbase@5 -# qtwebengine -acsccid -dlib - - -# Modified packages -openbox-modified - -# LXQt modified packages -# lxqt-session-modified ## bypass lxqt-session-modified build because of upstream package build issues with Qt 5.14.2 -px-file-manager -px-terminal - -# Look And Feel -px-openbox-theme -lxqt-arc-dark-theme -breeze -px-widget-style -px-icons -paper-icon-theme -sddm-darkine-theme - -# PantherX libraries -px-oauth2-engine - -# PantherX Services -px-accounts-service -px-accounts-service-plugin-oauth2-github -px-accounts-service-plugin-oauth2-google -px-accounts-service-plugin-oauth2-mastodon -px-events-service -px-hub-service -px-mastodon-service -px-org-remote-backup-service -px-secret-service -px-settings-service -px-settings-service-plugin-accounts -px-device-identity -px-device-identity-service -px-file-upload-cli - -# PantherX GUI Applications -px-settings-ui -px-software -pantherx-panel - -# Other Server Related Applications -gitlab-runner - -# Other Desktop Applications -px-file-archiver -px-image-viewer -px-music-player -px-video-player -cmst -falkon -featherpad -nheko -syncthingtray -kube diff --git a/px-file-manager-0001-update-config.patch b/px-file-manager-0001-update-config.patch deleted file mode 100644 index dacb821..0000000 --- a/px-file-manager-0001-update-config.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pcmanfm/settings.cpp b/pcmanfm/settings.cpp -index d8c2c4d..f8561e6 100644 ---- a/pcmanfm/settings.cpp -+++ b/pcmanfm/settings.cpp -@@ -206,8 +206,8 @@ bool Settings::loadFile(QString filePath) { - fallbackIconThemeName_ = QLatin1String("oxygen"); // fallback icon theme name - } - suCommand_ = settings.value(QStringLiteral("SuCommand"), QStringLiteral("lxqt-sudo %s")).toString(); -- setTerminal(settings.value(QStringLiteral("Terminal"), QStringLiteral("xterm")).toString()); -- setArchiver(settings.value(QStringLiteral("Archiver"), QStringLiteral("file-roller")).toString()); -+ setTerminal(settings.value(QStringLiteral("Terminal"), QStringLiteral("qterminal")).toString()); -+ setArchiver(settings.value(QStringLiteral("Archiver"), QStringLiteral("lxqt-archiver")).toString()); - setSiUnit(settings.value(QStringLiteral("SIUnit"), false).toBool()); - - setOnlyUserTemplates(settings.value(QStringLiteral("OnlyUserTemplates"), false).toBool()); diff --git a/px/packages/desktop-tools.scm b/px/packages/desktop-tools.scm index e9e423b..583d8c1 100644 --- a/px/packages/desktop-tools.scm +++ b/px/packages/desktop-tools.scm @@ -350,16 +350,3 @@ brand icons for easy, scalable vector graphics on websites and beyond.") (description "Qt-based tray application") (license license:gpl2+))) -(define-public px-about - (package - (inherit lxqt-about) - (name "px-about") - (version "1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://source.pantherx.org/" name "_" version - ".tgz")) - (sha256 - (base32 "12cnydcw8rhbwh21j8ayj2x47nvr5zicnqfp6r13dapy1nss5rd4")))))) - diff --git a/px/packages/desktop.scm b/px/packages/desktop.scm index e0af64a..e9fe6d8 100644 --- a/px/packages/desktop.scm +++ b/px/packages/desktop.scm @@ -65,10 +65,8 @@ #:use-module (px packages hub) #:use-module (px packages kde-frameworks) #:use-module (px packages library) - #:use-module (px packages lxqt-dev) #:use-module (px packages matrix-client) #:use-module (px packages package-management) - #:use-module (px packages pantherx-panel) #:use-module (px packages px-themes) #:use-module (px packages settings) #:use-module (px packages setup) @@ -83,72 +81,8 @@ #:use-module (srfi srfi-1) #:export (%common-desktop-applications %gtk-desktop-applications - %qt-desktop-applications + %qt-desktop-applications)) - lxqt-modified - ;; TODO: This should probably go into px/services/desktop - px-desktop-defaults)) - -;; Currently only lxqt-modified -(define-public openbox-modified - (package - (inherit openbox) - (name "openbox-modified") - (arguments - (list - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'force-reconfigure - ;; This is made necessary by the openbox-python3 patch. - (lambda _ - (delete-file "configure"))) - (add-after 'unpack 'patch-config-file - (lambda _ - (substitute* "data/rc.xml" - (("Clearlooks") - "Arc-Dark"))))))))) - -;; Currently only lxqt-modified -(define-public px-file-manager - (package - (inherit pcmanfm-qt) - (name "px-file-manager") - (source - (origin - (inherit (package-source pcmanfm-qt)) - (patches (search-patches "px-file-manager-0001-update-config.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments pcmanfm-qt) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'configure 'patch-settings.conf.in - (lambda* (#:key inputs #:allow-other-keys) - (let ((wallpaper (search-input-file inputs - "share/lxqt/wallpapers/pantherx.jpg"))) - (substitute* "config/pcmanfm-qt/lxqt/settings.conf.in" - (("Wallpaper=.*") - (string-append "Wallpaper=" wallpaper "\n"))) - (substitute* '("config/pcmanfm-qt/lxqt/settings.conf.in") - (("WallpaperMode=stretch") - "WallpaperMode=zoom") - ;; 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 - (("TerminalDirCommand=xterm") - "TerminalDirCommand=qterminal") - (("TerminalExecCommand=xterm") - "TerminalExecCommand=qterminal") - ;; Patch thumbnail size - (("MaxThumbnailFileSize=4096") - "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) - ("libgsf" ,libgsf) - ("tumbler" ,tumbler))))) (define-public px-terminal-launcher (package @@ -175,110 +109,17 @@ (description "PantherX Terminal Launcher") (license license:expat))) -(define-public lxqt-modified - (package - (inherit lxqt) - (name "lxqt-modified") - (propagated-inputs `(;; Apply Arc-Dark to openbox: - ("openbox-modified" ,openbox-modified) - ;; Apply modified menu and others to lxqt-panel: - ;; TODO: FIX and restore - ;; ("pantherx-panel" ,pantherx-panel) - ;; ("libqtxdg" ,libqtxdg) - ;; Apply default wallpaper and so on to pcmanfm-qt: - ("px-file-manager" ,px-file-manager) - ;; ("px-icons" ,px-icons) - ;; ("px-lxqt-themes" ,px-lxqt-themes) - ;; "lxqt-panel" - ,@(fold alist-delete - (package-propagated-inputs lxqt) - '("lximage-qt" "pcmanfm-qt")))))) - -;; -;; Desktop Configuration -;; - -;; This goes straight into px/services/desktop (only LXQt) -(define-public px-desktop-defaults - (package - (name "px-desktop-defaults") - (version "0.0.47") - (source - (origin - (method url-fetch) - (uri (string-append "https://source.pantherx.org/px-desktop-defaults_" - version ".tgz")) - (sha256 - (base32 "1y9wp2d35nrf72bkiv39k17paa6arxp2hpz2102mymj61zb96fvk")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (mkdir %output) - (setenv "PATH" - (string-append (assoc-ref %build-inputs "coreutils") - "/bin" - ":" - (assoc-ref %build-inputs "tar") - "/bin" - ":" - (assoc-ref %build-inputs "gzip") - "/bin")) - (invoke "tar" "zxvf" - (assoc-ref %build-inputs "source")) - ;; (chdir (string-append (string-capitalize ,name) "-" ,version)) - ;; (display (string-append ,name "_" ,version)) - ;; (chdir (string-append ,name "_" ,version)) - (let ((source (assoc-ref %build-inputs "source")) - (albert (assoc-ref %build-inputs "albert-launcher")) - (copyq (assoc-ref %build-inputs "copyq")) - (px-first-login-welcome-screen (assoc-ref - %build-inputs - "px-first-login-welcome-screen")) - (out (assoc-ref %outputs "out"))) - (chdir ,name) - (substitute* '("etc/xdg/autostart/lxqt-copyq-autostart.desktop") - (("Exec=copyq") - (string-append "Exec=" copyq "/bin/copyq"))) - (substitute* '("etc/xdg/autostart/albert.desktop") - (("Exec=albert") - (string-append "Exec=" albert "/bin/albert"))) - (substitute* '("etc/xdg/autostart/px-first-login-welcome-screen.desktop") - (("Exec=px-first-login-welcome-screen") - (string-append "Exec=" px-first-login-welcome-screen - "/bin/px-first-login-welcome-screen"))) - (copy-recursively "." %output) - (chmod (string-append %output - "/etc/px-desktop/scripts/lxqt-switch-desktop.sh") - #o755) - #t)))) - (native-inputs `(("coreutils" ,coreutils) - ("tar" ,tar) - ("gzip" ,compression:gzip))) - (propagated-inputs `(("albert-launcher" ,albert-launcher) - ;;("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))) - (home-page "https://www.pantherx.org/") - (synopsis "PantherX Default Configuration Package") - (description "Default Configurations for PantherX Desktop") - (license license:expat))) - ;; ;; PantherX OS Desktop default Applications and Services ;; (define %common-desktop-applications - (list ;Default applications and so on... + (list ;; Default applications and so on... ;; px-contacts ;; px-backup ;; px-hub-gui - ; px-software - ; px-software-assets-meta + ;; px-software + ;; px-software-assets-meta ;; Browser firefox @@ -294,7 +135,7 @@ aspell-dict-uk ;; Look and Feel - px-sddm-theme + px-sddm-theme ;; Login theme xcursor-themes gnome-themes-standard font-liberation @@ -344,7 +185,7 @@ ;; Excludes syncthingtray ;; Does not work on Gnome wayland - px-user-services-gtk + ;; px-user-services-gtk syncthing-gtk ;; PGP @@ -359,14 +200,13 @@ ;; Includes syncthingtray (QT) - px-user-services + ;; px-user-services ;; Default applications and so on... - px-first-login-welcome-screen - px-desktop-wiki - px-about + ;; px-first-login-welcome-screen + ;; px-desktop-wiki lxqt-archiver - px-settings-ui + ;; px-settings-ui ;; Office speedcrunch @@ -394,7 +234,7 @@ kleopatra ;; Clipboard manager - copyq + copyq)) ;; Account Service Plugins ;; px-accounts-service-plugin-etesync ;; TODO: uncomment whenever we had a working package for `px-contact-calendar` @@ -429,12 +269,12 @@ ;; 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)) + ;; 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/development.scm b/px/packages/development.scm deleted file mode 100644 index 02f355a..0000000 --- a/px/packages/development.scm +++ /dev/null @@ -1,37 +0,0 @@ -;;; Development Packages Module for PantherX -;;; Hamzeh Nasajpour (h.nasajpour@pantherx.org) - -(define-module (px packages development) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system cmake) - #:use-module (guix utils) - #:use-module (gnu packages guile-xyz) - #:use-module (gnu packages version-control) - #:use-module (gnu packages serialization) - #:use-module (gnu packages databases) - #:use-module (px packages library)) - -(define-public px-dev-environments - (package - (name "px-dev-environments") - (version "v0.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://source.pantherx.org/px-dev-environments_" - version ".tgz")) - (sha256 - (base32 "0nspkyb67x3m6l2xgig4i4xbkyx6spsmwvw5vcy56ylh4d2px9jx")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) - (inputs `(("libgit2" ,libgit2))) - (propagated-inputs `(("recutils" ,recutils))) - (home-page "https://www.pantherx.org/") - (synopsis "PantherX Setup Assistant") - (description - "This package provides command line application for creating development environments.") - (license license:expat))) diff --git a/px/packages/lxqt-dev.scm b/px/packages/lxqt-dev.scm deleted file mode 100644 index bab04e2..0000000 --- a/px/packages/lxqt-dev.scm +++ /dev/null @@ -1,114 +0,0 @@ -(define-module (px packages lxqt-dev) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) - #:use-module (gnu packages) - #:use-module (gnu packages admin) - #:use-module (gnu packages base) - #:use-module (gnu packages compression) - #:use-module (gnu packages documentation) - #:use-module (gnu packages compton) - #:use-module (gnu packages fonts) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages glib) - #:use-module (gnu packages gnome) - #:use-module (gnu packages gtk) - #:use-module (gnu packages image) - #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages kde-plasma) - #:use-module (gnu packages linux) - #:use-module (gnu packages lxqt) - #:use-module (gnu packages perl) - #:use-module (gnu packages lxde) - #:use-module (gnu packages lxqt) - #:use-module (gnu packages maths) - #:use-module (gnu packages openbox) - #:use-module (gnu packages pcre) - #:use-module (gnu packages perl) - #:use-module (gnu packages photo) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages polkit) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages qt) - #:use-module (gnu packages textutils) - #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (px packages themes) - #:use-module (srfi srfi-1)) - -(define-public lxqt-config-dev - (let ((rep_name "lxqt-config") - (commit "5365be813f9c43e8fa6ed6a42f30744cf043980a") - (revision "0")) - (package - (inherit lxqt-config) - (name "lxqt-config-dev") - (version (git-version "1.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/lxqt/" rep_name ".git")) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1wx186nq7hihywm7dn3w4p31zyplg3kr11aav4maivv14dw9k17k")))) - (inputs `(("eudev" ,eudev) - ("kwindowsystem" ,kwindowsystem) - ("libkscreen" ,libkscreen) - ("liblxqt" ,liblxqt) - ("libqtxdg" ,libqtxdg) - ("libxcursor" ,libxcursor) - ("libxi" ,libxi) - ("perl" ,perl) - ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) - ("solid" ,solid) - ("xf86-input-libinput" ,xf86-input-libinput) - ("xkeyboard-config" ,xkeyboard-config) - ("zlib" ,zlib))) - (native-inputs (list pkg-config lxqt-build-tools qttools-5)) - (propagated-inputs `(;; temporary workaround for lxqt-config-monitor segmentation fault - - ;; more in https://git.pantherx.org/development/guix-pantherx/-/issues/67 - ("libkscreen" ,libkscreen) - ("setxkbmap" ,setxkbmap))) - (arguments - '(#:tests? #f ;no tests - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("src/translations/lxqt-config.desktop.yaml") - (("LXQt Configuration Center") - "All Settings")) - (substitute* '("src/lxqt-config.menu") - (("<Name>System settings</Name>") - (string-append "<Name>PantherX settings</Name>" - " - <Directory>lxqt-settings-pantherx.directory</Directory>" - "\n\t<Include>" - "\n\t\t<And>" - "\n\t\t\t<Category>Settings</Category>" - "\n\t\t\t<Category>PantherX</Category>" - "\n\t\t</And>" - "\n\t</Include>" - "\n</Menu>" - "\n\n<Menu>" - "\n\t<Name>System settings</Name>"))) #t)) - (add-after 'unpack 'set-xkeyboard-config-file-name - (lambda* (#:key inputs #:allow-other-keys) - ;; Set the file name to xkeyboard-config. - (let ((xkb (assoc-ref inputs "xkeyboard-config"))) - (substitute* "lxqt-config-input/keyboardlayoutconfig.h" - (("/usr/share/X11/xkb/rules/base.lst") - (string-append xkb - "/share/X11/xkb/rules/base.lst"))) - #t))))))))) diff --git a/px/packages/pantherx-panel.scm b/px/packages/pantherx-panel.scm deleted file mode 100644 index 38d3cc9..0000000 --- a/px/packages/pantherx-panel.scm +++ /dev/null @@ -1,43 +0,0 @@ -;;; Settings Packages Module for PantherX -;;; Hamzeh Nasajpour (h.nasajpour@pantherx.org) - -(define-module (px packages pantherx-panel) - #:use-module ((guix licenses) - #:prefix license:) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system cmake) - #:use-module (guix utils) - #:use-module (gnu packages serialization) - #:use-module (gnu packages xorg) - #:use-module (px packages common) - #:use-module (gnu packages compression) - #:use-module (gnu packages lxqt) - #:use-module (gnu packages web) - #:use-module (px packages inspection) - #:use-module (px packages desktop-tools) - #:use-module (px packages networking)) - -(define-public pantherx-panel - (package - (inherit lxqt-panel) - (name "pantherx-panel") - (version "1.3.0-u1") - (source - (origin - (method url-fetch) - (uri (string-append "https://source.pantherx.org/lxqt-panel_" version - ".tgz")) - (sha256 - (base32 "149k9s47wvb9v49b4hzsz2g1yrisr03n4pbr9ignm5s2j5z8z9if")))) - (build-system cmake-build-system) - (inputs `(("zlib" ,zlib) - ("nng" ,nng-1.5) - ("rapidjson" ,rapidjson) - ("capnproto" ,capnproto-0.9) - ,@(package-inputs lxqt-panel))) - (native-inputs `(("nng" ,nng-1.5) - ,@(package-native-inputs lxqt-panel))) - (propagated-inputs `(("px-network-inspection" ,px-network-inspection) - ("px-recoll" ,px-recoll) - ,@(package-propagated-inputs lxqt-panel))))) diff --git a/px/services/base.scm b/px/services/base.scm index 4715cf2..b7b732c 100644 --- a/px/services/base.scm +++ b/px/services/base.scm @@ -44,9 +44,7 @@ %px-core-arm-services %px-gui-arm-services - %px-desktop-arm-services) - - #:re-export (px-desktop-service-type)) + %px-desktop-arm-services)) ;;; ;;; @@ -75,10 +73,10 @@ ;;; (define %px-desktop-ee-services + ;; TODO: Does not include default desktop (append (list (service px-device-identity-service-type) - (service px-user-identity-service-type) - ;; Desktop - (service px-desktop-service-type)) %px-desktop-services-base)) + (service px-user-identity-service-type)) + %px-desktop-services-base)) ;;; ;;; SERVER @@ -145,12 +143,9 @@ %px-core-arm-services)) (define %px-desktop-arm-services + ;; TODO: Does not include default desktop (append (list (service dhcp-client-service-type) (service sddm-service-type - (sddm-configuration (minimum-uid 1000) - (theme "px-sddm-theme"))) - (service px-desktop-service-type - (px-desktop-configuration (lxqt lxqt-modified) - (default-packages '())))) + (sddm-configuration (minimum-uid 1000)))) (modify-services %desktop-services (delete network-manager-service-type)))) diff --git a/px/services/databases.scm b/px/services/databases.scm index 6cf459e..85107a0 100644 --- a/px/services/databases.scm +++ b/px/services/databases.scm @@ -115,9 +115,3 @@ storage: (const %mongodb-accounts)))) (default-value (mongodb-configuration)))) -(use-modules (gnu system) - (gnu bootloader) - (gnu bootloader grub) - (gnu system file-systems) - (px system config)) - diff --git a/px/services/desktop.scm b/px/services/desktop.scm index cc8f9b6..a97cfb0 100644 --- a/px/services/desktop.scm +++ b/px/services/desktop.scm @@ -38,7 +38,6 @@ #:use-module (ice-9 match) #:export (px-desktop-configuration px-desktop-configuration? - px-desktop-service-type polkit-network-manager-service polkit-elogind-service @@ -48,37 +47,6 @@ %px-desktop-services-base)) ;; -;; PantherX desktop service type -;; - -(define-record-type* <px-desktop-configuration> px-desktop-configuration - make-px-desktop-configuration - px-desktop-configuration? - (lxqt px-config-package - (default lxqt-modified)) - (default-packages px-config-default-packages - (default (list px-desktop-defaults)))) - -(define (px-desktop-polkit-settings config) - "Return the list of LXQt dependencies that provide polkit actions and -rules." - (list lxqt-admin)) - -(define px-desktop-profile-packages - (lambda (config) - (append (list (px-config-package config)) - (px-config-default-packages config)))) - -(define px-desktop-service-type - (service-type (name 'px-desktop) - (extensions (list (service-extension polkit-service-type - px-desktop-polkit-settings) - (service-extension profile-service-type - px-desktop-profile-packages))) - (default-value (px-desktop-configuration)) - (description "Run LXQt desktop environment on PantherX."))) - -;; ;; allow netdev group to control network manger ;; diff --git a/px/system/config.scm b/px/system/config.scm index dfa8799..e972926 100644 --- a/px/system/config.scm +++ b/px/system/config.scm @@ -41,8 +41,6 @@ ;; Re-export for convenience #:re-export (%px-core-services - px-desktop-service-type - %px-desktop-services %px-desktop-ee-services |