diff --git a/.chezmoiignore b/.chezmoiignore new file mode 100644 index 0000000..b413631 --- /dev/null +++ b/.chezmoiignore @@ -0,0 +1,3 @@ +packages/ +packages/** +justfile diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..185ad2a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +packages/arch_ignore.txt +packages/aur_ignore.txt diff --git a/justfile b/justfile new file mode 100644 index 0000000..6178d6a --- /dev/null +++ b/justfile @@ -0,0 +1,4 @@ +update-package-lists: + touch packages/arch_ignore.txt packages/aur_ignore.txt + pacman -Qqen | sort | comm -23 - packages/arch_ignore.txt > packages/arch_packages.txt + pacman -Qqem | sort | comm -23 - packages/aur_ignore.txt > packages/aur_packages.txt diff --git a/private_dot_local/private_share/packages/arch_packages.txt b/packages/arch_packages.txt similarity index 100% rename from private_dot_local/private_share/packages/arch_packages.txt rename to packages/arch_packages.txt diff --git a/private_dot_local/private_share/packages/aur_packages.txt b/packages/aur_packages.txt similarity index 80% rename from private_dot_local/private_share/packages/aur_packages.txt rename to packages/aur_packages.txt index c0ac4fe..0a6e0b4 100644 --- a/private_dot_local/private_share/packages/aur_packages.txt +++ b/packages/aur_packages.txt @@ -1,5 +1,4 @@ paru -paru-debug rbenv-git ruby-build-git zen-browser-bin diff --git a/private_dot_local/private_share/packages/justfile b/private_dot_local/private_share/packages/justfile deleted file mode 100644 index 9014910..0000000 --- a/private_dot_local/private_share/packages/justfile +++ /dev/null @@ -1,5 +0,0 @@ -regen-pkglists: - touch arch_ignore.txt - pacman -Qqen | sort | comm -23 - arch_ignore.txt > arch_packages.txt - touch aur_ignore.txt - pacman -Qqem | sort | comm -23 - aur_ignore.txt > aur_packages.txt diff --git a/run_onchange_install-arch-packages.sh.tmpl b/run_onchange_install-arch-packages.sh.tmpl index 9c7bdfb..fcadb01 100644 --- a/run_onchange_install-arch-packages.sh.tmpl +++ b/run_onchange_install-arch-packages.sh.tmpl @@ -1,8 +1,8 @@ #!/bin/bash # vim: ft=bash -# arch_packages.txt hash: {{ include "private_dot_local/private_share/packages/arch_packages.txt" | sha256sum }} +# arch_packages.txt hash: {{ include "packages/arch_packages.txt" | sha256sum }} set -euo pipefail echo "Installing Arch packages..." -sudo pacman -S --needed - < private_dot_local/private_share/packages/arch_packages.txt +sudo pacman -S --needed - < {{ joinPath .chezmoi.sourceDir "packages/arch_packages.txt" | quote }} diff --git a/run_onchange_install-aur-packages.sh.tmpl b/run_onchange_install-aur-packages.sh.tmpl index 5dc1905..20cb1f5 100644 --- a/run_onchange_install-aur-packages.sh.tmpl +++ b/run_onchange_install-aur-packages.sh.tmpl @@ -1,6 +1,6 @@ #!/bin/bash # vim: ft=bash -# aur_packages.txt hash: {{ include "private_dot_local/private_share/packages/aur_packages.txt" | sha256sum }} +# aur_packages.txt hash: {{ include "packages/aur_packages.txt" | sha256sum }} set -euo pipefail @@ -14,4 +14,4 @@ if ! command -v paru; then fi echo "Installing AUR packages..." -paru -S --needed - < private_dot_local/private_share/packages/aur_packages.txt +paru -S --needed - < {{ joinPath .chezmoi.sourceDir "packages/aur_packages.txt" | quote }} diff --git a/run_onchange_install-packages.sh.tmpl b/run_onchange_install-packages.sh.tmpl deleted file mode 100755 index de61f71..0000000 --- a/run_onchange_install-packages.sh.tmpl +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# arch_packages.txt hash: {{ include "private_dot_local/private_share/packages/arch_packages.txt" | sha256sum }} -# aur_packages.txt hash: {{ include "private_dot_local/private_share/packages/aur_packages.txt" | sha256sum }} - -set -euo pipefail - -echo "Installing Arch packages..." -sudo pacman -S --needed - < packages/arch.txt - -echo "Installing paru..." -pushd "$(mktemp -d)" -git clone https://aur.archlinux.org/paru.git -cd paru -makepkg -si -popd - -echo "Installing AUR packages..." -paru -S --needed - < packages/aur.txt