diff --git a/.gitmodules b/.gitmodules index 95a093c..e2e686e 100644 --- a/.gitmodules +++ b/.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 diff --git a/gitconfig b/gitconfig index 32360f9..0fd4fbe 100644 --- a/gitconfig +++ b/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 diff --git a/neovim/init.lua b/neovim/init.lua index 37f0487..15ed6bd 100644 --- a/neovim/init.lua +++ b/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 diff --git a/neovim/pack/vendor/start/nvim-tree b/neovim/pack/vendor/start/nvim-tree new file mode 160000 index 0000000..2a268f6 --- /dev/null +++ b/neovim/pack/vendor/start/nvim-tree @@ -0,0 +1 @@ +Subproject commit 2a268f631da85e83b7a95291be589bcddfc785d8