From f319308d37ddf3dbfa6d62c500d61266f55771cd Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:08:50 -0400 Subject: Remove application profiles that just install additional packages and do not do anything else to customize or configure. --- profiles/applications/kde.py | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 profiles/applications/kde.py (limited to 'profiles/applications/kde.py') diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py deleted file mode 100644 index af1e6597..00000000 --- a/profiles/applications/kde.py +++ /dev/null @@ -1,5 +0,0 @@ -import archinstall -packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session" -if "nvidia" in _gfx_driver_packages: - packages = packages + " egl-wayland" -installation.add_additional_packages(packages) -- cgit v1.2.3-54-g00ecf From 8706b48097f0fdb8eab7a612378bc3352ec00c18 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:10:08 -0400 Subject: Restore kde.py --- profiles/applications/kde.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 profiles/applications/kde.py (limited to 'profiles/applications/kde.py') diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py new file mode 100644 index 00000000..af1e6597 --- /dev/null +++ b/profiles/applications/kde.py @@ -0,0 +1,5 @@ +import archinstall +packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session" +if "nvidia" in _gfx_driver_packages: + packages = packages + " egl-wayland" +installation.add_additional_packages(packages) -- cgit v1.2.3-54-g00ecf From 2d4326b6c5dd117094dd68f533bb15e997ae1571 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:11:36 -0400 Subject: Rework how alacritty is installed for awesome --- profiles/applications/kde.py | 3 +++ profiles/awesome.py | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'profiles/applications/kde.py') diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py index af1e6597..150fc0e3 100644 --- a/profiles/applications/kde.py +++ b/profiles/applications/kde.py @@ -1,5 +1,8 @@ import archinstall + packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session" + if "nvidia" in _gfx_driver_packages: packages = packages + " egl-wayland" + installation.add_additional_packages(packages) diff --git a/profiles/awesome.py b/profiles/awesome.py index cbd52a3c..694a4f9d 100644 --- a/profiles/awesome.py +++ b/profiles/awesome.py @@ -6,7 +6,7 @@ is_top_level_profile = False # 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__ = ['nemo', 'gpicview-gtk3', 'scrot'] +__packages__ = ['nemo', 'gpicview-gtk3', 'scrot', 'alacritty'] def _prep_function(*args, **kwargs): """ @@ -35,9 +35,6 @@ if __name__ == 'awesome': installation.add_additional_packages(__packages__) - alacritty = archinstall.Application(installation, 'alacritty') - alacritty.install() - # TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead. with open(f'{installation.target}/etc/xdg/awesome/rc.lua', 'r') as fh: awesome_lua = fh.read() -- cgit v1.2.3-54-g00ecf From fd042053be741edaac8d967899d4b9cb1c4a913b Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:21:24 -0400 Subject: Rework KDE profile package installation --- profiles/applications/kde.py | 2 +- profiles/kde.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'profiles/applications/kde.py') diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py index 150fc0e3..a3332130 100644 --- a/profiles/applications/kde.py +++ b/profiles/applications/kde.py @@ -1,6 +1,6 @@ import archinstall -packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session" +packages = "" # Other packages for KDE are installed in the main profile now. if "nvidia" in _gfx_driver_packages: packages = packages + " egl-wayland" diff --git a/profiles/kde.py b/profiles/kde.py index 28460cbc..1c98237b 100644 --- a/profiles/kde.py +++ b/profiles/kde.py @@ -39,7 +39,10 @@ if __name__ == 'kde': # Install dependency profiles installation.install_profile('xorg') - # Install the application kde from the template under /applications/ + # Install the KDE packages + installation.add_additional_packages(__packages__) + + # Run KDE application configuration kde = archinstall.Application(installation, 'kde') kde.install() -- cgit v1.2.3-54-g00ecf From f9f359ab73dabb74543909af5e98adb6c56a189d Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 28 Apr 2021 11:30:30 -0400 Subject: This variable wasn't really needed. --- profiles/applications/kde.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'profiles/applications/kde.py') diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py index a3332130..eacba708 100644 --- a/profiles/applications/kde.py +++ b/profiles/applications/kde.py @@ -1,8 +1,6 @@ import archinstall -packages = "" # Other packages for KDE are installed in the main profile now. +# Other packages for KDE are installed in the main profile now. if "nvidia" in _gfx_driver_packages: - packages = packages + " egl-wayland" - -installation.add_additional_packages(packages) + installation.add_additional_packages("egl-wayland") -- cgit v1.2.3-54-g00ecf From 1238199ed8022fbfaedcf746527b5d8c1ad975b9 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:44:12 -0400 Subject: egl-wayland is small enough that conditionally installing it doesn't make a lot of sense --- profiles/applications/kde.py | 6 ------ profiles/kde.py | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 profiles/applications/kde.py (limited to 'profiles/applications/kde.py') diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py deleted file mode 100644 index eacba708..00000000 --- a/profiles/applications/kde.py +++ /dev/null @@ -1,6 +0,0 @@ -import archinstall - -# Other packages for KDE are installed in the main profile now. - -if "nvidia" in _gfx_driver_packages: - installation.add_additional_packages("egl-wayland") diff --git a/profiles/kde.py b/profiles/kde.py index 1c98237b..c8efdcde 100644 --- a/profiles/kde.py +++ b/profiles/kde.py @@ -4,7 +4,7 @@ import archinstall, os is_top_level_profile = False -__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session"] +__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session", "egl-wayland"] # TODO: Remove hard dependency of bash (due to .bash_profile) @@ -42,9 +42,5 @@ if __name__ == 'kde': # Install the KDE packages installation.add_additional_packages(__packages__) - # Run KDE application configuration - kde = archinstall.Application(installation, 'kde') - kde.install() - # Enable autostart of KDE for all users installation.enable_service('sddm') -- cgit v1.2.3-54-g00ecf