refactor packages, add apt support

Author: linuxdaemon

home/.chezmoidata/package-data.yaml

@@ -0,0 +1,16 @@
+packageOverrides:
+  antigen:
+    apt:
+      name: zsh-antigen
+  font-hack:
+    darwin:
+      type: cask
+  iterm2:
+    darwin:
+      type: cask
+  visual-studio-code:
+    darwin:
+      type: cask
+  yq:
+    linux:
+      type: brew

home/.chezmoidata/packages.yaml

@@ -10,9 +10,6 @@ packages:
   iterm2:
     platforms:
       - darwin
-    overrides:
-      darwin:
-        type: cask
     guiOnly: true
   jq:
     platforms:
@@ -22,9 +19,6 @@ packages:
     platforms:
       - darwin
       - linux
-    overrides:
-      darwin:
-        type: cask
     guiOnly: true
   yq:
     platforms:
@@ -41,9 +35,6 @@ packages:
     platforms:
       - darwin
       - linux
-    overrides:
-      darwin:
-        type: cask
     guiOnly: true
   direnv:
     platforms:

home/.chezmoitemplates/packages.tmpl

@@ -0,0 +1,20 @@
+{{ $packages := dict -}}
+{{ range $name, $pkg := $.packages -}}
+{{ $guiOnly := dig "guiOnly" false $pkg -}}
+{{ if and (mustHas $.chezmoi.os $pkg.platforms) (or ($.gui) (not $guiOnly)) -}}
+{{ $pkgDefaults := dict "type" $.defaultPkgType "name" $name -}}
+{{ $pkg = mustMergeOverwrite $pkgDefaults $pkg -}}
+
+{{ with dig $name "" $.packageOverrides -}}
+{{ with dig $.chezmoi.os "" . -}}
+{{ $pkg = mustMergeOverwrite $pkg . -}}
+{{ end -}}
+{{ with dig $pkg.type "" . -}}
+{{ $pkg = mustMergeOverwrite $pkg . -}}
+{{ end -}}
+{{ end -}}
+{{ $packages = set $packages $name $pkg -}}
+{{ end -}}
+{{ end -}}
+
+{{ toYaml $packages -}}

home/private_dot_bashrc.tmpl

@@ -7,8 +7,6 @@ export PS1="\u@\h:\e[0;34m\w\e[m\n\$ "
 
 source_if_exists ".aliases"
 
-export JAVA_HOME="$(/usr/libexec/java_home -v 1.8.0)"
-
 if [[ -n $SSH_CONNECTION ]]; then
   export EDITOR='vim'
 else

home/private_dot_zshrc.tmpl

@@ -120,14 +120,16 @@ unset ibrew_bin mbrew_bin ibrew_default_bin mbrew_default_bin
 eval "$({{ joinPath $.brewPrefix "bin" "brew" | quote }} shellenv zsh)"
 {{ end -}}
 
-{{ if $.brewPrefix -}}
+{{ $linuxAntigenPath := "/usr/share/zsh-antigen/antigen.zsh" -}}
+{{ if stat $linuxAntigenPath -}}
+source {{ quote $linuxAntigenPath }}
+{{ else if $.brewPrefix -}}
 source "$HOMEBREW_PREFIX/share/antigen/antigen.zsh"
 {{ end -}}
-if has_cmd antigen; then
-    antigen use oh-my-zsh
-    antigen theme agnoster
-    antigen apply
-fi
+
+antigen use oh-my-zsh
+antigen theme agnoster
+antigen apply
 
 zstyle ':omz:update' mode auto      # update automatically without asking
 
@@ -147,7 +149,7 @@ fi
 # Krew
 add_to_path "${KREW_ROOT:-$HOME/.krew}/bin"
 
-{{ template "includeIfExists.tmpl" (joinPath $.chezmoi.homeDir ".zshrc.local") -}}
+{{ includeTemplate "includeIfExists.tmpl" (joinPath $.chezmoi.homeDir ".zshrc.local") -}}
 
 # We finished init, set up completions (OMZ does this above, but we add our own, so do it again)
 autoload -Uz compinit

home/run_onchange_apt-install-packages.sh.tmpl

@@ -0,0 +1,14 @@
+{{ if eq .chezmoi.os "linux" -}}
+{{ $packages := list -}}
+{{ range $name, $pkg := (includeTemplate "packages.tmpl" $ | fromYaml) -}}
+{{ if eq $pkg.type "apt" -}}
+{{ $packages = mustAppend $packages $pkg.name -}}
+{{ end -}}
+{{ end -}}
+
+{{ if $packages -}}
+#!/bin/bash
+sudo apt install \
+  {{ join " \\\n  " $packages }}
+{{ end -}}
+{{ end -}}

home/run_onchange_brew-install-packages.sh.tmpl

@@ -2,18 +2,11 @@
 #!/bin/bash
 
 brew bundle --file=/dev/stdin <<EOF
-{{ range $name, $pkg := .packages -}}
-{{ if mustHas $.chezmoi.os $pkg.platforms -}}
-{{ with dig "overrides" $.chezmoi.os "" $pkg -}}
-{{ $pkg = mustMergeOverwrite $pkg . -}}
-{{ end -}}
-{{ $pkgType := dig "type" $.defaultPkgType $pkg -}}
-{{ $pkgName := dig "name" $name $pkg -}}
-{{ if eq $pkgType "brew" -}}
-brew {{ $pkgName | quote }}
-{{ else if eq $pkgType "cask" -}}
-cask {{ $pkgName | quote }}
-{{ end -}}
+{{ range $name, $pkg := (includeTemplate "packages.tmpl" $ | fromYaml) -}}
+{{ if eq $pkg.type "brew" -}}
+brew {{ $pkg.name | quote }}
+{{ else if eq $pkg.type "cask" -}}
+cask {{ $pkg.name | quote }}
 {{ end -}}
 {{ end -}}
 EOF

install.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-./scripts/chezmoi-install.sh init --apply linuxdaemon
+SCRIPT_URL="https://github.com/linuxdaemon/dotfiles/raw/refs/heads/master/scripts/chezmoi-install.sh"
+
+sh -c "$(curl -fsLS $SCRIPT_URL)" -- init --apply linuxdaemon