blob: fb6b10b09cca1c1b7a29ed8e2dbc70cac53836ff (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
# Show available recipes (default)
default:
@just --list
# ═══════════════════════════════════════════════════════════════════
# Setup
# ═══════════════════════════════════════════════════════════════════
# First-time machine setup: regenerate chezmoi config, install git hooks, install base packages
init: _chezmoi-init _install-hooks (install "base")
# ═══════════════════════════════════════════════════════════════════
# Day-to-day
# ═══════════════════════════════════════════════════════════════════
# Reconcile everything: deploy dotfiles AND top up partially-installed package groups
sync: apply fix
# Deploy dotfiles (chezmoi apply)
apply:
chezmoi apply -S .
# Top up missing packages in groups that are already ≥50% installed (never installs new groups)
fix:
#!/bin/sh
for file in meta/*.txt; do
group=$(basename "$file" .txt)
pkgs=$(grep -v '^\s*#' "$file" | grep -v '^\s*$')
total=$(echo "$pkgs" | wc -l)
installed=0
for pkg in $pkgs; do
pacman -Qi "$pkg" >/dev/null 2>&1 && installed=$((installed + 1))
done
if [ $((installed * 2)) -ge "$total" ] && [ "$installed" -lt "$total" ]; then
echo ">>> topping up $group ($installed/$total installed)"
echo "$pkgs" | paru -S --needed -
fi
done
# ═══════════════════════════════════════════════════════════════════
# Inspection
# ═══════════════════════════════════════════════════════════════════
# Show package and dotfile drift (runs pkg-drift + dotfile-drift)
status: pkg-drift dotfile-drift
# Show package drift: missing packages in adopted groups + undeclared installed packages
pkg-drift:
#!/bin/sh
active_file=$(mktemp)
trap 'rm -f "$active_file"' EXIT
for file in meta/*.txt; do
pkgs=$(grep -v '^\s*#' "$file" | grep -v '^\s*$')
total=$(echo "$pkgs" | wc -l)
installed=0
for pkg in $pkgs; do
pacman -Qi "$pkg" >/dev/null 2>&1 && installed=$((installed + 1))
done
if [ $((installed * 2)) -ge "$total" ]; then
echo "$pkgs" >> "$active_file"
fi
done
active=$(sort -u "$active_file")
echo "=== Package drift ==="
echo "$active" | while read -r pkg; do
[ -z "$pkg" ] && continue
pacman -Qi "$pkg" >/dev/null 2>&1 || echo " missing: $pkg"
done
just undeclared | sed 's/^/ undeclared: /'
# Show dotfile drift (wraps 'chezmoi status')
dotfile-drift:
#!/bin/sh
echo "=== Dotfile drift ==="
chezmoi status -S . || true
# Print undeclared packages (installed but not in any meta/*.txt), one per line, unindented
# Pipeable: just undeclared | paru -Rs -
undeclared:
#!/bin/sh
declared=$(cat meta/*.txt | grep -v '^\s*#' | grep -v '^\s*$' | sort -u)
pacman -Qqe | while read -r pkg; do
echo "$declared" | grep -qxF "$pkg" || echo "$pkg"
done
# Show dotfile diffs; pass a path to limit to a single file (e.g. just diff .config/nvim/init.lua)
diff file="":
chezmoi diff -S . {{ file }}
# Resolve dotfile conflicts with a 3-way merge; pass a path for one file, or omit to merge all
merge file="":
#!/bin/sh
if [ -n '{{ file }}' ]; then
chezmoi merge -S . '{{ file }}'
else
chezmoi merge-all -S .
fi
# Show per-group install coverage; pass a group name for a per-package breakdown
groups group="":
#!/bin/sh
if [ -n '{{ group }}' ]; then
file="meta/{{ group }}.txt"
if [ ! -f "$file" ]; then
echo "error: $file does not exist" >&2
exit 1
fi
grep -v '^\s*#' "$file" | grep -v '^\s*$' | while read -r pkg; do
if pacman -Qi "$pkg" >/dev/null 2>&1; then
printf ' \033[32m✓\033[0m %s\n' "$pkg"
else
printf ' \033[31m✗\033[0m %s\n' "$pkg"
fi
done
exit 0
fi
for file in meta/*.txt; do
group=$(basename "$file" .txt)
pkgs=$(grep -v '^\s*#' "$file" | grep -v '^\s*$')
total=$(echo "$pkgs" | wc -l)
installed=0
for pkg in $pkgs; do
pacman -Qi "$pkg" >/dev/null 2>&1 && installed=$((installed + 1))
done
if [ "$installed" -eq "$total" ]; then
printf ' \033[32m✓\033[0m %-10s %d/%d\n' "$group" "$installed" "$total"
elif [ "$installed" -eq 0 ]; then
printf ' \033[31m✗\033[0m %-10s %d/%d\n' "$group" "$installed" "$total"
else
printf ' \033[33m~\033[0m %-10s %d/%d\n' "$group" "$installed" "$total"
fi
done
# ═══════════════════════════════════════════════════════════════════
# Package management
# ═══════════════════════════════════════════════════════════════════
# Install one or more package groups (e.g. just install base dev wayland)
install *groups:
#!/bin/sh
for group in {{ groups }}; do
grep -v '^\s*#' "meta/${group}.txt" | grep -v '^\s*$' | paru -S --needed -
done
# Install every package group
install-all:
#!/bin/sh
cat meta/*.txt | grep -v '^\s*#' | grep -v '^\s*$' | sort -u | paru -S --needed -
# Append a package to a group list and install it (e.g. just add dev ripgrep)
add group pkg:
#!/bin/sh
set -eu
file="meta/{{ group }}.txt"
if [ ! -f "$file" ]; then
echo "error: $file does not exist" >&2
exit 1
fi
if grep -qxF '{{ pkg }}' "$file"; then
echo "{{ pkg }} already in {{ group }}.txt"
else
echo '{{ pkg }}' >> "$file"
echo "added {{ pkg }} to {{ group }}.txt"
fi
paru -S --needed '{{ pkg }}'
# ═══════════════════════════════════════════════════════════════════
# Hidden helpers (run indirectly via the recipes above)
# ═══════════════════════════════════════════════════════════════════
_chezmoi-init:
chezmoi init -S .
_install-hooks:
git config core.hooksPath .githooks
|
