Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/profiles/sway.py
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2023-04-19 20:55:42 +1000
committerGitHub <noreply@github.com>2023-04-19 12:55:42 +0200
commit00b0ae7ba439a5a420095175b3bedd52c569db51 (patch)
treef02d081e361d5e65603f74dea3873dcc6606cf7c /profiles/sway.py
parent5253e57e9f26cf3e59cb2460544af13f56e485bb (diff)
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 <girtler.daniel@gmail.com> Co-authored-by: Anton Hvornum <anton@hvornum.se> Co-authored-by: Anton Hvornum <anton.feeds+github@gmail.com> Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com>
Diffstat (limited to 'profiles/sway.py')
-rw-r--r--profiles/sway.py100
1 files changed, 0 insertions, 100 deletions
diff --git a/profiles/sway.py b/profiles/sway.py
deleted file mode 100644
index f69f73ce..00000000
--- a/profiles/sway.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# A desktop environment using "Sway"
-from typing import Any, TYPE_CHECKING
-
-import archinstall
-from archinstall import Menu
-from archinstall.lib.menu.menu import MenuSelectionType
-
-if TYPE_CHECKING:
- _: Any
-
-is_top_level_profile = False
-
-__packages__ = [
- "sway",
- "swaybg",
- "swaylock",
- "swayidle",
- "waybar",
- "dmenu",
- "brightnessctl",
- "grim",
- "slurp",
- "pavucontrol",
- "foot",
- "xorg-xwayland",
-]
-
-
-def _check_driver() -> bool:
- packages = archinstall.storage.get("gfx_driver_packages", [])
-
- if packages and "nvidia" in packages:
- prompt = _('The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues, are you okay with that?')
- choice = Menu(prompt, Menu.yes_no(), default_option=Menu.no(), skip=False).run()
-
- if choice.value == Menu.no():
- return False
-
- return True
-
-def _get_system_privelege_control_preference():
- # need to activate seat service and add to seat group
- title = str(_('Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)'))
- title += str(_('\n\nChoose an option to give Sway access to your hardware'))
- choice = Menu(title, ["polkit", "seatd"]).run()
-
- if choice.type_ != MenuSelectionType.Selection:
- return False
-
- archinstall.storage['sway_sys_priv_ctrl'] = [choice.value]
- archinstall.arguments['sway_sys_priv_ctrl'] = [choice.value]
- return True
-
-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.
- """
- if not _get_system_privelege_control_preference():
- return False
-
- driver = archinstall.select_driver()
-
- if driver:
- archinstall.storage["gfx_driver_packages"] = driver
- if not _check_driver():
- return _prep_function(args, kwargs)
- return True
-
- return False
-
-
-"""
-def _post_install(*args, **kwargs):
- if "seatd" in sway_sys_priv_ctrl:
- print(_('After booting, add user(s) to the `seat` user group and re-login to use Sway'))
- return True
-"""
-
-# Ensures that this code only gets executed if executed
-# through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py")
-# or through conventional import sway
-if __name__ == "sway":
- if not _check_driver():
- raise archinstall.lib.exceptions.HardwareIncompatibilityError(_('Sway does not support the proprietary nvidia drivers.'))
-
- # Install the Sway packages
- archinstall.storage['installation_session'].add_additional_packages(__packages__)
- if "seatd" in archinstall.storage['sway_sys_priv_ctrl']:
- archinstall.storage['installation_session'].add_additional_packages(['seatd'])
- archinstall.storage['installation_session'].enable_service('seatd')
- elif "polkit" in archinstall.storage['sway_sys_priv_ctrl']:
- archinstall.storage['installation_session'].add_additional_packages(['polkit'])
- else:
- raise archinstall.lib.exceptions.ProfileError(_('Sway requires either seatd or polkit to run'))
-
- # Install the graphics driver packages
- archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}")