diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py index 5c5cdb6c..191b0791 100644 --- a/archinstall/default_profiles/desktop.py +++ b/archinstall/default_profiles/desktop.py @@ -55,7 +55,7 @@ class DesktopProfile(Profile): profile.do_on_select() @override - def do_on_select(self) -> SelectResult | None: + def do_on_select(self) -> SelectResult: items = [ MenuItem( p.name, diff --git a/archinstall/default_profiles/desktops/bspwm.py b/archinstall/default_profiles/desktops/bspwm.py index 636a9c07..71fa6d56 100644 --- a/archinstall/default_profiles/desktops/bspwm.py +++ b/archinstall/default_profiles/desktops/bspwm.py @@ -22,5 +22,5 @@ class BspwmProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/budgie.py b/archinstall/default_profiles/desktops/budgie.py index 8a271e72..bffb110d 100644 --- a/archinstall/default_profiles/desktops/budgie.py +++ b/archinstall/default_profiles/desktops/budgie.py @@ -21,5 +21,5 @@ class BudgieProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.LightdmSlick diff --git a/archinstall/default_profiles/desktops/cinnamon.py b/archinstall/default_profiles/desktops/cinnamon.py index 1da365d8..9eb15552 100644 --- a/archinstall/default_profiles/desktops/cinnamon.py +++ b/archinstall/default_profiles/desktops/cinnamon.py @@ -27,5 +27,5 @@ class CinnamonProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/cosmic.py b/archinstall/default_profiles/desktops/cosmic.py index ac2d48df..69708725 100644 --- a/archinstall/default_profiles/desktops/cosmic.py +++ b/archinstall/default_profiles/desktops/cosmic.py @@ -17,5 +17,5 @@ class CosmicProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.CosmicSession diff --git a/archinstall/default_profiles/desktops/cutefish.py b/archinstall/default_profiles/desktops/cutefish.py index 47979f0e..08327dca 100644 --- a/archinstall/default_profiles/desktops/cutefish.py +++ b/archinstall/default_profiles/desktops/cutefish.py @@ -18,5 +18,5 @@ class CutefishProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Sddm diff --git a/archinstall/default_profiles/desktops/deepin.py b/archinstall/default_profiles/desktops/deepin.py index 23fd9c4d..403fabc5 100644 --- a/archinstall/default_profiles/desktops/deepin.py +++ b/archinstall/default_profiles/desktops/deepin.py @@ -19,5 +19,5 @@ class DeepinProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/enlightenment.py b/archinstall/default_profiles/desktops/enlightenment.py index 30f4070f..8c37568a 100644 --- a/archinstall/default_profiles/desktops/enlightenment.py +++ b/archinstall/default_profiles/desktops/enlightenment.py @@ -18,5 +18,5 @@ class EnlighenmentProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/gnome.py b/archinstall/default_profiles/desktops/gnome.py index 48555e0a..9ee78da4 100644 --- a/archinstall/default_profiles/desktops/gnome.py +++ b/archinstall/default_profiles/desktops/gnome.py @@ -18,5 +18,5 @@ class GnomeProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Gdm diff --git a/archinstall/default_profiles/desktops/hyprland.py b/archinstall/default_profiles/desktops/hyprland.py index c5e66768..a04d63bb 100644 --- a/archinstall/default_profiles/desktops/hyprland.py +++ b/archinstall/default_profiles/desktops/hyprland.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING, override from archinstall.default_profiles.desktops import SeatAccess -from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.menu_item import MenuItem, MenuItemGroup @@ -40,7 +40,7 @@ class HyprlandProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Sddm @property @@ -74,6 +74,6 @@ class HyprlandProfile(XorgProfile): self.custom_settings['seat_access'] = result.get_value().value @override - def do_on_select(self) -> SelectResult | None: + def do_on_select(self) -> None: self._ask_seat_access() return None diff --git a/archinstall/default_profiles/desktops/i3.py b/archinstall/default_profiles/desktops/i3.py index 2683abe8..11e240f9 100644 --- a/archinstall/default_profiles/desktops/i3.py +++ b/archinstall/default_profiles/desktops/i3.py @@ -25,5 +25,5 @@ class I3wmProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/labwc.py b/archinstall/default_profiles/desktops/labwc.py index 36557b82..7203ebb5 100644 --- a/archinstall/default_profiles/desktops/labwc.py +++ b/archinstall/default_profiles/desktops/labwc.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING, override from archinstall.default_profiles.desktops import SeatAccess -from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.menu_item import MenuItem, MenuItemGroup @@ -38,7 +38,7 @@ class LabwcProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm @property @@ -72,6 +72,6 @@ class LabwcProfile(XorgProfile): self.custom_settings['seat_access'] = result.get_value().value @override - def do_on_select(self) -> SelectResult | None: + def do_on_select(self) -> None: self._ask_seat_access() return None diff --git a/archinstall/default_profiles/desktops/lxqt.py b/archinstall/default_profiles/desktops/lxqt.py index fee63550..a483bc7e 100644 --- a/archinstall/default_profiles/desktops/lxqt.py +++ b/archinstall/default_profiles/desktops/lxqt.py @@ -26,5 +26,5 @@ class LxqtProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Sddm diff --git a/archinstall/default_profiles/desktops/mate.py b/archinstall/default_profiles/desktops/mate.py index 9cf34bb3..48860dfa 100644 --- a/archinstall/default_profiles/desktops/mate.py +++ b/archinstall/default_profiles/desktops/mate.py @@ -18,5 +18,5 @@ class MateProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/niri.py b/archinstall/default_profiles/desktops/niri.py index 0fd50fa9..fea6a02b 100644 --- a/archinstall/default_profiles/desktops/niri.py +++ b/archinstall/default_profiles/desktops/niri.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING, override from archinstall.default_profiles.desktops import SeatAccess -from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.menu_item import MenuItem, MenuItemGroup @@ -45,7 +45,7 @@ class NiriProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm @property @@ -79,6 +79,6 @@ class NiriProfile(XorgProfile): self.custom_settings['seat_access'] = result.get_value().value @override - def do_on_select(self) -> SelectResult | None: + def do_on_select(self) -> None: self._ask_seat_access() return None diff --git a/archinstall/default_profiles/desktops/plasma.py b/archinstall/default_profiles/desktops/plasma.py index 2dfb0426..305b8cb9 100644 --- a/archinstall/default_profiles/desktops/plasma.py +++ b/archinstall/default_profiles/desktops/plasma.py @@ -22,5 +22,5 @@ class PlasmaProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Sddm diff --git a/archinstall/default_profiles/desktops/qtile.py b/archinstall/default_profiles/desktops/qtile.py index bba20ad3..10a0a085 100644 --- a/archinstall/default_profiles/desktops/qtile.py +++ b/archinstall/default_profiles/desktops/qtile.py @@ -18,5 +18,5 @@ class QtileProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/river.py b/archinstall/default_profiles/desktops/river.py index 442a6b8e..8820d8e4 100644 --- a/archinstall/default_profiles/desktops/river.py +++ b/archinstall/default_profiles/desktops/river.py @@ -19,5 +19,5 @@ class RiverProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py index 4c5e9187..40b830e4 100644 --- a/archinstall/default_profiles/desktops/sway.py +++ b/archinstall/default_profiles/desktops/sway.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING, override from archinstall.default_profiles.desktops import SeatAccess -from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.menu_item import MenuItem, MenuItemGroup @@ -48,7 +48,7 @@ class SwayProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm @property @@ -82,6 +82,6 @@ class SwayProfile(XorgProfile): self.custom_settings['seat_access'] = result.get_value().value @override - def do_on_select(self) -> SelectResult | None: + def do_on_select(self) -> None: self._ask_seat_access() return None diff --git a/archinstall/default_profiles/desktops/wayfire.py b/archinstall/default_profiles/desktops/wayfire.py index a0245c8c..ddc8f364 100644 --- a/archinstall/default_profiles/desktops/wayfire.py +++ b/archinstall/default_profiles/desktops/wayfire.py @@ -18,5 +18,5 @@ class WayfireProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/xfce4.py b/archinstall/default_profiles/desktops/xfce4.py index 464a6349..640289fe 100644 --- a/archinstall/default_profiles/desktops/xfce4.py +++ b/archinstall/default_profiles/desktops/xfce4.py @@ -21,5 +21,5 @@ class Xfce4Profile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/desktops/xmonad.py b/archinstall/default_profiles/desktops/xmonad.py index 854a87f9..b8b38213 100644 --- a/archinstall/default_profiles/desktops/xmonad.py +++ b/archinstall/default_profiles/desktops/xmonad.py @@ -21,5 +21,5 @@ class XmonadProfile(XorgProfile): @property @override - def default_greeter_type(self) -> GreeterType | None: + def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm diff --git a/archinstall/default_profiles/server.py b/archinstall/default_profiles/server.py index e952c6d0..68b756e7 100644 --- a/archinstall/default_profiles/server.py +++ b/archinstall/default_profiles/server.py @@ -20,7 +20,7 @@ class ServerProfile(Profile): ) @override - def do_on_select(self) -> SelectResult | None: + def do_on_select(self) -> SelectResult: items = [ MenuItem( p.name,