feat: add support for Fedora Silverblue

Author: tbjers

.chezmoi.toml.tmpl

@@ -27,6 +27,9 @@
 {{- if hasKey .chezmoi.osRelease "id" -}}
 {{-   $osid = printf "%s-%s" .chezmoi.os .chezmoi.osRelease.id -}}
 {{- end -}}
+{{- if hasKey .chezmoi.osRelease "variant" -}}
+{{-   $osid = printf "%s-%s" .chezmoi.osRelease.id .chezmoi.osRelease.variant -}}
+{{- end -}}
 
 format = "json"
 color = "on"
@@ -37,8 +40,9 @@ progress = true
     email = {{ $email | quote }}
     name = {{ $name | quote }}
     signingkey = {{ $signingkey | quote }}
-    osid = {{ $osid | quote }}
+    osid = {{ $osid | lower | quote }}
     colortheme = {{ $colortheme | quote }}
+    lazygit = '{{ (gitHubLatestRelease "jesseduffield/lazygit").TagName | replace "v" "" }}'
 
 [diff]
     exclude = ["scripts"]

.chezmoiexternal.toml.tmpl

@@ -3,6 +3,7 @@
 
 # ~/.local/share/chezmoi/.chezmoiexternal.toml.tmpl
 # =============================================================================
+# {{ $arch := (eq .chezmoi.arch "amd64" | ternary "x86_64" .chezmoi.arch) }}
 # Used to download external dependencies.{{- /*
 #
 # This file supports Go's text/template language. */}}
@@ -17,3 +18,9 @@
     type = "file"
     url = "https://github.com/dj95/zjstatus/releases/latest/download/zjstatus.wasm"
     refreshPeriod = "24h"
+
+[".local/bin/lazygit"]
+    type = "archive-file"
+    url = "https://github.com/jesseduffield/lazygit/releases/download/v{{ .lazygit }}/lazygit_{{ .lazygit }}_{{ .chezmoi.os | title }}_{{ $arch }}.tar.gz"
+    refreshPeriod = "24h"
+    path = "lazygit"

.gitignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 # End of https://www.toptal.com/developers/gitignore/api/ansible,linux,windows,macos
 
+*.swp*
 .cache
 .cache*
 .chezmoidata/externals.yaml

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

@@ -8,9 +8,17 @@ BASE_DIR=".local/share/chezmoi"
 # shellcheck disable=SC1091
 source "${BASE_DIR}/script_utils.sh"
 
-case "$(uname -s)" in
-Darwin) ;;
-Linux)
+# shellcheck disable=SC2154
+case "$(osid)" in
+"fedora-silverblue")
+  # shellcheck disable=SC2154
+  echo "${green}Installing 1Password on Silverblue${reset}"
+  sudo wget https://downloads.1password.com/linux/keys/1password.asc \
+    -O /etc/pki/rpm-gpg/1password.asc &&
+    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=\"file:///etc/pki/rpm-gpg/1password.asc\"" > /etc/yum.repos.d/1password.repo' &&
+    sudo rpm-ostree -q install 1password 1password-cli
+  ;;
+"fedora-workstation")
   # shellcheck disable=SC2154
   echo "${green}Installing 1Password${reset}"
   sudo rpm --import https://downloads.1password.com/linux/keys/1password.asc

.hook-scripts/pre-source-state/60-pnpm.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# exit if pnpm is already installed
+command -v pnpm &>/dev/null && exit
+
+BASE_DIR=".local/share/chezmoi"
+
+# shellcheck disable=SC1091
+source "${BASE_DIR}/script_utils.sh"
+
+case "$(osid)" in
+"fedora-silverblue")
+  wget -qO- https://get.pnpm.io/install.sh | sh - &&
+    pnpm env use --global iron
+  ;;
+esac

.hook-scripts/pre-source-state/98-astronvim.sh

@@ -5,6 +5,15 @@ BASE_DIR=".local/share/chezmoi"
 # shellcheck disable=SC1091
 source "${BASE_DIR}/script_utils.sh"
 
+case "$(osid)" in
+"fedora-silverblue")
+  if [ ! -f ~/.local/bin/nvim ]; then
+    wget https://github.com/neovim/neovim/releases/latest/download/nvim.appimage -O ~/.local/bin/nvim &&
+      chmod u+x ~/.local/bin/nvim
+  fi
+  ;;
+esac
+
 if [ -f "${HOME}/.config/nvim/config.ld" ]; then
   # shellcheck disable=SC2154
   echo "${green}Updating AstroNvim${reset}"

dot_gitconfig.tmpl

@@ -35,11 +35,6 @@
   helper =
   helper = !/usr/bin/gh auth git-credential
 
-[credential "http://git.codesubmit.io"]
-  helper =
-  helper = cache
-  username = leap-llc-hzmhky
-
 [color]
   ui = true
 

dot_justfile

@@ -0,0 +1,31 @@
+# -*-mode:just-*- vim:ft=just
+# -*-mode:go-template-*- vim:ft=just
+
+# ~/.local/share/chezmoi/dot_justfile.tmpl
+# =============================================================================
+# Default commands.{{- /*
+#
+# This file supports Go's text/template language. */}}
+
+{{ if eq .osid "fedora-silverblue" -}}
+
+import "/usr/share/ublue-os/justfile"
+
+{{ else if eq .osid "fedora-workstation" -}}
+
+# Update system packages
+update:
+    sudo dnf update -y
+    flatpak update --noninteractive
+
+# Fix the GPG card service
+fix-gpg:
+    sudo systemctl restart pcscd.service
+    gpg --card-status
+
+{{ end -}}
+
+[private]
+default:
+    @just --unstable --list
+

dot_justfile.tmpl

@@ -13,7 +13,7 @@ brew {{ . | quote }}
 cask {{ . | quote }}
 {{ end -}}
 EOF
-{{ else if eq .osid "linux-fedora" -}}
+{{ else if eq .osid "fedora-workstation" -}}
 # Fedora installation of packages
 {{ if hasKey .packages "linux_fedora" -}}
 sudo dnf --quiet install -y dnf-plugins-core

run_onchange_install-packages.sh.tmpl

@@ -20,3 +20,14 @@ verlte() {
 verlt() {
   ! verlte "$2" "$1"
 }
+
+join_by() { local IFS="$1"; shift; echo "$*"; }
+
+osid() {
+  if [ -f /etc/os-release ]; then
+    source /etc/os-release
+    join_by '-' "${ID}" "${VARIANT_ID}"
+  else
+    uname -s
+  fi
+}