diff --git a/.gitmodules b/.gitmodules index e2e686e..95a093c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [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 0fd4fbe..32360f9 100644 --- a/gitconfig +++ b/gitconfig @@ -36,7 +36,7 @@ ff = only [core] - pager = delta --side-by-side --width ${FZF_PREVIEW_COLUMNS-$COLUMNS} + pager = delta [interactive] diffFilter = delta --color-only diff --git a/neovim/init.lua b/neovim/init.lua index 15ed6bd..37f0487 100644 --- a/neovim/init.lua +++ b/neovim/init.lua @@ -2,14 +2,8 @@ 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('nvim-tree').setup() +require('oil').setup() require('gitsigns').setup() require('lspconfig').phpactor.setup({}) @@ -18,6 +12,3 @@ 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 deleted file mode 160000 index 2a268f6..0000000 --- a/neovim/pack/vendor/start/nvim-tree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2a268f631da85e83b7a95291be589bcddfc785d8