Skip to content

Commit ccc378b

Browse files
committed
Merge branch 'master' into network-mandatory-selection
2 parents 14b5dcb + 03b245a commit ccc378b

67 files changed

Lines changed: 5294 additions & 869 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/iso-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- run: pacman-key --init
3434
- run: pacman --noconfirm -Sy archlinux-keyring
3535
- run: ./build_iso.sh
36-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
36+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
3737
with:
3838
name: Arch Live ISO
3939
path: /tmp/archlive/out/*.iso

.github/workflows/python-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
archinstall --script guided -v
3434
archinstall --script only_hd -v
3535
archinstall --script minimal -v
36-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
36+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
3737
with:
3838
name: archinstall
3939
path: dist/*

.github/workflows/ruff-format.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
8-
- uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6 # v3.6.1
8+
- uses: astral-sh/ruff-action@0ce1b0bf8b818ef400413f810f8a11cdbda0034b # v4.0.0
99
- run: ruff format --diff

.github/workflows/ruff-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
8-
- uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6 # v3.6.1
8+
- uses: astral-sh/ruff-action@0ce1b0bf8b818ef400413f810f8a11cdbda0034b # v4.0.0

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
default_stages: ['pre-commit']
22
repos:
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: v0.15.10
4+
rev: v0.15.11
55
hooks:
66
# fix unused imports and sort them
77
- id: ruff
@@ -31,7 +31,7 @@ repos:
3131
args: [--config=.flake8]
3232
fail_fast: true
3333
- repo: https://github.com/pre-commit/mirrors-mypy
34-
rev: v1.20.0
34+
rev: v1.20.1
3535
hooks:
3636
- id: mypy
3737
args: [

PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Contributor: demostanis worlds <demostanis@protonmail.com>
66

77
pkgname=archinstall
8-
pkgver=4.1
8+
pkgver=4.3
99
pkgrel=1
1010
pkgdesc="Just another guided/automated Arch Linux installer with a twist"
1111
arch=(any)

archinstall/applications/fonts.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
from typing import TYPE_CHECKING
2+
3+
from archinstall.lib.models.application import FontsConfiguration
4+
from archinstall.lib.output import debug
5+
6+
if TYPE_CHECKING:
7+
from archinstall.lib.installer import Installer
8+
9+
10+
class FontsApp:
11+
def install(self, install_session: Installer, fonts_config: FontsConfiguration) -> None:
12+
packages = [f.value for f in fonts_config.fonts]
13+
debug(f'Installing fonts: {packages}')
14+
install_session.add_additional_packages(packages)

archinstall/applications/power_management.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ def tuned_packages(self) -> list[str]:
2121
'tuned-ppd',
2222
]
2323

24+
@property
25+
def ppd_services(self) -> list[str]:
26+
return [
27+
'power-profiles-daemon.service',
28+
]
29+
30+
@property
31+
def tuned_services(self) -> list[str]:
32+
return [
33+
'tuned.service',
34+
]
35+
2436
def install(
2537
self,
2638
install_session: Installer,
@@ -31,5 +43,7 @@ def install(
3143
match power_management_config.power_management:
3244
case PowerManagement.POWER_PROFILES_DAEMON:
3345
install_session.add_additional_packages(self.ppd_packages)
46+
install_session.enable_service(self.ppd_services)
3447
case PowerManagement.TUNED:
3548
install_session.add_additional_packages(self.tuned_packages)
49+
install_session.enable_service(self.tuned_services)

archinstall/default_profiles/profile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,6 @@ def packages_text(self, include_sub_packages: bool = False) -> str:
212212
text = tr('Installed packages') + ':\n'
213213

214214
for pkg in sorted(packages):
215-
text += f'\t- {pkg}\n'
215+
text += f' - {pkg}\n'
216216

217217
return text

archinstall/lib/applications/application_handler.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from archinstall.applications.audio import AudioApp
44
from archinstall.applications.bluetooth import BluetoothApp
55
from archinstall.applications.firewall import FirewallApp
6+
from archinstall.applications.fonts import FontsApp
67
from archinstall.applications.power_management import PowerManagementApp
78
from archinstall.applications.print_service import PrintServiceApp
89
from archinstall.lib.models import Audio
@@ -42,3 +43,9 @@ def install_applications(self, install_session: Installer, app_config: Applicati
4243
install_session,
4344
app_config.firewall_config,
4445
)
46+
47+
if app_config.fonts_config:
48+
FontsApp().install(
49+
install_session,
50+
app_config.fonts_config,
51+
)

0 commit comments

Comments
 (0)