diff --git a/src/larbs.sh b/src/larbs.sh index 81c5cab..e29f4fe 100755 --- a/src/larbs.sh +++ b/src/larbs.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "LARBS started $(date)" >> /tmp/LARBS.log && chmod 777 /tmp/LARBS.log - pacman -S --noconfirm --needed dialog || (echo "Error at script start: Are you sure you're running this as the root user? Are you sure you're using an Arch-based distro? ;-) Are you sure you have an internet connection?" && exit) dialog --title "Welcome!" --msgbox "Welcome to Luke's Auto-Rice Bootstrapping Script!\n\nThis script will automatically install a fully-featured i3wm Arch Linux desktop, which I use as my main machine.\n\n-Luke" 10 60 @@ -32,7 +30,7 @@ options=(X "LaTeX packages" off F "Fonts for unicode and other languages" off T "Transmission torrent client" off D "Music visualizers and decoration" off - P "Pandoc for document management" off + P "Pandoc and R/Rmarkdown" off ) choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) @@ -78,6 +76,8 @@ make >/dev/tty6 make install >/dev/tty6 cd /tmp +# R markdown install. + dialog --infobox "Enabling Network Manager..." 4 40 systemctl enable NetworkManager systemctl start NetworkManager diff --git a/src/larbs_user.sh b/src/larbs_user.sh index 3bc8e1f..cce17c8 100755 --- a/src/larbs_user.sh +++ b/src/larbs_user.sh @@ -12,17 +12,11 @@ if [[ $qm = *"$arg"* ]]; then echo $arg is already installed. else echo $arg not installed. - echo Now installing $arg... - (packer --noconfirm -S $arg && echo $arg now installed) || (aurinstall $arg && echo $arg now installed) + packer --noconfirm -S $arg >/dev/null || aurinstall $arg fi done } -echo "Adjusting config files for your internet interfaces..." -wifi=$(ls /sys/class/net | grep wl) -eth=$(ls /sys/class/net | grep eth) -sed -e "s/wlp3s0/$wifi/g; s/enp0s25/$eth/g" /home/$(whoami)/.config/polybar/config /home/$(whoami)/.bashrc - dialog --infobox "Installing \"packer\", an AUR helper..." 10 60 aurcheck packer >/dev/null @@ -41,6 +35,12 @@ git clone https://github.com/lukesmithxyz/voidrice.git >/dev/null && rsync -va voidrice/ /home/$(whoami) >/dev/null && rm -rf voidrice >/dev/null +dialog --infobox "Now compiling polybar. This is the last program, but may take some time..." 10 60 +wifi=$(ls /sys/class/net | grep wl) +eth=$(ls /sys/class/net | grep eth) +sed -e "s/wlp3s0/$wifi/g; s/enp0s25/$eth/g" /home/$(whoami)/.config/polybar/config /home/$(whoami)/.bashrc +packer --noconfig -S polybar + echo Downloading email setup... git clone https://github.com/lukesmithxyz/mutt-wizard.git /home/$(whoami)/.config/mutt >/dev/null diff --git a/src/progs.csv b/src/progs.csv index eef6140..6691039 100644 --- a/src/progs.csv +++ b/src/progs.csv @@ -14,6 +14,7 @@ dosfstools,,file system compatibility, emacs,E,everything, exfat-utils,,file system compatibility, feh,,image viewer, +figlet,D,text decoration, ffmpeg,,audio/video recording and splicing, fzf,r,ranger fuzzy finder, gimp,G,image modification, @@ -23,7 +24,7 @@ highlight,r,ranger previews highlighted, htop-vim-git,D,system info, i3-gaps,,window manager, i3lock,,screen lock, -imagemagick,,"image conversion and modification, lock screen", +imagemagick,D,"image conversion and modification, lock screen", libcaca,r,, libreoffice-fresh,L,office suite, mediainfo,r,ranger audio/video info preview, @@ -49,7 +50,6 @@ packer,,AUR manager, pamixer,,audio system control, pandoc,P,file conversion, pandoc-citeproc,P,, -polybar,p,status bar, poppler,r,ranger pdf previews, projectm-pulseaudio,D,music/audio visualizer, pulseaudio,,audio system, @@ -57,14 +57,14 @@ pulseaudio-alsa,,audio system, python-dbus,,, python-gobject,,, qutebrowser,,default browser, -r,,statistics and calculator, +r,P,statistics and calculator, ranger,r,file manager, rofi,,command runner, rsync,,, sc-im,,spreadsheet manager, screenfetch,D,system stats, screenkey,,screencasting keyboard view, -scrot,,screenshots, +scrot,D,screenshots, siji-git,p,polybar font symbols, speedometer,,internet traffic view, texlive-lang,X,LaTeX packages, @@ -82,7 +82,7 @@ urlview,,url parser for terminal apps, vim,,text editor, vim-live-latex-preview,X,latex preview, vim-pathogen,,vim package manager, -w3m,,, +w3m,?,, wget,,, wireless_tools,p,polybar wifi module, xfce-theme-blackbird,,dark theme,