From 7824679f2ef0bb29e4ac26ea0761c41979a824e0 Mon Sep 17 00:00:00 2001 From: Salt Date: Fri, 4 Dec 2020 09:25:52 -0600 Subject: [PATCH] More Gentoo tweaking --- roles/desktop/files/portage/make.conf | 4 +-- .../package.accept_keywords/games-util | 5 ++++ .../files/portage/package.use/dev-lang | 3 +- .../desktop/files/portage/package.use/dev-qt | 2 ++ .../files/portage/package.use/media-libs | 4 ++- .../desktop/files/portage/package.use/net-dns | 1 + .../files/portage/package.use/net-libs | 1 + .../files/portage/package.use/net-misc | 1 + .../files/portage/package.use/sys-libs | 1 + roles/desktop/files/portage/sets/ansible | 1 - roles/desktop/tasks/packages.yml | 4 ++- site.yml | 30 +++++++++++++++++++ 12 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 roles/desktop/files/portage/package.use/dev-qt create mode 100644 roles/desktop/files/portage/package.use/net-dns create mode 100644 roles/desktop/files/portage/package.use/net-libs diff --git a/roles/desktop/files/portage/make.conf b/roles/desktop/files/portage/make.conf index 919e92e..c353d5c 100644 --- a/roles/desktop/files/portage/make.conf +++ b/roles/desktop/files/portage/make.conf @@ -8,7 +8,7 @@ # # USE -USE="curl ffmpeg gstreamer networkmanager pulseaudio systemd vulkan webp xinerama -elogind -test" +USE="curl ffmpeg gnome-keyring gstreamer networkmanager opus pulseaudio systemd vulkan webp xinerama -elogind -test" #ansible:use # Compilation configuration @@ -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" +VIDEO_CARDS="amdgpu i915 intel qxl radeon" # Package configuration GRUB_PLATFORMS="emu efi-32 efi-64 pc" diff --git a/roles/desktop/files/portage/package.accept_keywords/games-util b/roles/desktop/files/portage/package.accept_keywords/games-util index 851cd0e..68a8bec 100644 --- a/roles/desktop/files/portage/package.accept_keywords/games-util +++ b/roles/desktop/files/portage/package.accept_keywords/games-util @@ -1 +1,6 @@ +games-util/game-device-udev-rules ~amd64 games-util/lutris ~amd64 +games-util/steam-client-meta ~amd64 +games-util/steam-games-meta ~amd64 +games-util/steam-launcher ~amd64 +games-util/steam-meta ~amd64 diff --git a/roles/desktop/files/portage/package.use/dev-lang b/roles/desktop/files/portage/package.use/dev-lang index ed4c38e..f98aacb 100644 --- a/roles/desktop/files/portage/package.use/dev-lang +++ b/roles/desktop/files/portage/package.use/dev-lang @@ -1 +1,2 @@ -dev-lang/python -bluetooth -sqlite +dev-lang/mono minimal +dev-lang/python -bluetooth diff --git a/roles/desktop/files/portage/package.use/dev-qt b/roles/desktop/files/portage/package.use/dev-qt new file mode 100644 index 0000000..f9b5ba3 --- /dev/null +++ b/roles/desktop/files/portage/package.use/dev-qt @@ -0,0 +1,2 @@ +dev-qt/qtwebchannel qml +dev-qt/qtwebengine widgets diff --git a/roles/desktop/files/portage/package.use/media-libs b/roles/desktop/files/portage/package.use/media-libs index 3e23e53..6fd7709 100644 --- a/roles/desktop/files/portage/package.use/media-libs +++ b/roles/desktop/files/portage/package.use/media-libs @@ -1 +1,3 @@ -media-libs/mesa d3d9 vulkan +media-libs/libsdl2 haptic +media-libs/libvpx postproc +media-libs/mesa vulkan diff --git a/roles/desktop/files/portage/package.use/net-dns b/roles/desktop/files/portage/package.use/net-dns new file mode 100644 index 0000000..45ae97d --- /dev/null +++ b/roles/desktop/files/portage/package.use/net-dns @@ -0,0 +1 @@ +net-dns/dnsmasq script diff --git a/roles/desktop/files/portage/package.use/net-libs b/roles/desktop/files/portage/package.use/net-libs new file mode 100644 index 0000000..6379954 --- /dev/null +++ b/roles/desktop/files/portage/package.use/net-libs @@ -0,0 +1 @@ +net-libs/nodejs inspector diff --git a/roles/desktop/files/portage/package.use/net-misc b/roles/desktop/files/portage/package.use/net-misc index cad64c6..265ab04 100644 --- a/roles/desktop/files/portage/package.use/net-misc +++ b/roles/desktop/files/portage/package.use/net-misc @@ -1 +1,2 @@ net-misc/networkmanager dhclient +net-misc/spice-gtk usbredir diff --git a/roles/desktop/files/portage/package.use/sys-libs b/roles/desktop/files/portage/package.use/sys-libs index e979cea..bae9d80 100644 --- a/roles/desktop/files/portage/package.use/sys-libs +++ b/roles/desktop/files/portage/package.use/sys-libs @@ -1 +1,2 @@ sys-libs/ncurses -gpm +sys-libs/zlib minizip diff --git a/roles/desktop/files/portage/sets/ansible b/roles/desktop/files/portage/sets/ansible index 4c7ec3f..2fa8d3f 100644 --- a/roles/desktop/files/portage/sets/ansible +++ b/roles/desktop/files/portage/sets/ansible @@ -67,7 +67,6 @@ media-video/mpv net-im/element-desktop-bin net-im/slack -net-im/telegram-desktop net-misc/nextcloud-client net-p2p/qbittorrent-4.2.5-r2 diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml index 425d9d0..8149413 100644 --- a/roles/desktop/tasks/packages.yml +++ b/roles/desktop/tasks/packages.yml @@ -52,7 +52,9 @@ synchronize: src="portage/" dest="/etc/portage/" # This is my bootstrap script, which can cause damage if invoked by root again, so we remove it - name: remove gentoostrap - file: path="/gentoostrap.sh" state=absent + file: path=/gentoostrap.sh state=absent + - name: remove gentoostrap package.use + file: path=/etc/portage/package.use/gentoostrap state=absent when: ansible_os_family == "Gentoo" - name: configure pip3 packages pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}" diff --git a/site.yml b/site.yml index ca8b5f6..1e66121 100755 --- a/site.yml +++ b/site.yml @@ -10,6 +10,36 @@ - role: ansible-pull become: yes tags: [ ansible, common ] +- hosts: gentoo + post_tasks: + - name: confirm liblzo2 dllmap + lineinfile: + path: /etc/mono/config + insertafter: "" + line: '' + become: yes + tags: [ desktop, mono ] + - name: give python3 cap_sys_ptrace + capabilities: + path: /usr/bin/python3.8 + # Required for Randovania to access Dolphin memory + capability: cap_sys_ptrace+eip + become: yes + tags: [ desktop, python, cap ] + roles: + - role: desktop + become: yes + tags: [ desktop ] + - role: grub + become: yes + tags: [ desktop, grub ] + - role: udev + vars: + udev_rules: + # Switch RCM stuff + - SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0664", GROUP="plugdev" + become: yes + tags: [ desktop, udev ] # Home desktops - hosts: desktop post_tasks: