From 99cf9a5e0eca63a986144e53733e4088b6e2239a Mon Sep 17 00:00:00 2001 From: Salt Date: Fri, 29 Jul 2022 12:13:22 -0500 Subject: [PATCH] Remove all mention of Gentoo SO LONG --- roles/desktop/files/portage/env/j1.conf | 3 - roles/desktop/files/portage/env/j2.conf | 3 - roles/desktop/files/portage/make.conf | 33 ----- .../package.accept_keywords/50-ansible | 13 -- .../files/portage/package.env/50-ansible | 3 - .../files/portage/package.use/50-ansible | 33 ----- .../files/portage/repos.conf/gentoo.conf | 11 -- .../portage/repos.conf/steam-overlay.conf | 10 -- roles/desktop/files/portage/sets/ansible | 114 ------------------ roles/desktop/tasks/packages.yml | 12 -- 10 files changed, 235 deletions(-) delete mode 100644 roles/desktop/files/portage/env/j1.conf delete mode 100644 roles/desktop/files/portage/env/j2.conf delete mode 100644 roles/desktop/files/portage/make.conf delete mode 100644 roles/desktop/files/portage/package.accept_keywords/50-ansible delete mode 100644 roles/desktop/files/portage/package.env/50-ansible delete mode 100644 roles/desktop/files/portage/package.use/50-ansible delete mode 100644 roles/desktop/files/portage/repos.conf/gentoo.conf delete mode 100644 roles/desktop/files/portage/repos.conf/steam-overlay.conf delete mode 100644 roles/desktop/files/portage/sets/ansible diff --git a/roles/desktop/files/portage/env/j1.conf b/roles/desktop/files/portage/env/j1.conf deleted file mode 100644 index 80eb237..0000000 --- a/roles/desktop/files/portage/env/j1.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:ft=bash -MAKEOPTS="-j1" -NINJAFLAGS="-j1" diff --git a/roles/desktop/files/portage/env/j2.conf b/roles/desktop/files/portage/env/j2.conf deleted file mode 100644 index ae26887..0000000 --- a/roles/desktop/files/portage/env/j2.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:ft=bash -MAKEOPTS="-j2" -NINJAFLAGS="-j2" diff --git a/roles/desktop/files/portage/make.conf b/roles/desktop/files/portage/make.conf deleted file mode 100644 index 56b8249..0000000 --- a/roles/desktop/files/portage/make.conf +++ /dev/null @@ -1,33 +0,0 @@ -# -# make.conf -# Configuration for Portage -# vim:ft=bash -# -# NOTE: DO NOT REMOVE ANY LINES STARTING WITH ansible: -# ANSIBLE USES THOSE TO INSERT MODIFICATIONS PROGRAMATICALLY -# - -# USE -USE="curl ffmpeg gnome-keyring gstreamer networkmanager opus pulseaudio systemd vulkan webp xinerama -bluetooth -elogind -test" -#ansible:use - -# Compilation configuration -# ABI_X86 is used to control multilib support -ABI_X86="64 32" -COMMON_FLAGS="-march=native -Os -pipe" -CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" -CFLAGS="${COMMON_FLAGS}" -CXXFLAGS="${COMMON_FLAGS}" -MAKEOPTS="-j8" - -# Portage configuration -ACCEPT_LICENSE="*" -EMERGE_DEFAULT_OPTS="-DNUu --backtrack 500 --jobs 10 --keep-going --tree --unordered-display" -FEATURES="candy cgroup -network-sandbox" -GENTOO_MIRRORS="http://distfiles.gentoo.org" -INPUT_DEVICES="libinput" -PORTAGE_NICENESS="3" -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/50-ansible b/roles/desktop/files/portage/package.accept_keywords/50-ansible deleted file mode 100644 index ceb368f..0000000 --- a/roles/desktop/files/portage/package.accept_keywords/50-ansible +++ /dev/null @@ -1,13 +0,0 @@ -games-emulation/dolphin ~amd64 -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 -media-sound/spotify ~amd64 -net-im/discord-bin ~amd64 -net-im/element-desktop-bin ~amd64 -net-im/slack ~amd64 -net-misc/zerotier ~amd64 -x11-misc/rofi ~amd64 diff --git a/roles/desktop/files/portage/package.env/50-ansible b/roles/desktop/files/portage/package.env/50-ansible deleted file mode 100644 index 6e7a4c1..0000000 --- a/roles/desktop/files/portage/package.env/50-ansible +++ /dev/null @@ -1,3 +0,0 @@ -net-libs/webkit-gtk j2.conf -www-client/chromium j2.conf -www-client/firefox j2.conf diff --git a/roles/desktop/files/portage/package.use/50-ansible b/roles/desktop/files/portage/package.use/50-ansible deleted file mode 100644 index 44bb160..0000000 --- a/roles/desktop/files/portage/package.use/50-ansible +++ /dev/null @@ -1,33 +0,0 @@ -app-admin/conky curl ical imlib iostats math rss vim-syntax wifi -app-admin/sudo offensive -app-emulation/libvirt libssh lxc -dev-java/openjdk -jbootstrap -dev-lang/mono minimal -dev-lang/python -bluetooth -dev-python/QtPy printsupport -dev-qt/qtmultimedia widgets -dev-qt/qtwebchannel qml -dev-qt/qtwebengine widgets -dev-qt/qtwidgets gtk -dev-vcs/git highlight -games-emulation/dolphin discord-presence -kde-frameworks/kitemmodels qml -lxde-base/* gtk3 -media-libs/libsdl2 haptic -media-libs/libvpx postproc -media-libs/mesa vulkan wayland -media-video/mpv archive bluray libmpv tools -net-dns/dnsmasq script -net-libs/nodejs inspector -net-libs/zeromq drafts -net-misc/networkmanager dhclient -net-misc/spice-gtk usbredir -sys-apps/dbus user-session -sys-libs/ncurses -gpm -sys-libs/zlib minizip -www-client/chromium -hangouts vaapi widevine -www-client/firefox hwaccel wifi -x11-base/xorg-server kdrive xephyr -x11-misc/polybar ipc network -x11-misc/rofi drun -x11-wm/bspwm examples diff --git a/roles/desktop/files/portage/repos.conf/gentoo.conf b/roles/desktop/files/portage/repos.conf/gentoo.conf deleted file mode 100644 index fb32fef..0000000 --- a/roles/desktop/files/portage/repos.conf/gentoo.conf +++ /dev/null @@ -1,11 +0,0 @@ -# vim:ft=dosini -[DEFAULT] -main-repo = gentoo - -[gentoo] -location = /usr/portage -#sync-depth = 1 -sync-type = git -sync-uri = https://github.com/gentoo-mirror/gentoo.git -sync-git-verify-commit-signature = true -auto-sync = yes diff --git a/roles/desktop/files/portage/repos.conf/steam-overlay.conf b/roles/desktop/files/portage/repos.conf/steam-overlay.conf deleted file mode 100644 index 27c7a81..0000000 --- a/roles/desktop/files/portage/repos.conf/steam-overlay.conf +++ /dev/null @@ -1,10 +0,0 @@ -[steam-overlay] - -# Gentoo overlay for Valve's Steam client and Steam-based games. -# Maintainer: anyc (https://github.com/anyc) - -location = /usr/local/portage/steam-overlay -sync-type = git -sync-uri = https://github.com/anyc/steam-overlay.git -priority = 50 -auto-sync = Yes diff --git a/roles/desktop/files/portage/sets/ansible b/roles/desktop/files/portage/sets/ansible deleted file mode 100644 index 4cf4063..0000000 --- a/roles/desktop/files/portage/sets/ansible +++ /dev/null @@ -1,114 +0,0 @@ -# {{ ansible_managed }} - -# System apps -app-admin/ansible -app-admin/ansible-base -app-admin/pwgen -app-admin/sudo -app-editors/vim -app-emulation/libvirt -app-emulation/virt-manager -app-emulation/wine-vanilla -app-emulation/winetricks -app-portage/gentoolkit -app-text/highlight -app-text/tree - -dev-java/openjdk:8 -dev-lang/mono -dev-python/pip -dev-python/pyusb -dev-python/setuptools -dev-python/virtualenv -dev-util/vulkan-tools -dev-vcs/git - -media-fonts/fontawesome -media-fonts/ibm-plex -media-fonts/inconsolata -media-fonts/liberation-fonts -media-fonts/noto -media-fonts/roboto -media-libs/mesa - -net-analyzer/nmap -net-misc/networkmanager -net-misc/zerotier -net-p2p/syncthing -net-vpn/networkmanager-openconnect -net-vpn/networkmanager-openvpn - -sys-boot/grub:2 -sys-fs/dosfstools -sys-fs/e2fsprogs -sys-fs/ncdu -sys-fs/xfsprogs -sys-kernel/gentoo-kernel -sys-kernel/installkernel-gentoo -sys-kernel/linux-firmware -sys-process/cronie -sys-process/htop - -# User apps -app-admin/keepassxc -app-misc/joy2key - -dev-lua/luacheck -dev-util/android-tools - -games-emulation/dolphin -games-util/lutris -games-util/steam-meta - -kde-apps/dolphin -kde-apps/filelight -kde-apps/kcolorchooser -kde-apps/konsole -kde-frameworks/kinit -kde-frameworks/plasma -kde-plasma/breeze -kde-plasma/breeze-grub -kde-plasma/breeze-gtk -kde-plasma/plasma-desktop -kde-plasma/systemsettings - -media-gfx/gimp -media-gfx/imagemagick -media-sound/spotify -media-video/ffmpeg -media-video/mpv - -net-im/discord-bin -net-im/element-desktop-bin -net-im/slack -net-misc/nextcloud-client -net-p2p/qbittorrent - -www-client/firefox - -x11-misc/pcmanfm -x11-misc/zim - -# Desktop environment -app-admin/conky - -kde-frameworks/breeze-icons -kde-plasma/sddm-kcm - -media-sound/pavucontrol-qt - -x11-apps/xbacklight -x11-apps/xsetroot -x11-base/xorg-drivers -x11-base/xorg-server -x11-misc/dunst -x11-misc/nitrogen -x11-misc/picom -x11-misc/polybar -x11-misc/qt5ct -x11-misc/redshift -x11-misc/rofi -x11-misc/sddm -x11-misc/xdotool -x11-themes/papirus-icon-theme -x11-wm/bspwm diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml index 733f6be..61d6cfd 100644 --- a/roles/desktop/tasks/packages.yml +++ b/roles/desktop/tasks/packages.yml @@ -27,18 +27,6 @@ ansible.builtin.apt: deb="{{ item }}" loop: "{{ desktop_apt_debs + desktop_apt_debs_extra }}" when: ansible_pkg_mgr == "apt" -- name: configure portage - block: - # Portage is very complex, so we sync an entire known good configuration tree - # Note that this also syncs over the @ansible package set - - name: sync portage configs - 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 - ansible.builtin.file: path=/gentoostrap.sh state=absent - - name: remove gentoostrap package.use - ansible.builtin.file: path=/etc/portage/package.use/gentoostrap state=absent - when: ansible_os_family == "Gentoo" - name: configure pip3 packages ansible.builtin.pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}" when: ansible_os_family != "Gentoo"