From e795b1b3ce51af8161899a4fff7da7a3899cde8e Mon Sep 17 00:00:00 2001 From: SoulHarsh007 Date: Tue, 14 Nov 2023 00:24:16 +0530 Subject: [PATCH] remove(config): enlightenment desktop environment Signed-off-by: SoulHarsh007 --- etc/calamares/modules/packagechooser_DE.conf | 159 +------------------ etc/calamares/post_install/post_install.py | 31 +--- etc/calamares/post_install/post_install.yaml | 26 +-- 3 files changed, 15 insertions(+), 201 deletions(-) diff --git a/etc/calamares/modules/packagechooser_DE.conf b/etc/calamares/modules/packagechooser_DE.conf index e47ec73..f76b3d0 100644 --- a/etc/calamares/modules/packagechooser_DE.conf +++ b/etc/calamares/modules/packagechooser_DE.conf @@ -302,7 +302,7 @@ items: - name: plasma-workspace-wallpapers description: Additional wallpapers for the Plasma Workspace - name: powerdevil - description: Manages the power consumption settings of a Plasma Shell + description: Manages the power consumption settings of a Plasma Shell - name: kde-applications description: The full set of KDE Applications selected: false @@ -1276,7 +1276,7 @@ items: - name: qt5ct description: Qt5 Configuration Utility - name: qt6ct - description: Qt6 Configuration Utility + description: Qt6 Configuration Utility - name: Exhaustive selected: false critical: false @@ -2090,7 +2090,7 @@ items: # Core # ==== - name: deepin-session - description: "New deepin session, based on systemd and existing projects" + description: "New deepin session, based on systemd and existing projects" - name: deepin-desktop-base description: Base component for Deepin - name: deepin-anything @@ -2290,7 +2290,7 @@ items: - name: deepin-screensaver description: Deepin screensaver viewer and tools - name: deepin-session - description: "New deepin session, based on systemd and existing projects" + description: "New deepin session, based on systemd and existing projects" - name: deepin-shortcut-viewer description: Deepin Shortcut Viewer - name: deepin-sound-theme @@ -2304,7 +2304,7 @@ items: - name: deepin-wayland-protocols description: deepin Specific Protocols for Wayland - name: docparser - description: + description: - name: deepin-app-services description: "Service collection of DDE applications, including dconfig-center" - name: deepin-appearance @@ -3371,155 +3371,6 @@ items: description: Battery blocklet for i3xrocks - name: i3xrocks-app-launcher description: App launcher blocklet for i3xrocks - - id: enlightenment - name: "Enlightenment" - description: "Enlightenment is a Window Manager, Compositor and Minimal Desktop for Linux (the primary platform), BSD and any other compatible UNIX system." - screenshot: "/etc/calamares/images/desktops/enlightenment.png" - netinstall: - name: Enlightenment Desktop - description: Options for the Enlightenment desktop installation - noncheckable: true - ignore-share-state: true - subgroups: - - name: Curated - description: Hand-picked offering of the Enlightenment desktop - selected: true - critical: true - packages: - # =============== - # Display Manager - # =============== - - name: lightdm - description: Display Manager and Login Screen - - name: lightdm-slick-greeter - description: Greeter for LightDM - # Repo cloning failed - # - name: entrance - # description: Display Manager and Login Screen - # ============= - # Screen Locker (sometimes referred to as screensaver) - # ============= - # - name: - # description: - # ============= - # Compatibility (like Wayland and Nvidia support) - # ============= - # - name: - # description: - # ==== - # Core - # ==== - - name: enlightenment - description: The Enlightenment Desktop - # ============== - # Window Manager - # ============== - # Handled by enlightenment or enlightenment-git - # - name: - # description: - # ================ - # Settings related - # ================ - # Shows an error on desktop if not used - - name: acpid - description: A daemon for delivering ACPI power management events with netlink support - # Shows an error on desktop if not used - - name: econnman - description: For network connections - # Shows an error on desktop if not used - - name: bluez - description: For bluetooth - - name: bluez-utils - description: Development and debugging utilities for the bluetooth protocol stack - # =========== - # XDG related (like xdg-desktop-portal-gnome, xdg-user-dirs-gtk, archlinux-xdg-menu) - # =========== - # - name: - # description: - # ============ - # Polkit agent - # ============ - - name: polkit-dumb-agent-git - description: Minimalistic desktop independent agent which provides /usr/bin/polkit-dumb-agent - # No longer present - # - name: polkit-efl-git - # description: Polkit Agent - # ================= - # Extension related (extension manager, store) - # ================= - # - name: - # description: - # =============== - # Theming related (theming support, uniform theming, basic theme) - # =============== - # - name: - # description: - # =========== - # Tweaking apps (like gnome-tweaks) - # =========== - # - name: - # description: - # ======== - # Terminal - # ======== - - name: terminology-git - description: Terminal - # ============ - # File Manager - # ============ - - name: thunar - description: File Manager - # =========== - # Text Editor - # =========== - - name: ecrire-git - description: Text Editor - # =============== - # Document Viewer - # =============== - - name: atril - description: Document Viewer - # =============== - # Archive Manager - # =============== - - name: thunar-archive-plugin - description: Adds archive operations to the Thunar file context menus - # ============ - # Disk Manager - # ============ - - name: gparted - description: Disk Manager - # ========== - # Calculator - # ========== - - name: mate-calc - description: calculator - # Repo missing. AUR build fails - # - name: equate-git - # description: - # ================== - # Clock and Calendar - # ================== - # - name: - # description: - # =========== - # Screenshots - # =========== - - name: xfce4-screenshooter - description: Screenshot tool - # ============ - # Image Viewer - # ============ - - name: eluminance-git - description: Photo Browser - # ============ - # Media Player - # ============ - - name: rage - description: Video Player - # Errors in build - # - name: enjoy-git - # description: Music Player - id: openbox name: "Openbox" description: "Openbox is a lightweight, powerful, and highly configurable stacking window manager with extensive standards support. It may be built upon and run independently as the basis of a unique desktop environment, or within other integrated desktop environments" diff --git a/etc/calamares/post_install/post_install.py b/etc/calamares/post_install/post_install.py index d662223..8cfeec0 100644 --- a/etc/calamares/post_install/post_install.py +++ b/etc/calamares/post_install/post_install.py @@ -259,35 +259,8 @@ def configure_desktops(config: Dict): installed, installed_ids = get_installed_desktops(config=config) for desktop, id in zip(installed, installed_ids): - if id == "enlightenment": - configure_enlightenment_desktop(desktop) - else: - pass - -def configure_enlightenment_desktop(enlightenment_config: Dict): - logging.info("Configuring the Enlightenment Desktop...") - disable_networkmanager = subprocess.run( - shlex.split("systemctl disable NetworkManager.service"), - shell= False, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - text=True, - ) - logging.debug("Running \"systemctl disable NetworkManager.service\":\n%s", disable_networkmanager.stdout) - if disable_networkmanager.returncode != 0: - logging.error(f"Could not disable NetworkManager. Exit code: {disable_networkmanager.returncode}") - return - - enable_connman = subprocess.run( - shlex.split("systemctl enable connman.service"), - shell= False, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - text=True, - ) - logging.debug("Running \"systemctl enable connman.service\":\n%s", enable_connman.stdout) - if enable_connman.returncode != 0: - logging.error(f"Could not enable connman. Exit code: {enable_connman.returncode}") + pass + def get_ids(dicts: list[Dict]) -> list[str]: return list( diff --git a/etc/calamares/post_install/post_install.yaml b/etc/calamares/post_install/post_install.yaml index 3c5c332..32f0d65 100644 --- a/etc/calamares/post_install/post_install.yaml +++ b/etc/calamares/post_install/post_install.yaml @@ -1,6 +1,5 @@ --- - -display_managers: +display_managers: - id: sddm test_packages: sddm test_unit: sddm @@ -10,8 +9,7 @@ display_managers: - lxqt - lxde - i3 - - openbox - - enlightenment + - openbox - mate - xfce - cutefish @@ -30,8 +28,7 @@ display_managers: - lxqt - lxde - i3 - - openbox - - enlightenment + - openbox - mate - xfce - cutefish @@ -44,14 +41,13 @@ display_managers: - id: lightdm test_packages: lightdm test_unit: lightdm - default_priority: + default_priority: - regolith - trinity - lxqt - lxde - i3 - - openbox - - enlightenment + - openbox - mate - xfce - cutefish @@ -117,14 +113,8 @@ desktops: xsession: mate login_wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg - - id: enlightenment - test_packages: enlightenment - session: enlightenment - xsession: enlightenment - login_wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg - wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg - id: lxde - test_packages: + test_packages: - lxsession - lxsession-gtk3 session: LXDE @@ -156,9 +146,9 @@ desktops: login_wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg - id: i3 - test_packages: + test_packages: - i3-wm session: i3 xsession: i3 login_wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg - wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg \ No newline at end of file + wallpaper: /usr/share/backgrounds/pexels-dương-nhân-2232979.jpg