brisberg / dotfiles Goto Github PK

Still need to reearch this, but it may be possible to set up a scheduled run on a mac runner to run the install script and verify everything works correctly.

An alternative to using branch based definitions for each host.

In this model, there is only one branch in this repo (main). All hosts will download it and use it directly.
Many areas of the scripts will use conditionals based on env variables to enable or disable certain configurations.

Each host would define their own (or I commit the host definitions here). They would have a file which defines settings for the host (name, hostname, OS ect) as well as the set of feature I want enabled on that host.

For example, that way I can enable Godot on my laptop and desktop, but not on my work machine or raspberrypi.

Pros:
Reduced 'merge' commits as I no longer need to propogate configs down stream.
Easier to understand 'where' configs should go. Right now I need to decide if they are common to all hosts or just one based on where I commit it.
Easier time modifying similar configs on multiple hosts, since they will all use the same script definitions.

Still not sure if branch based or feature flag based is the best option. It relies on different hosts being similar enough for them to work reasonably well with course grain feature flags.

For now I'll stick with branch based until it no longer works.

When a git config value is specified more than once, git has some strange behavior.

For example, given this config

user.name = "Brandon Risberg"
user.name = "brisberg"

Running git config user.name results in brisberg. Meaning that the last value takes precedence.

However, performing a git commit given this set up actually signed the commit with "Brandon Risberg". Meaning that the first value takes precedence.

I do not know why this is the case.

For now, I will specify my layed git configs in order of specificity, expecting that the first instance of a variable will be used (contrary to what git config reports).

https://www.bop.gov/foia/docs/wiccamanual.pdf

It would be fun and flavorful to style some commands like Wiccan elements.

Daily rituals, logging in is like consecrating the tools (machines), etc.

From the work dotfiles, add this to dotfiles/bin/dotfiles-sync

#!/usr/bin/zsh

# Ensure that local dotfiles have not been modified and synchronize them with
# the remote git repo

local error=false

if [[ ! -z $(git -C $DOTFILES status --porcelain) ]]; then
  echo "\033[0;31mError\033[0m: dotfiles has uncommited files"
  error=true
fi

local branch=$(git -C $DOTFILES rev-parse --abbrev-ref HEAD)
if [[ "$branch" != "$HOST_SHORT" ]]; then
  echo "\033[0;33mWarning\033[0m: dotfiles is not on the correct branch. ('$branch')"
  git -C $DOTFILES checkout $HOST_SHORT
fi

if [[ "$error" = false ]]; then
    echo "Syncing main dotfiles..."
    git -C $DOTFILES pull -r
    git -C $DOTFILES push
    sh $DOTFILES/install
    echo "...done"
fi

make sure to chmod +x bin/dotfiles-sync to make it executable, and make sure that the dotfiles bin directory is on the path