Merge remote-tracking branch 'forge/main'

.gitmodules

@@ -34,3 +34,6 @@
 [submodule "neovim/pack/vendor/start/nvim-lspconfig"]
 	path = neovim/pack/vendor/start/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig
+[submodule "neovim/pack/vendor/start/nvim-tree"]
+	path = neovim/pack/vendor/start/nvim-tree
+	url = https://github.com/nvim-tree/nvim-tree.lua.git

gitconfig

@@ -36,7 +36,7 @@
     ff = only
 
 [core]
-    pager = delta
+    pager = delta --side-by-side --width ${FZF_PREVIEW_COLUMNS-$COLUMNS}
 
 [interactive]
     diffFilter = delta --color-only

neovim/init.lua

@@ -2,8 +2,14 @@
 My NeoVim configuration
 --]]
 
+-- disable netrw at the very start of your init.lua
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+-- Plugins
 require('nvim-web-devicons').setup()
-require('oil').setup()
+-- require('oil').setup()
+require('nvim-tree').setup()
 require('gitsigns').setup()
 require('lspconfig').phpactor.setup({})
 
@@ -12,3 +18,6 @@ vim.wo.number = true
 
 vim.opt.spelllang = 'en_gb'
 vim.opt.spell = true
+
+-- 24-bit colour support
+vim.opt.termguicolors = true

neovim/pack/vendor/start/nvim-tree

@@ -0,0 +1 @@
+Subproject commit 2a268f631da85e83b7a95291be589bcddfc785d8