feat(nvim)!: split personal and work Corpus directories

As noted in the comments here I want:

1. Work notes stored in a local-only Git repo, with document files
   synced to Google Drive (but not Git metadata).
2. Personal notes stored in a normal local-only Git repo, but not synced
   to Google Drive.

To achieve this, going to use the `--separate-git-dir` option to
`git-init`, which will create a `.git` file in the work notes directory
containing a "Git link"; ie. a plain-text file containing the path to
the Git directory for the repo:

    gitdir: /absolute/path/to/Corpus.git

BREAKING CHANGES:

I moved the host-specific override block to _after_ plug-ins are loaded,
because only then can I meaningfully set up the Corpus directories.

If I ever need to do overrides before plug-ins get loaded, I'll have to
do something similar to what I am doing in my SSH config, where I have
"pre" and "post" includes.

aspects/nvim/files/.config/nvim/host/comp-ktw7q4c5jh.lua

@@ -0,0 +1,32 @@
+-- Host-specific overrides for comp-ktw7q4c5jh.
+local has_corpus, corpus = pcall(require, 'wincent.corpus')
+if has_corpus then
+  corpus({
+    bang_creation = true,
+    directories = {
+      ['~/Documents/Corporate/Corpus'] = {
+        autocommit = true,
+        autoreference = 1,
+        autotitle = 1,
+        base = './',
+        transform = 'local',
+      },
+      ['~/Documents/Personal/Corpus'] = {
+        autocommit = true,
+        autoreference = 1,
+        autotitle = 1,
+        base = './',
+        transform = 'local',
+      },
+      ['~/code/masochist/content/content/wiki'] = {
+        autocommit = false,
+        autoreference = 1,
+        autotitle = 1,
+        base = '/wiki/',
+        tags = { 'wiki' },
+        transform = 'web',
+      },
+    },
+    sort = 'stat',
+  })
+end

aspects/nvim/files/.config/nvim/host/latina.lua

@@ -1 +1,25 @@
 -- Host-specific overrides for "latina".
+local has_corpus, corpus = pcall(require, 'wincent.corpus')
+if has_corpus then
+  corpus({
+    bang_creation = true,
+    directories = {
+      ['~/Documents/Corpus'] = {
+        autocommit = true,
+        autoreference = 1,
+        autotitle = 1,
+        base = './',
+        transform = 'local',
+      },
+      ['~/code/masochist/content/content/wiki'] = {
+        autocommit = false,
+        autoreference = 1,
+        autotitle = 1,
+        base = '/wiki/',
+        tags = { 'wiki' },
+        transform = 'web',
+      },
+    },
+    sort = 'stat',
+  })
+end

aspects/nvim/files/.config/nvim/init.lua

@@ -202,20 +202,6 @@ vim.api.nvim_set_keymap('n', '<Leader>f', '<Plug>(FerretAckWord)', {})
 -- use <Leader>s (mnemonic: "[s]ubstitute") instead.
 vim.api.nvim_set_keymap('n', '<Leader>s', '<Plug>(FerretAcks)', {})
 
--- Allow for per-machine overrides.
-local hostname = vim.fn.substitute(vim.fn.hostname(), '\\..*', '', '')
-local overrides = {
-  config .. '/host/' .. hostname .. '.vim',
-  config .. '/host/' .. hostname .. '.lua',
-  config .. '/init-local.vim',
-  config .. '/init-local.lua',
-}
-for _, override in ipairs(overrides) do
-  if vim.fn.filereadable(override) == 1 then
-    vim.cmd('source ' .. override)
-  end
-end
-
 -------------------------------------------------------------------------------
 -- Plugins {{{1 ---------------------------------------------------------------
 -------------------------------------------------------------------------------
@@ -463,29 +449,18 @@ if has_commandt then
   })
 end
 
-local has_corpus, corpus = pcall(require, 'wincent.corpus')
-if has_corpus then
-  corpus({
-    bang_creation = true,
-    directories = {
-      ['~/Documents/Corpus'] = {
-        autocommit = true,
-        autoreference = 1,
-        autotitle = 1,
-        base = './',
-        transform = 'local',
-      },
-      ['~/code/masochist/content/content/wiki'] = {
-        autocommit = false,
-        autoreference = 1,
-        autotitle = 1,
-        base = '/wiki/',
-        tags = { 'wiki' },
-        transform = 'web',
-      },
-    },
-    sort = 'stat',
-  })
+-- Allow for per-machine overrides.
+local hostname = string.lower(vim.fn.substitute(vim.fn.hostname(), '\\..*', '', ''))
+local overrides = {
+  config .. '/host/' .. hostname .. '.vim',
+  config .. '/host/' .. hostname .. '.lua',
+  config .. '/init-local.vim',
+  config .. '/init-local.lua',
+}
+for _, override in ipairs(overrides) do
+  if vim.fn.filereadable(override) == 1 then
+    vim.cmd('source ' .. override)
+  end
 end
 
 -------------------------------------------------------------------------------

aspects/nvim/index.ts

@@ -168,6 +168,56 @@ task('install gems', async () => {
   });
 });
 
+// On my work machine, I divide my Corpus notes into two folders: one is
+// work-specific, synced via Google Drive, and the other has personal notes
+// in it and is not synced. Because Google Drive isn't good at handling Git
+// directories, I store that elsewhere, and it doesn't get synced.
+task('create Corpus directories', when('wincent', 'work'), async () => {
+  // Corporate Corpus files go here.
+  await file({path: '~/Documents/Corporate', state: 'directory'});
+  await file({path: '~/Documents/Corporate/Corpus', state: 'directory'});
+
+  // Git directory goes under `~/Library/Application Support/Corpus`, with
+  // subdirectories of the form "$HOME-relative path to Corpus files" and a
+  // `.git` extension.
+  await file({
+    path: '~/Library/Application Support/Corpus',
+    state: 'directory',
+  });
+  await file({
+    path: '~/Library/Application Support/Corpus/Documents',
+    state: 'directory',
+  });
+  await file({
+    path: '~/Library/Application Support/Corpus/Documents/Corporate',
+    state: 'directory',
+  });
+  await file({
+    path: '~/Library/Application Support/Corpus/Documents/Corporate/Corpus.git',
+    state: 'directory',
+  });
+
+  await command('git', [
+    'init',
+    `--separate-git-dir=${
+      path.home.join(
+        'Library/Application Support/Corpus/Documents/Corporate/Corpus.git',
+      )
+    }`,
+  ], {
+    chdir: '~/Documents/Corporate/Corpus',
+    creates: '~/Documents/Corporate/Corpus/.git',
+  });
+
+  await file({path: '~/Documents/Personal', state: 'directory'});
+  await file({path: '~/Documents/Personal/Corpus', state: 'directory'});
+
+  await command('git', ['init'], {
+    chdir: '~/Documents/Personal/Corpus',
+    creates: '~/Documents/Personal/Corpus/.git',
+  });
+});
+
 // added in 1a9f9b9fd and probably not used since...
 // pip2 install vim-vint
 

helpers.ts

@@ -101,6 +101,8 @@ function checkCondition(label: string): boolean {
       return variable('profile') === 'personal';
     case 'wincent':
       return variable('identity') === 'wincent';
+    case 'work':
+      return variable('profile') === 'work';
     default:
       throw new Error(
         `checkCondition(): Unknown condition label ${JSON.stringify(label)}`,