Version Control

The jj/ package provides Jujutsu VCS (git-compatible alternative) configuration.

Contents

File Purpose

.config/jj/

Jujutsu configuration

Installation

stow -t ~ jj

What is Jujutsu?

Jujutsu (jj) is a Git-compatible VCS that:

  • Provides better conflict resolution than Git

  • Has an easy-to-use undo system

  • Supports rewriting history safely

  • Works alongside existing Git repos

Key Concepts

Concept Description

Change

Replaces "commit" - a snapshot with description

Working Copy

The checkout (can have multiple)

Observation

Read-only commit view

Workspace

Full checkout with editable files

Common Commands

jj status           # Show working copy status
jj log              # Show commit history
jj new              # Create new change
jj edit <change>    # Edit existing change
jj diff             # Show changes
jj describe         # Edit change description
jj commit           # Commit current change
jj push             # Push to remote
jj git push         # Push to Git remote
jj undo             # Undo last operation

Git Integration

jj git init         # Initialize with Git backend
jj git clone        # Clone Git repo
jj git export       # Export to Git
jj git import       # Import from Git

Key Differences from Git

  • jj new instead of git checkout -b

  • jj describe instead of git commit --amend

  • jj undo for safe undo (not git reset)

  • Changes are always amendable

The tmux/ package provides a consolidated tmux configuration with tmuxinator session definitions.

Contents

Path Purpose

.config/tmux/tmux.conf

Consolidated config (~350 lines)

.config/tmuxinator/*.yml

39 session definitions

Features

Feature Description

Prefix

C-a (easier than C-b)

Theme

Aethelred (Catppuccin-compatible purple)

Navigation

vim-style h/j/k/l + Alt+h/j/k/l quick nav

Copy mode

vim bindings (v, V, C-v, y)

Mouse

Full support (scroll, select, resize)

Plugins

TPM with resurrect, continuum, yank, copycat

tmuxinator Sessions

Category Examples

Daily

daily-fleeting.yml

Infrastructure

infra-home-lab.yml

Projects

proj-domus-captures.yml, proj-domus-digitalis.yml

Configuration

cfg-dotfiles.yml, cfg-claude.yml

Learning

lrn-rust.yml, lrn-spanish.yml

Excluded (via .gitignore)

Runtime data not tracked:

  • .config/tmux/plugins/ - TPM plugins (installed at runtime)

  • .local/share/tmux/ - Resurrect session files

Installation

# Stow tmux package
stow -d ~/atelier/_projects/personal/dots-quantum -t ~ tmux

# Install TPM (first time)
git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm

# Launch tmux, then: prefix + I (to install plugins)

See CR: dots-quantum tmux Package for the change control.