diff options
Diffstat (limited to 'px')
| -rw-r--r-- | px/packages/base.scm | 49 | ||||
| -rw-r--r-- | px/services/base.scm | 58 | ||||
| -rw-r--r-- | px/system/config.scm | 8 |
3 files changed, 15 insertions, 100 deletions
diff --git a/px/packages/base.scm b/px/packages/base.scm index d6b3f52..6be77cc 100644 --- a/px/packages/base.scm +++ b/px/packages/base.scm @@ -31,22 +31,19 @@ %px-desktop-packages %px-desktop-ee-packages %px-server-packages - %px-server-ee-packages - %px-core-arm-packages - %px-gui-arm-packages - %px-desktop-arm-packages)) + %px-server-ee-packages)) ;;; ;;; CORE ;;; (define %px-core-packages - (append (list px ;User and system updates - ;; px-setup-assistant ;; System installation + (append (list px gnutls - nss-certs ;TLS library and NNS certificates - libimobiledevice ;iPhone tethering - screen) %base-packages)) + nss-certs + libimobiledevice + screen) + %base-packages)) ;;; ;;; DESKTOP @@ -55,7 +52,7 @@ ;; Stuff for every desktop; QT / GTK on X / Wayland (define %px-desktop-core-packages (append %common-desktop-applications - %px-core-packages)) + %px-core-packages)) ;; GTK-specific (define %px-desktop-packages-gtk @@ -76,38 +73,16 @@ (define %px-desktop-ee-packages (append (list px-device-identity px-org-remote-user-activity-service) - %px-desktop-packages)) + %px-desktop-packages)) ;;; ;;; SERVER ;;; (define %px-server-packages - (append (list) %px-core-packages)) + (append (list) + %px-core-packages)) (define %px-server-ee-packages - (append (list px-device-identity) %px-server-packages)) - -;;; -;;; ARM-SPECIFIC -;;; - -(define %px-core-arm-packages - (append (list cloud-utils ;disk utilities - gnutls - nss-certs - curl ;networking - ;; evtest ;; hardware status - %base-packages))) - -(define %px-gui-arm-packages - (append (list openbox ;window manager - libnotify - dunst - dbus ;desktop notifications - xterm - xdg-utils - %px-core-arm-packages))) - -(define %px-desktop-arm-packages - (append (list px-sddm-theme) %base-packages)) + (append (list px-device-identity) + %px-server-packages)) diff --git a/px/services/base.scm b/px/services/base.scm index fe0716e..8026c47 100644 --- a/px/services/base.scm +++ b/px/services/base.scm @@ -38,11 +38,7 @@ %px-desktop-ee-services %px-server-services - %px-server-ee-services - - %px-core-arm-services - %px-gui-arm-services - %px-desktop-arm-services)) + %px-server-ee-services)) ;;; ;;; @@ -98,54 +94,4 @@ (service dhcp-client-service-type)) %base-services)) (define %px-server-ee-services - (append (list (service px-device-identity-service-type)) %px-server-services)) - -;;; -;;; ARM-SPECIFIC -;;; - -(define %px-core-arm-services - (cons* - ;; networking - (service wpa-supplicant-service-type) - (service network-manager-service-type) - (service modem-manager-service-type) - (service usb-modeswitch-service-type) - (service ntp-service-type) - - ;; remote access - (service openssh-service-type - (openssh-configuration (x11-forwarding? #t) - (permit-root-login #t))) - - %base-services)) - -(define %px-gui-arm-services - (cons* (service slim-service-type - (slim-configuration (vt "vt7") - (auto-login? #t) - (auto-login-session (file-append openbox - "/bin/openbox-session")) - (default-user "default"))) - (service avahi-service-type) - (service udisks-service-type) - (service upower-service-type) - (service accountsservice-service-type) - (service polkit-service-type) - (service elogind-service-type) - (service dbus-root-service-type) - polkit-wheel-service - polkit-network-manager-service ;control network without sudo - polkit-elogind-service ;reboot without sudo - - (service pulseaudio-service-type) - (service alsa-service-type) - %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)))) - (modify-services %desktop-services-assembly - (delete network-manager-service-type)))) + (append (list (service px-device-identity-service-type)) %px-server-services))
\ No newline at end of file diff --git a/px/system/config.scm b/px/system/config.scm index 3d95889..e2c2f30 100644 --- a/px/system/config.scm +++ b/px/system/config.scm @@ -43,10 +43,6 @@ %px-server-services %px-server-ee-services - %px-core-arm-services - %px-gui-arm-services - %px-desktop-arm-services - %px-core-packages %px-desktop-core-packages @@ -56,9 +52,7 @@ %px-desktop-ee-packages %px-server-packages - %px-server-ee-packages - %px-core-arm-packages - %px-gui-arm-packages)) + %px-server-ee-packages)) ;;; ;;; PantherX Desktop OS defintions |