diff --git a/commit.sh b/commit.sh index 1dc81ce..84a680d 100755 --- a/commit.sh +++ b/commit.sh @@ -1,14 +1,9 @@ #!/bin/sh # commit and push -git add * +git add src/* # update -if [ command -v lspci > /dev/null ]; then - lspci | grep -q "comet lake" && git commit -am "Update gentoo configuration (desktop)." - lspci | grep -q "2nd generation core processor" && git commit -am "Update gentoo configuration (laptop)." -else - git commit -am "Update Gentoo configuration." -fi +git commit -am "Update Gentoo configuration." git push diff --git a/src/updatedots.sh b/src/updatedots.sh index 3e46421..c796d8a 100755 --- a/src/updatedots.sh +++ b/src/updatedots.sh @@ -2,27 +2,31 @@ # updatedots if [ -f "/etc/portage/make.conf" ]; then - cp /etc/portage/make.conf etc/portage/make.conf && echo "Updated make.conf (1/6)" + cp /etc/portage/make.conf etc/portage/make.conf && echo "Updated make.conf (1/7)" fi if [ -f "/etc/portage/package.use" ]; then - cp /etc/portage/package.use etc/portage/package.use && echo "Updated package.use (2/6)" + cp /etc/portage/package.use etc/portage/package.use && echo "Updated package.use (2/7)" fi if [ -f "/etc/portage/package.license" ]; then - cp /etc/portage/package.license etc/portage/package.license && echo "Updated package.license (3/6)" + cp /etc/portage/package.license etc/portage/package.license && echo "Updated package.license (3/7)" fi if [ -f "/etc/portage/package.accept_keywords" ]; then - cp /etc/portage/package.accept_keywords etc/portage/package.accept_keywords && echo "Updated package.accept_keywords (4/6)" + cp /etc/portage/package.accept_keywords etc/portage/package.accept_keywords && echo "Updated package.accept_keywords (4/7)" fi if [ -f "/etc/portage/package.mask" ]; then - cp /etc/portage/package.mask etc/portage/package.mask && echo "Updated package.mask (5/6)" + cp /etc/portage/package.mask etc/portage/package.mask && echo "Updated package.mask (5/7)" fi if [ -f "/etc/portage/package.unmask" ]; then - cp -r /etc/portage/package.unmask etc/portage/package.unmask && echo "Updated package.unmask (6/6)" + cp /etc/portage/package.unmask etc/portage/package.unmask && echo "Updated package.unmask (6/7)" +fi + +if [ -f "/var/lib/portage/world" ]; then + cp /var/lib/portage/world var/lib/portage/world && echo "Updated world (7/7)" fi echo "Complete!" diff --git a/src/var/lib/portage/world b/src/var/lib/portage/world new file mode 100644 index 0000000..bdbb742 --- /dev/null +++ b/src/var/lib/portage/world @@ -0,0 +1,65 @@ +app-admin/conky +app-admin/doas +app-admin/metalog +app-arch/lz4 +app-crypt/gnupg +app-editors/neovim +app-emulation/wine-proton +app-eselect/eselect-repository +app-misc/gsimplecal +app-misc/neofetch +app-misc/smatrix +app-misc/tmux +app-misc/vifm-ueberzug +app-text/tree +dev-lang/php +dev-python/pkgconfig +dev-util/github-cli +dev-util/pkgdev +dev-util/vulkan-tools +games-util/steam-launcher +mail-client/mutt-wizard +mail-client/neomutt +media-fonts/cascadia-code +media-fonts/dejavu-sans-code +media-fonts/fantasque-sans-mono +media-fonts/fira-code +media-fonts/iosevka +media-gfx/ueberzug +media-libs/imlib2 +media-libs/libsixel +media-libs/mesa +media-libs/vulkan-loader +media-sound/bluez-alsa +media-sound/pulsemixer +media-sound/shntool +media-video/ffmpeg +media-video/ffmpegthumbnailer +net-misc/chrony +net-misc/dhcpcd +net-misc/iron +net-news/sfeed +net-wireless/bluez +net-wireless/bluez-tools +sys-apps/lm-sensors +sys-apps/mlocate +sys-apps/usbutils +sys-boot/grub +sys-fs/btrfs-progs +sys-fs/dosfstools +sys-fs/genfstab +sys-kernel/genkernel +sys-kernel/gentoo-sources +sys-kernel/linux-firmware +www-client/chromium-bin +www-client/lynx +www-client/qutebrowser +x11-apps/xinit +x11-base/xorg-server +x11-misc/barrier +x11-misc/j4-dmenu-desktop-spde +x11-misc/spde +x11-misc/xdotool +x11-terms/st-spde +x11-wm/libspeedwm +x11-wm/speedwm diff --git a/update.sh b/update.sh index 698d6f7..6c2d88d 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,7 @@ #!/bin/sh cd src + ./updatedots.sh && echo "Updated Portage configs (1/2)" ./mkpkglist.sh && echo "Updated package list (2/2)"