diff --git a/arch/base.deps b/arch/base similarity index 100% rename from arch/base.deps rename to arch/base diff --git a/arch/i3.deps b/arch/i3 similarity index 79% rename from arch/i3.deps rename to arch/i3 index b5546e9..49a74bc 100644 --- a/arch/i3.deps +++ b/arch/i3 @@ -1,3 +1,5 @@ +picom +polybar feh imagemagick rofi diff --git a/arch/nvim.deps b/arch/nvim similarity index 94% rename from arch/nvim.deps rename to arch/nvim index c5b666a..b1336a6 100644 --- a/arch/nvim.deps +++ b/arch/nvim @@ -8,6 +8,4 @@ typescript-language-server lua-language-server rust-analyzer # various tools -npm -yarn xclip diff --git a/bin/arch_package_installer.sh b/bin/arch_package_installer.sh new file mode 100755 index 0000000..50299e5 --- /dev/null +++ b/bin/arch_package_installer.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +# Expects a file with pacakge names on newlines in $1 +# Will skip lines beginning in a # +# +# Rationale: +# I hated how long it took to extract cached AUR packages just to tell me that +# it is up to date and skip installation. +# This helper loops over arguments and installs only packages not already on the system. +# Then the built in package manager can maintain these packages + +packages=`cat "$1" | grep -v '#'` + +for package in "$packages" ; do + echo "$package" + continue + needed=`yay -Qi "$package" 2>&1 >/dev/null` + [ -n "$needed" ] && yay --sudoloop --nodiffmenu --noeditmenu --nocleanmenu --noupgrademenu -S "$package" +done diff --git a/meta/configs/arch.base.yaml b/meta/configs/arch.base.yaml index bee1e10..c3fef3c 100644 --- a/meta/configs/arch.base.yaml +++ b/meta/configs/arch.base.yaml @@ -1,6 +1,6 @@ - shell: - [arch/yay_installer, Installing yay] - - - command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S `cat arch/base.deps | grep -v '#'`" - description: "Installing base dependancies" + - [bin/arch_package_installer.sh arch/base, installing base dependancies] + #command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S `cat arch/base.deps | grep -v '#'`" + #description: "Installing base dependancies" diff --git a/meta/configs/arch.i3.yaml b/meta/configs/arch.i3.yaml index 5a94053..6ab9164 100644 --- a/meta/configs/arch.i3.yaml +++ b/meta/configs/arch.i3.yaml @@ -1,4 +1,4 @@ - shell: - - - command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S `cat arch/i3.deps | grep -v '#'`" - description: "Installing i3 dependancies" + - [bin/arch_package_installer.sh arch/i3, Installing i3 dependancies] + #command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S `cat arch/i3.deps | grep -v '#'`" + #description: "Installing i3 dependancies" diff --git a/meta/configs/arch.nvim.yaml b/meta/configs/arch.nvim.yaml index f9ecc76..a473abe 100644 --- a/meta/configs/arch.nvim.yaml +++ b/meta/configs/arch.nvim.yaml @@ -1,7 +1,7 @@ - shell: - - - command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S `cat arch/nvim.deps | grep -v '#'`" - description: "Installing base dependancies" - stderr: true - stdout: true + - [bin/arch_package_installer.sh arch/nvim, Installing nvim dependancies] + # command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S `cat arch/nvim.deps | grep -v '#'`" + # description: "Installing base dependancies" + # stderr: true + # stdout: true diff --git a/meta/configs/arch.picom.yaml b/meta/configs/arch.picom.yaml deleted file mode 100644 index 3a1aef9..0000000 --- a/meta/configs/arch.picom.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- shell: - - - command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S picom" - description: "Installing picom" - diff --git a/meta/configs/arch.polybar.yaml b/meta/configs/arch.polybar.yaml deleted file mode 100644 index e7dc953..0000000 --- a/meta/configs/arch.polybar.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- shell: - - - command: "yay --sudoloop --nodiffmenu --noeditmenu --noupgrademenu --nocleanmenu --noredownload --norebuild --useask --needed -S polybar" - description: "Installing polybar" - diff --git a/meta/configs/neovim.yaml b/meta/configs/neovim.yaml index d7f3760..6bd0908 100644 --- a/meta/configs/neovim.yaml +++ b/meta/configs/neovim.yaml @@ -3,4 +3,5 @@ ~/.local/share/nvim/site: editors/neovim/site - shell: - - [cd editors/neovim/site/pack/markdown/start/markdown-preview.nvim && yarn install && NODE_OPTIONS=--openssl-legacy-provider yarn build, building markdown preview] + - [cd editors/neovim/site/pack/markdown/start/markdown-preview.nvim/app && ./install.sh, building markdown preview] +#- [cd editors/neovim/site/pack/markdown/start/markdown-preview.nvim && yarn install --checkfiles && NODE_OPTIONS=--openssl-legacy-provider yarn build, building markdown preview] diff --git a/meta/profiles/arch b/meta/profiles/arch index b0124e1..fca1e2d 100644 --- a/meta/profiles/arch +++ b/meta/profiles/arch @@ -1,7 +1,5 @@ arch.base arch.i3 -arch.picom -arch.polybar arch.nvim neovim zsh