Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.6.3] - 2026-05-06

### Fixed
- `README.md`: Update section now shows the correct two-step flow — `git pull`
first (to get config file changes), then `./update.sh` (to upgrade tool binaries
and plugins). The previous single-command version was misleading: `update.sh`
does not pull the dotfiles repo and does not install tools added in newer
versions. Also documents `get.sh` as the simpler alternative and `--check` mode.
- `README.md`: Machine-specific config section now lists `~/.gitconfig.local`
alongside `~/.zshrc.local` and `~/.p10k.zsh`, with a pointer to
`git/.gitconfig.local.example`.

## [1.6.2] - 2026-05-06

### Fixed
Expand Down
31 changes: 31 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,39 @@ docker run --rm -it -v "$PWD":/root/dotfiles my-devenv bash

## Update

**Step 1 — pull the dotfiles repo** (config files: `.zshrc`, `init.lua`, `.tmux.conf.local`, scripts):

```bash
cd ~/.dotfiles && git pull
```

Or use `get.sh`, which auto-stashes local modifications, pulls, then restores them:

```bash
curl -fsSL https://raw.githubusercontent.com/YASoftwareDev/dotfiles/master/get.sh | bash -s -- workstation
```

**Step 2 — update tool binaries and plugins:**

```bash
cd ~/.dotfiles && ./update.sh
```

`update.sh` upgrades: system packages (apt), oh-my-zsh, tmux plugins, zsh plugins,
fzf, ripgrep, fd, shellcheck, zoxide, delta, eza, uv/uvx, ruff, neovim, cheat, xcape.

> **Note:** `update.sh` only upgrades tools that are already installed. If a new
> version of the dotfiles adds a tool, re-run `install.sh` to install it:
> ```bash
> bash ~/.dotfiles/install.sh workstation
> ```

To check what would be updated without making changes:

```bash
cd ~/.dotfiles && ./update.sh --check
```

## Repository structure

```
Expand Down Expand Up @@ -436,4 +465,6 @@ cmake and git accept an optional version argument: `./scripts/install-cmake.sh 4
Files not tracked by git, loaded if present:
- `~/.zshrc.local` — machine-specific zsh overrides (sourced at end of `.zshrc`)
- `~/.p10k.zsh` — powerlevel10k prompt config (generated by `p10k configure`)
- `~/.gitconfig.local` — git identity and credential helpers (included at end of `.gitconfig`);
copy `git/.gitconfig.local.example` for the expected format

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.2
1.6.3
Loading