More miscellaneous fixes to get Gentoo going

2020-12-04 09:21:08 -06:00 · 2020-12-04 09:21:08 -06:00 · d0d4437cdd
commit d0d4437cdd
parent dff10b6aaa
3 changed files with 3 additions and 1 deletions
--- a/roles/desktop/files/portage/make.conf
+++ b/roles/desktop/files/portage/make.conf
@ -24,7 +24,7 @@ ACCEPT_LICENSE="*"
 EMERGE_DEFAULT_OPTS="--jobs 10"
 FEATURES="-network-sandbox"
 GENTOO_MIRRORS="http://distfiles.gentoo.org"
-VIDEO_CARDS="i915 amdgpu qxl radeon -nouveau"
+VIDEO_CARDS="i915 amdgpu qxl radeon"

 # Package configuration
 GRUB_PLATFORMS="emu efi-32 efi-64 pc"
--- a/roles/desktop/tasks/main.yml
+++ b/roles/desktop/tasks/main.yml
@ -13,5 +13,6 @@
 - name: configure plymouth
  alternatives: name=default.plymouth path=/usr/share/plymouth/themes/bgrt/bgrt.plymouth
  notify: regen initramfs
+  when: ansible_os_family != "Gentoo"
 - name: configure packages
  include_tasks: packages.yml
--- a/roles/desktop/tasks/packages.yml
+++ b/roles/desktop/tasks/packages.yml
@ -56,3 +56,4 @@
  when: ansible_os_family == "Gentoo"
 - name: configure pip3 packages
  pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}"
+  when: ansible_os_family != "Gentoo"