Merge remote-tracking branch 'origin/master' into fix-3376

Author: svartkanin

.github/workflows/github-pages.yml

@@ -22,7 +22,7 @@ jobs:
       options: --privileged
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       - name: Install pre-dependencies
         run: |
           pacman -Sy --noconfirm tree git python-pyparted python-setuptools python-sphinx python-sphinx_rtd_theme python-build python-installer python-wheel

.github/workflows/python-build.yml

@@ -17,16 +17,16 @@ jobs:
           pacman-key --init
           pacman --noconfirm -Sy archlinux-keyring
           pacman --noconfirm -Syyu
-          pacman --noconfirm -Sy python-pip python-pydantic python-pyparted pkgconfig gcc
-      - name: Install build dependencies
-        run: |
-          python -m pip install --break-system-packages --upgrade pip
-          pip install --break-system-packages --upgrade build twine wheel setuptools installer
-          pip uninstall archinstall -y --break-system-packages
+          pacman --noconfirm -Sy python-uv python-setuptools python-pip
+          pacman --noconfirm -Sy python-pyparted python-pydantic
+      - name: Remove existing archinstall (if any)
+        run: 
+          uv pip uninstall archinstall --break-system-packages --system
       - name: Build archinstall
-        run: python -m build --wheel --no-isolation
+        run: uv build --no-build-isolation --wheel
       - name: Install archinstall
-        run: python -m installer dist/*.whl
+        run: |
+          uv pip install dist/*.whl --break-system-packages --system --no-build --no-deps
       - name: Run archinstall
         run: |
           python -V

.github/workflows/python-publish.yml

@@ -15,19 +15,18 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up Python
-        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: '3.x'
-      - name: Install dependencies
+      - name: Prepare arch
         run: |
-          python -m pip install --upgrade pip
-          pip install build twine
+          pacman-key --init
+          pacman --noconfirm -Sy archlinux-keyring
+          pacman --noconfirm -Syyu
+          pacman --noconfirm -Sy python-uv python-setuptools python-pip
       - name: Build archinstall
         run: |
-          python -m build . --wheel
+          uv build --no-build-isolation --wheel
       - name: Publish archinstall to PyPi
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          twine upload dist/*
+          uv publish --trusted-publishing always

.github/workflows/ruff.yaml

@@ -5,4 +5,4 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-            - uses: astral-sh/ruff-action@9828f49eb4cadf267b40eaa330295c412c68c1f9  # v3.2.2
+            - uses: astral-sh/ruff-action@c6bea5606c33b5d04902374392d9233464b90660  # v3.3.0

.pre-commit-config.yaml

@@ -46,8 +46,9 @@ repos:
         - pydantic
         - pydantic-settings
         - pytest
+        - cryptography
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.5
+    rev: v0.11.7
     hooks:
       - id: ruff
         args: ["check", "--select", "I", "--fix"]

PKGBUILD

@@ -34,6 +34,7 @@ depends=(
   'ntfs-3g'
 )
 makedepends=(
+  'python-cryptography'
   'python-setuptools'
   'python-sphinx'
   'python-build'

README.md

@@ -56,6 +56,18 @@ To load the configuration file into `archinstall` run the following command
 archinstall --config <path to user config file or URL> --creds <path to user credentials config file or URL>
 ```
 
+### Credentials configuration file encryption
+By default all user account credentials are hashed with `yescrypt` and only the hash is stored in the saved `user_credentials.json` file.
+This is not possible for disk encryption password which needs to be stored in plaintext to be able to apply it.
+
+However, when selecting to save configuration files, `archinstall` will prompt for the option to encrypt the `user_credentials.json` file content.
+A prompt will require to enter a encryption password to encrypt the file. When providing an encrypted `user_configuration.json` as a argument with `--creds <user_credentials.json>`
+there are multiple ways to provide the decryption key:
+* Provide the decryption key via the command line argument `--creds-decryption-key <password>`
+* Store the encryption key in the environment variable `ARCHINSTALL_CREDS_DECRYPTION_KEY` which will be read automatically
+* If none of the above is provided a prompt will be shown to enter the decryption key manually
+
+
 # Help or Issues
 
 If you come across any issues, kindly submit your issue here on Github or post your query in the

archinstall/__init__.py

@@ -23,11 +23,6 @@
 	_: Callable[[str], DeferredTranslation]
 
 
-# add the custom _ as a builtin, it can now be used anywhere in the
-# project to mark strings as translatable with _('translate me')
-DeferredTranslation.install()
-
-
 # @archinstall.plugin decorator hook to programmatically add
 # plugins in runtime. Useful in profiles_bck and other things.
 def plugin(f, *args, **kwargs) -> None:  # type: ignore[no-untyped-def]

archinstall/default_profiles/desktop.py

@@ -68,7 +68,7 @@ def do_on_select(self) -> SelectResult:
 		group = MenuItemGroup(items, sort_items=True, sort_case_sensitive=False)
 		group.set_selected_by_value(self.current_selection)
 
-		result = SelectMenu(
+		result = SelectMenu[Profile](
 			group,
 			multi=True,
 			allow_reset=True,

archinstall/default_profiles/desktops/hyprland.py

@@ -62,7 +62,7 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu(
+		result = SelectMenu[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,