diff --git a/.config/lf/pv.sh b/.config/lf/pv.sh index 5f89860..2b8cfff 100755 --- a/.config/lf/pv.sh +++ b/.config/lf/pv.sh @@ -30,7 +30,7 @@ #*.png | *.svg | *.gif) convert "$1" jpg:- | jp2a - -b --width=$(($(tput cols)/2 - 10));; #*.mp4 | *.mkv | *.webm | *.avi | *.mpg | *.mpeg | *.ogv | *.flv | *.wmv | *.WMV) ffmpegthumbnailer -i "$1" -c jpeg -o - | jp2a - -b --width=$(($(tput cols)/2 - 10));; *.pdf) pdftotext "$1" -;; - *) highlight -O ansi "$1" || cat "$1";; + *) bat -f "$1";; #*) highlight -O ansi "$1" || cat "$1";; esac #fi diff --git a/.local/installers/artix-install.sh b/.local/installers/artix-install.sh index f305d37..a356f6c 100755 --- a/.local/installers/artix-install.sh +++ b/.local/installers/artix-install.sh @@ -8,18 +8,20 @@ echo " press return to begin installation. crtl + c to cancel" read input ##################################################################### -./artix/repo-enable.sh -./artix/config.sh -./artix/devel.sh -./artix/gaming.sh -./artix/runit-config.sh -./artix/wireless.sh +sh ./artix/repo-enable.sh +sh ./artix/config.sh +sh ./artix/devel.sh +sh ./artix/gaming.sh +sh ./artix/runit-config.sh +sh ./artix/wireless.sh sudo sh -c 'pacman -S - < artix/pkgs/base.txt' sudo sh -c 'pacman -S - < artix/pkgs/user.txt' sudo sh -c 'pacman -S - < artix/pkgs/wm.txt' sudo sh -c 'yay -S - < artix/pkgs/aur.txt' +#install local git repos, needed for wm.txt +sh ~/.local/scripts/install.sh add-repos ~/.local/installers/repos.txt #uncomment appropriate line for cpu type sudo pacman -S amd-ucode @@ -30,5 +32,4 @@ sudo pacman -S amd-ucode sudo mkinitcpio -P #rebuild kernel sudo grub-mkconfig -o /boot/grub/grub.cfg #update grub - -echo "installation finished." +echo "installation finished" diff --git a/.local/installers/artix/config.sh b/.local/installers/artix/config.sh index 6a0c92d..a640bbc 100755 --- a/.local/installers/artix/config.sh +++ b/.local/installers/artix/config.sh @@ -96,5 +96,4 @@ sudo sh -c 'echo "tmpfs /tmp tmpfs rw,nodev,nosuid,size=2G -#install local git repos -sh ~/.local/scripts/install.sh add-repos ~/.local/installers/repos.txt + diff --git a/.local/installers/artix/pkgs/aur.txt b/.local/installers/artix/pkgs/aur.txt index 61886e5..645f016 100644 --- a/.local/installers/artix/pkgs/aur.txt +++ b/.local/installers/artix/pkgs/aur.txt @@ -9,6 +9,4 @@ dashbinsh kjv-apocrypha pfetch sysrq-enabler -aur/chromium-extension-web-store -aur/chromium-widevine wlr-randr diff --git a/.local/installers/artix/pkgs/base.txt b/.local/installers/artix/pkgs/base.txt index 59337d3..7f4b01a 100644 --- a/.local/installers/artix/pkgs/base.txt +++ b/.local/installers/artix/pkgs/base.txt @@ -42,7 +42,7 @@ connman connman-gtk imagemagick ffmpegthumbnailer -highlight +bat python-pdftotext viu python-pywal @@ -56,3 +56,4 @@ chrony-runit dhcpcd-runit connman-runit socklog +python-pip diff --git a/.local/installers/artix/pkgs/user.txt b/.local/installers/artix/pkgs/user.txt index 75db30a..04855aa 100644 --- a/.local/installers/artix/pkgs/user.txt +++ b/.local/installers/artix/pkgs/user.txt @@ -14,12 +14,8 @@ opendoas zsh lynx newsboat -python-pip clang lxappearance qt5ct librewolf -ffmpeg4.4 -ungoogled-chromium -ublock-origin shellcheck diff --git a/.local/installers/artix/ungoogled-chromium.sh b/.local/installers/artix/ungoogled-chromium.sh new file mode 100755 index 0000000..4fc2c6d --- /dev/null +++ b/.local/installers/artix/ungoogled-chromium.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +echo "if this fails, you need to have universe repo enabled, and yay installed" + +CMD="-S" + +[ "$1" = "-R" ] && CMD="-Rs" + +sudo pacman "$CMD" ffmpeg4.4 +sudo pacman "$CMD" ungoogled-chromium +sudo pacman "$CMD" ublock-origin + +yay "$CMD" aur/chromium-extension-web-store +yay "$CMD" aur/chromium-widevine diff --git a/.local/installers/install.sh b/.local/installers/install.sh deleted file mode 100644 index 3181cb0..0000000 --- a/.local/installers/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -#TODO update this to work with new artix-install.sh - -. ~/.local/installers/void.sh - -core -extra -config -distro_specific_config - -sh ~/.local/installers/suckless-install.sh