From 2ebdb914fc7b3589f846e107354ecedbd6ac20ad Mon Sep 17 00:00:00 2001
From: Matt Wilson <matthew@synesis.com.au>
Date: Fri, 28 Aug 2026 15:22:33 +1000
Subject: [PATCH 1/2] .vimrc

---
 .vimrc | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .vimrc

diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..b8184be
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,70 @@
+" Synesis Ruby project .vimrc — aligned with .vscode/settings.json (2-space Ruby)
+
+set nocompatible
+filetype indent plugin on
+syntax enable
+set autoindent
+set backspace=indent,eol,start
+set hlsearch
+set incsearch
+set number
+
+" files.insertFinalNewline
+set eol
+set fixeol
+
+" editor.renderWhitespace: all
+set list
+set listchars=tab:->,trail:-,extends:>,precedes:<,nbsp:+
+
+" editor.detectIndentation: false — global defaults (editor.tabSize: 2, insertSpaces: true)
+set colorcolumn=76
+set expandtab
+set shiftwidth=2
+set softtabstop=2
+set tabstop=2
+
+" colorcolumn draws a full-column tint in Vim (not a VS Code-style 1px line).
+" Keep it subtle via the ColorColumn highlight group; reapply after colorscheme changes.
+if has('termguicolors')
+  " set termguicolors
+endif
+
+function! s:ConfigureColorColumn() abort
+  highlight ColorColumn ctermbg=236 guibg=#2a2a2a cterm=NONE gui=NONE
+endfunction
+
+call s:ConfigureColorColumn()
+autocmd ColorScheme * call s:ConfigureColorColumn()
+
+" files.trimTrailingWhitespace
+autocmd BufWritePre * %s/\s\+$//e
+
+augroup sis_c_cxx
+  autocmd!
+
+  " [c] / [cpp]
+  autocmd FileType c,cpp setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 colorcolumn=60,64,68,72,76
+
+  " [rust]
+  autocmd FileType rs setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 colorcolumn=76
+
+  " [cmake]
+  autocmd FileType cmake setlocal noexpandtab tabstop=4 shiftwidth=4 softtabstop=4
+
+  " [shellscript]
+  autocmd FileType sh,bash,zsh setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 colorcolumn=60,76
+
+  " [bat]
+  autocmd FileType bat,dosbatch setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 colorcolumn=60,76
+
+  " [json] / [markdown] / [yaml] / [ruby]
+  autocmd FileType json,markdown,yaml,ruby setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2
+
+  " [python]
+  autocmd FileType python setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 colorcolumn=60,76
+
+  " [toml]
+  autocmd FileType toml setlocal noexpandtab tabstop=2 shiftwidth=2 softtabstop=2
+augroup END
+

From e6330ac54d7d7118cbefed0c2d38d1837baa5cdb Mon Sep 17 00:00:00 2001
From: Matt Wilson <matthew@synesis.com.au>
Date: Fri, 28 Aug 2026 15:23:25 +1000
Subject: [PATCH 2/2] chore(ci): canonical branches

---
 .github/workflows/ruby.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index c7171c5..e0155df 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -18,7 +18,6 @@ on:
       - master
       - dev
       - boilerplate
-      - bp-2
       - idiomatic
       - rc1
       - rc2