From 944eb8028710a3d49b0198360d14c6504f64f68e Mon Sep 17 00:00:00 2001
From: Baptiste Grenier <baptiste@bapt.name>
Date: Sun, 20 Oct 2024 10:13:41 +0200
Subject: [PATCH] Split FreeBSD packages in three sets: cli, desktop and neovim

---
 home/.chezmoidata/packages.yaml            | 50 +++++++++++-----------
 home/run_onchange_install-packages.sh.tmpl | 19 +++++---
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/home/.chezmoidata/packages.yaml b/home/.chezmoidata/packages.yaml
index 149cbe27..c815424c 100644
--- a/home/.chezmoidata/packages.yaml
+++ b/home/.chezmoidata/packages.yaml
@@ -138,6 +138,32 @@ packages:
       # Xcode
       - "497799835"
   freebsd:
+    cli:
+      - "direnv"
+      - "extract_url"
+      - "gohugo"
+      - "isync"
+      - "msmtp"
+      - "mutt"
+      - "notmuch"
+      - "py311-khard"
+      - "py311-httpie"
+    neovim:
+      - "cargo"
+      - "go-yq"
+      - "hs-ShellCheck"
+      - "lazygit"
+      - "neovim"
+      - "python"
+      - "py311-black"
+      - "py311-pyright"
+      - "rubygem-mdl"
+      - "ruff"
+      - "shfmt"
+      - "stylua"
+      - "terraform"
+      - "texlab"
+      - "tflint"
     desktop:
       - "chromium"
       - "drm-kmod"
@@ -175,54 +201,30 @@ packages:
     minimal:
       - "bash"
       - "bat"
-      - "cargo"
       - "cbsd"
       - "cheat"
-      - "direnv"
       - "doggo"
       - "duf"
       - "dust"
       - "en-freebsd-doc"
-      - "extract_url"
       - "fd-find"
       - "fish"
       - "fzf"
       - "git"
       - "git-delta"
-      - "gohugo"
-      - "go-yq"
       - "gping"
-      - "hs-ShellCheck"
-      - "isync"
       - "jq"
-      - "lazygit"
       - "lsd"
-      - "msmtp"
-      - "mutt"
-      - "neovim"
-      - "notmuch"
       - "portlint"
       - "portshaker"
       - "poudriere"
       - "procs"
-      - "py311-black"
       - "py311-glances"
-      - "py311-httpie"
-      - "py311-khard"
-      - "py311-pyright"
-      - "python"
       - "ripgrep"
       - "ripgrep-all"
-      - "rubygem-mdl"
-      - "ruff"
       - "sanoid"
-      - "shfmt"
       - "starship"
-      - "stylua"
       - "tealdeer"
-      - "terraform"
-      - "texlab"
-      - "tflint"
       - "tmux"
       - "tree"
       - "vim"
diff --git a/home/run_onchange_install-packages.sh.tmpl b/home/run_onchange_install-packages.sh.tmpl
index 6f525b54..2b773e46 100644
--- a/home/run_onchange_install-packages.sh.tmpl
+++ b/home/run_onchange_install-packages.sh.tmpl
@@ -2,17 +2,26 @@
 
 {{ if eq .chezmoi.os "freebsd" -}}
 
-{{ if eq .chezmoi.hostname "brutal" }}
-printf "FreeBSD: install desktop package set"
-{{ range .packages.freebsd.desktop -}}
+printf "FreeBSD: install minimal package set"
+{{ range .packages.freebsd.minimal -}}
 doas pkg install -y {{ . | quote }}
 {{ end -}}
+
+printf "FreeBSD: install neovim package set"
+{{ range .packages.freebsd.neovim -}}
+doas pkg install -y {{ . | quote }}
 {{ end -}}
 
-printf "FreeBSD: install minimal package set"
-{{ range .packages.freebsd.minimal -}}
+{{ if eq .chezmoi.hostname "brutal" }}
+printf "FreeBSD: install cli package set"
+{{ range .packages.freebsd.cli -}}
 doas pkg install -y {{ . | quote }}
 {{ end -}}
+printf "FreeBSD: install desktop package set"
+{{ range .packages.freebsd.desktop -}}
+doas pkg install -y {{ . | quote }}
+{{ end -}}
+{{ end -}}
 
 {{ else if eq .chezmoi.os "darwin" -}}