feat: add support for Ubuntu

Author: tbjers

.chezmoidata/packages.yaml

@@ -53,14 +53,29 @@ packages:
       - lm-sensors
       - marksman
       - neovim
-      - pre-commit
       - ripgrep
-      - tree-sitter
       - yamlfmt
       - yamllint
       - yq
       - zellij
 
+  ubuntu:
+    packages:
+      - btop
+      - direnv
+      - eza
+      - fzf
+      - git-delta
+      - libsensors-dev
+      - lm-sensors
+      - neovim
+      - pre-commit
+      - python3
+      - python3-pip
+      - ripgrep
+      - yamllint
+      - zoxide
+
   fedora_workstation:
     copr:
       - atim/bottom

.chezmoiexternal.toml.tmpl

@@ -29,6 +29,33 @@
 
 # Bluefin CLI
 
+{{ $bat_version := (gitHubLatestRelease "sharkdp/bat").TagName -}}
+[".local/bin/bat"]
+    type = "archive-file"
+    url = "https://github.com/sharkdp/bat/releases/download/{{ $bat_version }}/bat-{{ $bat_version }}-{{ $arch }}-unknown-{{ .chezmoi.os }}-gnu.tar.gz"
+    executable = true
+    refreshPeriod = "168h"
+    path = "bat-{{ $bat_version }}-{{ $arch }}-unknown-{{ .chezmoi.os }}-gnu/bat"
+
+{{ $yamlfmt_version := (gitHubLatestRelease "google/yamlfmt").TagName | replace "v" "" -}}
+[".local/bin/yamlfmt"]
+    type = "archive-file"
+    url = "https://github.com/google/yamlfmt/releases/download/v{{ $yamlfmt_version }}/yamlfmt_{{ $yamlfmt_version }}_{{ .chezmoi.os | title }}_{{ $arch }}.tar.gz"
+    executable = true
+    refreshPeriod = "168h"
+    path = "yamlfmt"
+
+{{ else if eq .osid "linux-ubuntu" -}}
+
+# Ubuntu
+
+[".local/bin/zellij"]
+    type = "archive-file"
+    url = "https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz"
+    executable = true
+    refreshPeriod = "168h"
+    path = "zellij"
+
 {{ $bat_version := (gitHubLatestRelease "sharkdp/bat").TagName -}}
 [".local/bin/bat"]
     type = "archive-file"

.hook-scripts/pre-source-state/10-password-manager.sh

@@ -25,6 +25,23 @@ case "$(osid)" in
   sudo sh -c 'echo -e "[1password]\nname=1Password Stable Channel\nbaseurl=https://downloads.1password.com/linux/rpm/stable/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"https://downloads.1password.com/linux/keys/1password.asc\"" > /etc/yum.repos.d/1password.repo'
   sudo dnf install -y -q 1password 1password-cli
   ;;
+"ubuntu")
+  if command -v distrobox-host-exec &>/dev/null; then
+    if [ ! -f "/usr/local/bin/op" ]; then
+      sudo ln -s "$(which distrobox-host-exec)" "/usr/local/bin/op"
+    fi
+  else
+    # shellcheck disable=SC2154
+    echo "${green}Installing 1Password${reset}"
+    curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg
+    echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main' | sudo tee /etc/apt/sources.list.d/1password.list
+    sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
+    curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
+    sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
+    curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
+    sudo apt update && sudo apt install -y -q 1password-cli
+  fi
+  ;;
 "wolfi")
   if command -v distrobox-host-exec &>/dev/null; then
     if [ ! -f "/usr/local/bin/op" ]; then
@@ -34,7 +51,7 @@ case "$(osid)" in
   ;;
 *)
   # shellcheck disable=SC2154
-  echo "${red}Unsupported OS${reset}"
+  echo "${red}Unsupported OS $(osid)${reset}"
   exit 0
   ;;
 esac

exact_private_dot_bashrc.d/40-pnpm.bash

@@ -6,3 +6,8 @@ case ":$PATH:" in
 *":$PNPM_HOME:"*) ;;
 *) export PATH="$PNPM_HOME:$PATH" ;;
 esac
+
+if command -v pnpm &>/dev/null; then
+  # shellcheck disable=SC1090
+  source <(pnpm completion bash)
+fi

run_onchange_install-packages.sh.tmpl

@@ -73,6 +73,20 @@ sudo dnf --quiet install -y {{ .packages | join " " }}
 {{ end -}}
 {{ end -}}
 {{ end -}}
+
+
+{{ else if eq $osid "linux-ubuntu" -}}
+
+# Fedora Workstation installation of packages
+{{ if hasKey . "ubuntu" -}}
+{{ with .ubuntu -}}
+{{ if hasKey . "packages" -}}
+echo "${green}Installing Ubuntu packages${reset}"
+sudo apt -qqq install -y {{ .packages | join " " }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
 {{ end -}}
 {{ end -}}