Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-04-07 11:15:42 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-04-07 11:15:42 +0200
commit42470dcc9ae13fca5f46d0f8e1be800744a8a797 (patch)
tree60696befca281b20e1d631d06f0a6a5b4a0879f1 /profiles
parent5ca64b59a605351231f7f9c34e57fadc5f668d9e (diff)
parent1d60e307e81a99ebd6cbfe26a92e5dfa96a8870a (diff)
Merging changes from master into feature branch to avoid future conflics.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/applications/gnome.py4
-rw-r--r--profiles/awesome.py4
-rw-r--r--profiles/cinnamon.py1
-rw-r--r--profiles/desktop.py8
-rw-r--r--profiles/kde.py2
5 files changed, 10 insertions, 9 deletions
diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
index 1f2a20a1..66656134 100644
--- a/profiles/applications/gnome.py
+++ b/profiles/applications/gnome.py
@@ -1,4 +1,4 @@
import archinstall
-installation.add_additional_packages("gnome gnome-extra gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
-# Note: gdm should be part of the gnome group, but adding it here for clarity \ No newline at end of file
+installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder gdm")
+# Note: gdm should be part of the gnome group, but adding it here for clarity
diff --git a/profiles/awesome.py b/profiles/awesome.py
index 8004fc62..6b1167bf 100644
--- a/profiles/awesome.py
+++ b/profiles/awesome.py
@@ -2,7 +2,9 @@
import archinstall
-__packages__ = ['nano', 'nemo', 'gpicview-gtk3', 'chromium', 'openssh', 'sshfs', 'htop', 'scrot', 'wget']
+# New way of defining packages for a profile, which is iterable and can be used out side
+# of the profile to get a list of "what packages will be installed".
+__packages__ = ['nano', 'nemo', 'gpicview-gtk3', 'openssh', 'sshfs', 'htop', 'scrot', 'wget']
def _prep_function(*args, **kwargs):
"""
diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py
index dac38bd3..528158d8 100644
--- a/profiles/cinnamon.py
+++ b/profiles/cinnamon.py
@@ -1,5 +1,4 @@
# A desktop environment using "Cinnamon"
-
import archinstall
def _prep_function(*args, **kwargs):
diff --git a/profiles/desktop.py b/profiles/desktop.py
index 0c89e543..b8270881 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -13,8 +13,8 @@ def _prep_function(*args, **kwargs):
supported_desktops = ['gnome', 'kde', 'awesome', 'xfce4', 'cinnamon']
desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ')
- # Temporarly store the selected desktop profile
- # in a session-safe location, since this module will get re-loaded
+ # Temporarily store the selected desktop profile
+ # in a session-safe location, since this module will get reloaded
# the next time it gets executed.
archinstall.storage['_desktop_profile'] = desktop
@@ -29,7 +29,7 @@ def _prep_function(*args, **kwargs):
if __name__ == 'desktop':
"""
This "profile" is a meta-profile.
- There are no specific desktop-steps, it simply routes
+ There are no desktop-specific steps, it simply routes
the installer to whichever desktop environment/window manager was chosen.
Maybe in the future, a network manager or similar things *could* be added here.
@@ -37,7 +37,7 @@ if __name__ == 'desktop':
it trying to be a turn-key desktop distribution.
There are plenty of desktop-turn-key-solutions based on Arch Linux,
- this is therefor just a helper to get started
+ this is therefore just a helper to get started
"""
# TODO: Remove magic variable 'installation' and place it
diff --git a/profiles/kde.py b/profiles/kde.py
index 0207ed22..e1449d81 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -1,4 +1,4 @@
-# A desktop environement using "KDE".
+# A desktop environment using "KDE".
import archinstall, os