using a fork of flatten.nvim

TODO: switch back to main repo if/when <willothy/flatten.nvim#113> is merged.

Author: dk949

lazy-lock.json

@@ -1,11 +1,11 @@
 {
-  "flatten.nvim": { "branch": "main", "commit": "72527798e75b5e34757491947c2cb853ce21dc0e" },
-  "gitsigns.nvim": { "branch": "main", "commit": "8bdaccdb897945a3c99c1ad8df94db0ddf5c8790" },
+  "flatten.nvim": { "branch": "main", "commit": "0fd34e45490ed7f97c9ed28d0a1598591e9de8e7" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "nvim-lspconfig": { "branch": "master", "commit": "03bc581e05e81d33808b42b2d7e76d70adb3b595" },
+  "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
-  "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
+  "oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
 }

lua/config/plugins/flatten.lua

@@ -3,8 +3,12 @@ return {
         open = "alternate"
     },
     hooks = {
-        post_open = function ()
-            require("flatten").config.window.open = "alternate"
+        -- relies on https://github.com/willothy/flatten.nvim/pull/113
+        pre_open = function(data)
+            if data.data.current then return { window = { open = "current" } } end
+        end,
+        guest_data = function()
+            return { current = vim.bo.filetype == "gitcommit" or vim.bo.filetype == "gitrebase" }
         end
     },
 }

lua/plugins/init.lua

@@ -3,7 +3,7 @@ return {
     { import = "plugins.lsp" },
     { 'stevearc/oil.nvim',           lazy = false, opts = require("config.plugins.oil") },
     { "lewis6991/gitsigns.nvim",     lazy = false, opts = require("config.plugins.gitsigns") },
-    { "willothy/flatten.nvim",       lazy = false, opts = require("config.plugins.flatten"), priority = 1000, },
+    { "dk949/flatten.nvim",          lazy = false, opts = require("config.plugins.flatten"), priority = 1000, },
     { "godlygeek/tabular",           lazy = true,  cmd = "Tabularize" },
     { "tpope/vim-surround",          lazy = false, },
 }

lua/utils/ui.lua

@@ -5,7 +5,6 @@ local M = {}
 ---@param cmd string|string[]
 ---@param opts {relsize: number?}?
 function M.runInTerm(cmd, opts)
-    require("flatten").config.window.open = "current"
     if not opts then opts = {} end
     if not opts.relsize then opts.relsize = 0.75 end
     local buf = vim.api.nvim_create_buf(false, true)