Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/default_profiles/desktops
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2023-07-30 00:28:21 +0200
committerGitHub <noreply@github.com>2023-07-30 00:28:21 +0200
commita43344c5ae2249ddb70e535637915b30563c5038 (patch)
tree6183d5820cd09d32e7b24cb7a9eb7a099d4616c6 /archinstall/default_profiles/desktops
parent29b528072551f32a0075b3f5c9d91d5ded019534 (diff)
Adding pack packages to profiles after they were removed (#1956)
* Added back xinit for awesome, since it can be used without a greeter, as well as other useful tools we've had in previous releases * Fixing xinitrc for awesome profile * Attempting to grab xorg packages when installing the desktop profile * Spelling error on xorg-server * Fixed sway value error on seat selection
Diffstat (limited to 'archinstall/default_profiles/desktops')
-rw-r--r--archinstall/default_profiles/desktops/awesome.py32
-rw-r--r--archinstall/default_profiles/desktops/bspwm.py22
-rw-r--r--archinstall/default_profiles/desktops/sway.py2
3 files changed, 53 insertions, 3 deletions
diff --git a/archinstall/default_profiles/desktops/awesome.py b/archinstall/default_profiles/desktops/awesome.py
index 371e51db..79e0eb71 100644
--- a/archinstall/default_profiles/desktops/awesome.py
+++ b/archinstall/default_profiles/desktops/awesome.py
@@ -14,9 +14,18 @@ class AwesomeProfile(XorgProfile):
@property
def packages(self) -> List[str]:
- return [
+ return super().packages + [
'awesome',
- 'alacritty'
+ 'alacritty',
+ 'xorg-xinit',
+ 'xorg-xrandr',
+ 'xterm',
+ 'feh',
+ 'slock',
+ 'terminus-font',
+ 'gnu-free-fonts',
+ 'ttf-liberation',
+ 'xsel',
]
def preview_text(self) -> Optional[str]:
@@ -37,3 +46,22 @@ class AwesomeProfile(XorgProfile):
fh.write(awesome_lua)
# TODO: Configure the right-click-menu to contain the above packages that were installed. (as a user config)
+
+ # TODO: check if we selected a greeter,
+ # but for now, awesome is intended to run without one.
+ with open(f"{install_session.target}/etc/X11/xinit/xinitrc", 'r') as xinitrc:
+ xinitrc_data = xinitrc.read()
+
+ for line in xinitrc_data.split('\n'):
+ if "twm &" in line:
+ xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+ if "xclock" in line:
+ xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+ if "xterm" in line:
+ xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+
+ xinitrc_data += '\n'
+ xinitrc_data += 'exec awesome\n'
+
+ with open(f"{install_session.target}/etc/X11/xinit/xinitrc", 'w') as xinitrc:
+ xinitrc.write(xinitrc_data) \ No newline at end of file
diff --git a/archinstall/default_profiles/desktops/bspwm.py b/archinstall/default_profiles/desktops/bspwm.py
index f3bc982d..2a29f41b 100644
--- a/archinstall/default_profiles/desktops/bspwm.py
+++ b/archinstall/default_profiles/desktops/bspwm.py
@@ -13,6 +13,7 @@ class BspwmProfile(XorgProfile):
@property
def packages(self) -> List[str]:
+ # return super().packages + [
return [
'bspwm',
'sxhkd',
@@ -28,3 +29,24 @@ class BspwmProfile(XorgProfile):
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()
+
+ # The wiki specified xinit, but we already use greeter?
+ # https://wiki.archlinux.org/title/Bspwm#Starting
+ #
+ # # TODO: check if we selected a greeter, else run this:
+ # with open(f"{install_session.target}/etc/X11/xinit/xinitrc", 'r') as xinitrc:
+ # xinitrc_data = xinitrc.read()
+
+ # for line in xinitrc_data.split('\n'):
+ # if "twm &" in line:
+ # xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+ # if "xclock" in line:
+ # xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+ # if "xterm" in line:
+ # xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+
+ # xinitrc_data += '\n'
+ # xinitrc_data += 'exec bspwn\n'
+
+ # with open(f"{install_session.target}/etc/X11/xinit/xinitrc", 'w') as xinitrc:
+ # xinitrc.write(xinitrc_data)
diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py
index ae814e46..25d74a88 100644
--- a/archinstall/default_profiles/desktops/sway.py
+++ b/archinstall/default_profiles/desktops/sway.py
@@ -53,7 +53,7 @@ class SwayProfile(XorgProfile):
@property
def services(self) -> List[str]:
if pref := self.custom_settings.get('seat_access', None):
- return [pref.value]
+ return [pref]
return []
def _ask_seat_access(self):