From 00b0ae7ba439a5a420095175b3bedd52c569db51 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Wed, 19 Apr 2023 20:55:42 +1000 Subject: PyParted and a large rewrite of the underlying partitioning (#1604) * Invert mypy files * Add optional pre-commit hooks * New profile structure * Serialize profiles * Use profile instead of classmethod * Custom profile setup * Separator between back * Support profile import via url * Move profiles module * Refactor files * Remove symlink * Add user to docker group * Update schema description * Handle list services * mypy fixes * mypy fixes * Rename profilesv2 to profiles * flake8 * mypy again * Support selecting DM * Fix mypy * Cleanup * Update greeter setting * Update schema * Revert toml changes * Poc external dependencies * Dependency support * New encryption menu * flake8 * Mypy and flake8 * Unify lsblk command * Update bootloader configuration * Git hooks * Fix import * Pyparted * Remove custom font setting * flake8 * Remove default preview * Manual partitioning menu * Update structure * Disk configuration * Update filesystem * luks2 encryption * Everything works until installation * Btrfsutil * Btrfs handling * Update btrfs * Save encryption config * Fix pipewire issue * Update mypy version * Update all pre-commit * Update package versions * Revert audio/pipewire * Merge master PRs * Add master changes * Merge master changes * Small renaming * Pull master changes * Reset disk enc after disk config change * Generate locals * Update naming * Fix imports * Fix broken sync * Fix pre selection on table menu * Profile menu * Update profile * Fix post_install * Added python-pyparted to PKGBUILD, this requires [testing] to be enabled in order to run makepkg. Package still works via python -m build etc. * Swaped around some setuptools logic in pyproject Since we define `package-data` and `packages` there should be no need for: ``` [tool.setuptools.packages.find] where = ["archinstall", "archinstall.*"] ``` * Removed pyproject collisions. Duplicate definitions. * Made sure pyproject.toml includes languages * Add example and update README * Fix pyproject issues * Generate locale * Refactor imports * Simplify imports * Add profile description and package examples * Align code * Fix mypy * Simplify imports * Fix saving config * Fix wrong luks merge * Refactor installation * Fix cdrom device loading * Fix wrongly merged code * Fix imports and greeter * Don't terminate on partprobe error * Use specific path on partprobe from luks * Update archinstall/lib/disk/device_model.py Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com> * Update archinstall/lib/disk/device_model.py Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com> * Update github workflow to test archinstall installation * Update sway merge * Generate locales * Update workflow --------- Co-authored-by: Daniel Girtler Co-authored-by: Anton Hvornum Co-authored-by: Anton Hvornum Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com> --- profiles/xorg.py | 68 -------------------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 profiles/xorg.py (limited to 'profiles/xorg.py') diff --git a/profiles/xorg.py b/profiles/xorg.py deleted file mode 100644 index de45acd3..00000000 --- a/profiles/xorg.py +++ /dev/null @@ -1,68 +0,0 @@ -# A system with "xorg" installed - -import archinstall -import logging -from archinstall.lib.hardware import __packages__ as __hwd__packages__ - -is_top_level_profile = True - -__description__ = str(_('Installs a minimal system as well as xorg and graphics drivers.')) - -__packages__ = [ - 'dkms', - 'xorg-server', - 'xorg-xinit', - 'nvidia-dkms', - *__hwd__packages__, -] - - -def _prep_function(*args, **kwargs): - """ - Magic function called by the importing installer - before continuing any further. It also avoids executing any - other code in this stage. So it's a safe way to ask the user - for more input before any other installer steps start. - """ - - driver = archinstall.select_driver() - - if driver: - archinstall.storage["gfx_driver_packages"] = driver - return True - - # TODO: Add language section and/or merge it with the locale selected - # earlier in for instance guided.py installer. - - return False - - -# Ensures that this code only gets executed if executed -# through importlib.util.spec_from_file_location("xorg", "/somewhere/xorg.py") -# or through conventional import xorg -if __name__ == 'xorg': - try: - if "nvidia" in archinstall.storage.get("gfx_driver_packages", []): - if "linux-zen" in archinstall.storage['installation_session'].base_packages or "linux-lts" in archinstall.storage['installation_session'].base_packages: - for kernel in archinstall.storage['installation_session'].kernels: - archinstall.storage['installation_session'].add_additional_packages(f"{kernel}-headers") # Fixes https://github.com/archlinux/archinstall/issues/585 - archinstall.storage['installation_session'].add_additional_packages("dkms") # I've had kernel regen fail if it wasn't installed before nvidia-dkms - archinstall.storage['installation_session'].add_additional_packages("xorg-server", "xorg-xinit", "nvidia-dkms") - else: - archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', [])) - elif 'amdgpu' in archinstall.storage.get("gfx_driver_packages", []): - # The order of these two are important if amdgpu is installed #808 - if 'amdgpu' in archinstall.storage['installation_session'].MODULES: - archinstall.storage['installation_session'].MODULES.remove('amdgpu') - archinstall.storage['installation_session'].MODULES.append('amdgpu') - - if 'radeon' in archinstall.storage['installation_session'].MODULES: - archinstall.storage['installation_session'].MODULES.remove('radeon') - archinstall.storage['installation_session'].MODULES.append('radeon') - - archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', [])) - else: - archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', [])) - except Exception as err: - archinstall.log(f"Could not handle nvidia and linuz-zen specific situations during xorg installation: {err}", level=logging.WARNING, fg="yellow") - archinstall.storage['installation_session'].add_additional_packages("xorg-server", "xorg-xinit") # Prep didn't run, so there's no driver to install -- cgit v1.2.3-70-g09d2