Renamed hyperland to hyprland, fixed seatd via post_installation and added waybar-hyprland (#1824)
* Renamed hyperland to hyprland, fixed seatd via post_installation and installed waybar * Removed the launching of seatd on the installation process * Starting to add nvidia support, and automatic configuring of hyprland * Starting to add auto configuration of hyprland... But this will need maintenance * Added hyprpaper auto config Gonna make waybar auto config next * Waybar auto config is starting... I can't test rn I'm on vacation and my connection is quite bad (68 days for arch iso) * Added wlogout support (and swaylock) * Fixed file managers printing * Starting to add a shell config... Definitely don't push this * Reverted custom-shell config (create a separate PR) * Removed systemd-logind, as that was just for testing the selector * Added polkit as an option for the seat. As it's a dependency of the hyprland package * Flake8 fix * The name change wasn't propegated to the menu * Added newline at the end of general_conf.py to not alter it * Removed newline at the end of general_conf.py to not alter it * Renamed the Hyprland class --------- Co-authored-by: Anton Hvornum <anton@hvornum.se> Co-authored-by: Anton Hvornum <anton.feeds+github@gmail.com>
This commit is contained in:
parent
4f9e8d2381
commit
d6e3a4651f
|
|
@ -1,27 +0,0 @@
|
|||
from typing import List, Optional, Any, TYPE_CHECKING
|
||||
|
||||
from archinstall.default_profiles.profile import ProfileType, GreeterType
|
||||
from archinstall.default_profiles.xorg import XorgProfile
|
||||
|
||||
if TYPE_CHECKING:
|
||||
_: Any
|
||||
|
||||
|
||||
class HyperlandProfile(XorgProfile):
|
||||
def __init__(self):
|
||||
super().__init__('Hyperland', ProfileType.DesktopEnv, description='')
|
||||
|
||||
@property
|
||||
def packages(self) -> List[str]:
|
||||
return [
|
||||
"hyprland",
|
||||
"dunst",
|
||||
"xdg-desktop-portal-hyprland",
|
||||
"kitty",
|
||||
"qt5-wayland",
|
||||
"qt6-wayland"
|
||||
]
|
||||
|
||||
@property
|
||||
def default_greeter_type(self) -> Optional[GreeterType]:
|
||||
return GreeterType.Sddm
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
from enum import Enum
|
||||
from typing import List, Optional, TYPE_CHECKING, Any
|
||||
|
||||
from archinstall.default_profiles.profile import ProfileType, GreeterType
|
||||
from archinstall.default_profiles.xorg import XorgProfile
|
||||
from archinstall.lib.menu import Menu
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from archinstall.lib.installer import Installer
|
||||
_: Any
|
||||
|
||||
|
||||
class SeatAccess(Enum):
|
||||
seatd = 'seatd'
|
||||
polkit = 'polkit'
|
||||
|
||||
|
||||
class HyprlandProfile(XorgProfile):
|
||||
def __init__(self):
|
||||
super().__init__('Hyprland', ProfileType.DesktopEnv, description='')
|
||||
|
||||
self.custom_settings = {'seat_access': None}
|
||||
|
||||
@property
|
||||
def packages(self) -> List[str]:
|
||||
return [
|
||||
"hyprland",
|
||||
"dunst",
|
||||
"xdg-desktop-portal-hyprland",
|
||||
"qt5-wayland",
|
||||
"qt6-wayland"
|
||||
]
|
||||
|
||||
@property
|
||||
def default_greeter_type(self) -> Optional[GreeterType]:
|
||||
return GreeterType.Sddm
|
||||
|
||||
@property
|
||||
def services(self) -> List[str]:
|
||||
if pref := self.custom_settings.get('seat_access', None):
|
||||
return [pref]
|
||||
return []
|
||||
|
||||
def _ask_seat_access(self):
|
||||
# need to activate seat service and add to seat group
|
||||
title = str(_('Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)'))
|
||||
title += str(_('\n\nChoose an option to give Hyprland access to your hardware'))
|
||||
|
||||
options = [e.value for e in SeatAccess]
|
||||
default = None
|
||||
|
||||
if seat := self.custom_settings.get('seat_access', None):
|
||||
default = seat
|
||||
|
||||
choice = Menu(title, options, skip=False, preset_values=default).run()
|
||||
self.custom_settings['seat_access'] = choice.single_value
|
||||
|
||||
def do_on_select(self):
|
||||
self._ask_seat_access()
|
||||
|
||||
def install(self, install_session: 'Installer'):
|
||||
super().install(install_session)
|
||||
|
|
@ -218,4 +218,4 @@ def select_additional_repositories(preset: List[str]) -> List[str]:
|
|||
case MenuSelectionType.Reset: return []
|
||||
case MenuSelectionType.Selection: return choice.single_value
|
||||
|
||||
return []
|
||||
return []
|
||||
Loading…
Reference in New Issue