From f062d118c2221302d0459978be70a3e456578818 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Thu, 10 Nov 2022 20:59:41 +0100 Subject: [PATCH] [scripts] feat: gentoo is the default distro --- .config/pacman/hooks/cache_cleanup.hook | 12 --- .config/pacman/hooks/dashbinsh.hook | 11 --- .config/pacman/hooks/pkglist.hook | 10 --- .config/paru/paru.conf | 29 ------- .config/paru/pkglist.txt | 110 ------------------------ .local/bin/fetch | 35 ++++---- 6 files changed, 18 insertions(+), 189 deletions(-) delete mode 100644 .config/pacman/hooks/cache_cleanup.hook delete mode 100644 .config/pacman/hooks/dashbinsh.hook delete mode 100644 .config/pacman/hooks/pkglist.hook delete mode 100644 .config/paru/paru.conf delete mode 100644 .config/paru/pkglist.txt diff --git a/.config/pacman/hooks/cache_cleanup.hook b/.config/pacman/hooks/cache_cleanup.hook deleted file mode 100644 index 358f02f..0000000 --- a/.config/pacman/hooks/cache_cleanup.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Operation = Remove -Operation = Install -Operation = Upgrade -Type = Package -Target = * - -[Action] -Description = Keep the last cache and the currently installed... -Depends = pacman-contrib -When = PostTransaction -Exec = /usr/bin/paccache -rvk2 diff --git a/.config/pacman/hooks/dashbinsh.hook b/.config/pacman/hooks/dashbinsh.hook deleted file mode 100644 index ed08b69..0000000 --- a/.config/pacman/hooks/dashbinsh.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = Package -Operation = Install -Operation = Upgrade -Target = bash - -[Action] -Description = Re-pointing /bin/sh symlink to dash... -When = PostTransaction -Exec = /usr/bin/ln -sfT dash /usr/bin/sh -Depends = dash diff --git a/.config/pacman/hooks/pkglist.hook b/.config/pacman/hooks/pkglist.hook deleted file mode 100644 index a24d05a..0000000 --- a/.config/pacman/hooks/pkglist.hook +++ /dev/null @@ -1,10 +0,0 @@ -[Trigger] -Operation = Remove -Operation = Install -Type = Package -Target = * - -[Action] -Description = Update the pkglist... -When = PostTransaction -Exec = /bin/sh -c '/usr/bin/pacman -Qqe > /home/swytch/.config/paru/pkglist.txt' diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf deleted file mode 100644 index fea7ea6..0000000 --- a/.config/paru/paru.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -# $PARU_CONF -# /etc/paru.conf -# ~/.config/paru/paru.conf -# -# See the paru.conf(5) manpage for options - -# -# GENERAL OPTIONS -# -[options] -PgpFetch -Devel -Provides -DevelSuffixes = -git -cvs -svn -bzr -darcs -always -BottomUp -RemoveMake -SudoLoop -#UseAsk -#CombinedUpgrade -#CleanAfter -#UpgradeMenu -NewsOnUpgrade - -# -# Binary OPTIONS -# -#[bin] -#FileManager = vifm diff --git a/.config/paru/pkglist.txt b/.config/paru/pkglist.txt deleted file mode 100644 index 136a578..0000000 --- a/.config/paru/pkglist.txt +++ /dev/null @@ -1,110 +0,0 @@ -abcde -abook -adobe-source-han-sans-cn-fonts -adobe-source-han-sans-jp-fonts -alsa-plugins -alsa-utils -android-tools -android-udev -arandr -autoconf -automake -autorandr -base -beets -binutils -bison -capitaine-cursors -cdparanoia -clang -cmake -cronie -dash -dunst -efibootmgr -fakeroot -file -findutils -firefox -flex -gawk -gcc -gettext -git -grep -groff -grub -gsasl -gzip -htop -imagemagick -isync -iwd -jedi-language-server -libnotify -libtool -linux -linux-firmware -linux-lts -lynx -m4 -make -man-db -mpc -mpd -mpv -msmtp -ncmpcpp -neomutt -ninja -nnn -notmuch -pacman -pacman-contrib -pam-gnupg -paru -pass -patch -pkgconf -pulseaudio-alsa -pulsemixer -python-eyed3 -python-requests -redshift -sed -shotgun -sox -sudo -sxhkd -sxiv -texinfo -texlab -texlive-bibtexextra -texlive-core -texlive-latexextra -transmission-cli -tree-sitter -tremc -ttf-dejavu -ttf-fira-sans -ttf-iosevka-fixed-slab -ttf-nerd-fonts-symbols-mono -unzip -upower -usbutils -which -xcape -xclip -xf86-video-intel -xorg-server -xorg-xinit -xorg-xinput -xorg-xsetroot -xss-lock -xwallpaper -zathura -zathura-pdf-mupdf -zip -zsh -zsh-history-substring-search -zsh-syntax-highlighting diff --git a/.local/bin/fetch b/.local/bin/fetch index 254c08b..487a8ab 100755 --- a/.local/bin/fetch +++ b/.local/bin/fetch @@ -13,11 +13,12 @@ ## INFO # $USER is already defined -host="$(cat /etc/hostname)" -os='Arch Linux' +host="$(cat /etc/conf.d/hostname | awk -F'"' '{ printf $2 }')" +cpu="$(grep "name" /proc/cpuinfo | uniq | sed -e 's/.*: //' -e 's/ .-Core.*//')" +os="Gentoo" kernel="$(uname -sr)" uptime="$(uptime -p | sed 's/up //')" -packages="$(pacman -Q | wc -l)" +packages="$(printf '%s\n' /var/db/pkg/*/* | wc -l)" shell="$($SHELL --version | sed -e 's/(.*)//')" wm="$(tail -n 1 "$XDG_CONFIG_HOME/X11/xinitrc" | rev | cut -d ' ' -f 1 | rev)" @@ -61,20 +62,20 @@ if [ -x "$(command -v tput)" ]; then fi # you can change these -lc="${bold}${green}" # labels -nc="${bold}${red}" # user and hostname -ic="${white}" # info -a0="${blue}" # first arch color -a1="${cyan}" # second arch color +lc="${bold}${magenta}" # labels +nc="${bold}${magenta}" # user and hostname +ic="${reset}${white}" # info +a0="${reset}${magenta}" # first gentoo color +a1="${reset}${white}" # second logo color cat <