bootstrap.sh

@@ -48,19 +48,10 @@ test -L $HOME/.config/nvim/lsp/phpactor.lua || ln -f -s $BASEDIR/neovim/lsp/phpa
 test -d $HOME/.claude || mkdir $HOME/.claude
 ln -f -s $BASEDIR/claude/statusline.isaacaudet.sh $HOME/.claude/statusline.sh
 
-# Copy rather than symlink, so an ad-hoc `git config --global` writes to $HOME
+# .gitconfig gets edited by .extra so we won't symlink it, but copy it
-# and not into the repo.
 echo "For compatibility we shall copy the global gitconfig"
 cp $BASEDIR/gitconfig $HOME/.gitconfig
 
-# Identity and signing live in ~/.gitconfig.local, which the above includes.
-# It is per-machine and untracked, so seed it from the template. Never
-# overwrite an existing one: it holds the real signing key.
-test -e $HOME/.gitconfig.local || {
-  echo "Seeding ~/.gitconfig.local from template — fill in your identity"
-  cp $BASEDIR/gitconfig.local.template $HOME/.gitconfig.local
-}
-
 # Copy the progs into the local bin dir
 rsync -av --chmod=+x $BASEDIR/bin/ $HOME/.local/bin/
 

gitconfig

@@ -87,9 +87,3 @@
     autoSquash = true
     autoStash = true
     updateRefs = true
-
-# Machine-local identity and signing config. Untracked, and included last so
-# it wins over anything above. Keeps `bootstrap.sh`'s copy of this file
-# non-destructive without needing to re-apply values on every shell startup.
-[include]
-    path = ~/.gitconfig.local

gitconfig.local.template

@@ -1,23 +0,0 @@
-# Machine-local git config, included from the end of ~/.gitconfig.
-#
-# This file is NOT tracked in the dotfiles repo — it is per-machine, and holds
-# the identity and signing key. bootstrap.sh copies this template into place
-# only if ~/.gitconfig.local does not already exist, so your real values are
-# never clobbered by a re-run.
-#
-# Uncomment and fill these in on a new machine. Do not skip this: git will not
-# refuse to commit. It auto-derives an identity from your username and hostname
-# (e.g. jonny@Jonnys-MacBook.local), prints a "configured automatically"
-# warning, exits 0, and does no signing at all.
-
-#[user]
-#    name = Your Name
-#    email = you@example.com
-#    signingkey = ssh-ed25519 AAAA...
-
-#[commit]
-#    gpgsign = true
-
-# Path to the signing program, if signing SSH-style via a password manager.
-#[gpg "ssh"]
-#    program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign

neovim/config/plugins/init.lua

@@ -1,5 +1,4 @@
 require('config.plugins.fzf-lua')
 require('config.plugins.gitsigns')
-require('config.plugins.nvim-tree')
 require('config.plugins.web-devicons')
 require('config.plugins.which-key')

neovim/config/plugins/nvim-tree.lua

@@ -1,12 +0,0 @@
--- Must be set before netrw loads, which happens after init.lua is sourced.
--- nvim-tree takes over directory buffers, so `nvim .` opens the tree.
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
-vim.pack.add({ 'https://github.com/nvim-tree/nvim-tree.lua' })
-
-require('nvim-tree').setup({
-  view = { side = 'right' },
-})
-
-vim.keymap.set('n', '<leader>e', '<Cmd>NvimTreeToggle<CR>', { desc = 'Toggle file tree' })

neovim/nvim-pack-lock.json

@@ -8,10 +8,6 @@
       "rev": "31d6fb2d618bca1482b9f274751ead5f03461408",
       "src": "https://github.com/lewis6991/gitsigns.nvim"
     },
-    "nvim-tree.lua": {
-      "rev": "b2aadda94b107480c48e548d6db51c6840b7b33c",
-      "src": "https://github.com/nvim-tree/nvim-tree.lua"
-    },
     "nvim-web-devicons": {
       "rev": "2ae6958df7ced50baac5035cec0c15799eedfbf7",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"