mitchell
/
dotfiles
mirror of https://github.com/mitchell/dotfiles.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Install pikaur in terminal_env instead of desktop_env

This commit is contained in:
mitchell 2020-11-11 19:00:36 -05:00
parent 0096c650a4
commit 81d5491278
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
provision_linux
View File

@ -1,5 +1,4 @@
#!/usr/bin/env fish #!/usr/bin/env fish
# Source: https://github.com/mitchell/swim.fish
### Config ### ### Config ###
@ -21,6 +20,22 @@ function provision_default -d 'Provisioning terminal, desktop, and m-net'
end end
function provision_terminal_env -d 'Install base terminal utilities and sync configurations' function provision_terminal_env -d 'Install base terminal utilities and sync configurations'
if test $distro = arch
log 'Installing pikaur from AUR'
install_pkgs --needed base-devel
set -l cwd (pwd)
set -l tmp_dir (mktemp --directory)
git clone https://aur.archlinux.org/pikaur.git $tmp_dir
and cd $tmp_dir
and makepkg --clean --install --rmdeps --syncdeps --noconfirm
cd $cwd
rm -rf $tmp_dir
end
set -l base_pkgs \ set -l base_pkgs \
fish \ fish \
git \ git \
@ -79,7 +94,8 @@ function provision_desktop_env -d 'Install base desktop utilities and configure
ttf-jetbrains-mono \ ttf-jetbrains-mono \
pavucontrol \ pavucontrol \
pulseaudio \ pulseaudio \
wmname wmname \
polybar
set -l debian_pkgs \ set -l debian_pkgs \
$base_pkgs \ $base_pkgs \
@ -116,25 +132,6 @@ function provision_desktop_env -d 'Install base desktop utilities and configure
rm -r $tmp_dir rm -r $tmp_dir
end end
if test $distro = arch
log 'Installing pikaur from AUR'
install_pkgs --needed base-devel
set -l cwd (pwd)
set -l tmp_dir (mktemp --directory)
git clone https://aur.archlinux.org/pikaur.git $tmp_dir
and cd $tmp_dir
and makepkg --clean --install --rmdeps --syncdeps --noconfirm
and log 'Installing polybar from AUR'
and pikaur --sync --noconfirm polybar
cd $cwd
rm -rf $tmp_dir
end
log 'Setting gtk theme' log 'Setting gtk theme'
mkdir ~/.config/gtk-3.0 mkdir ~/.config/gtk-3.0
echo " echo "
@ -207,8 +204,14 @@ end
function install_pkgs -S function install_pkgs -S
switch $distro switch $distro
case arch case arch
sudo pacman --sync --refresh --sysupgrade --noconfirm set -l cmd pacman
sudo pacman --sync --noconfirm $arch_pkgs $argv
if command -q pikaur
set cmd pikaur
end
sudo $cmd --sync --refresh --sysupgrade --noconfirm
sudo $cmd --sync --noconfirm $arch_pkgs $argv
case debian case debian
sudo apt-get update >/dev/null 2>&1 sudo apt-get update >/dev/null 2>&1
sudo apt-get upgrade --yes sudo apt-get upgrade --yes