Commit dad0ff9a33df
Changed files (2)
systems
kyushu
tools
nixpkgs-consolidate
systems/kyushu/home.nix
@@ -44,6 +44,8 @@ in
qmk
qmk_hid
+ wip.voxtype
+
startpaac
batzconverter
tools/nixpkgs-consolidate/nixpkgs-consolidate.sh
@@ -26,7 +26,6 @@ WIP_BRANCHES=()
TOTAL_COMMITS=0
COMPLETED_BRANCHES=()
FAILED_BRANCH=""
-WORKTREE_CREATED=false
# Setup logging
LOG_FILE="$LOG_DIR/$(date +%Y%m%d-%H%M%S).log"
@@ -184,7 +183,6 @@ setup_worktree() {
# Reset to upstream base branch
log "Resetting worktree to $NIXPKGS_UPSTREAM_REMOTE/$BASE_BRANCH"
git checkout -B "$NIXPKGS_CONSOLIDATED_BRANCH" "$NIXPKGS_UPSTREAM_REMOTE/$BASE_BRANCH" 2>&1 | tee -a "$LOG_FILE"
- WORKTREE_CREATED=true
log "Worktree reset successfully"
return
fi
@@ -209,7 +207,6 @@ setup_worktree() {
if git worktree add -b "$NIXPKGS_CONSOLIDATED_BRANCH" \
"$NIXPKGS_WORKTREE_PATH" \
"$NIXPKGS_UPSTREAM_REMOTE/$BASE_BRANCH" 2>&1 | tee -a "$LOG_FILE"; then
- WORKTREE_CREATED=true
log "Worktree created successfully"
else
log "ERROR: Failed to create worktree"