nvim-tree -> oil.lua and keymaps

This commit is contained in:
James Dixon 2024-12-23 14:49:41 -05:00
parent 147c2d1cc1
commit 288d697dbc
8 changed files with 13 additions and 20 deletions

View File

@ -3,8 +3,8 @@
-- general vim settings -- general vim settings
require('config.settings') -- general vim settings require('config.settings') -- general vim settings
require('config.keymaps') -- general vim keymaps require('config.keymaps') -- general vim keymaps
require('config.lazy') -- nvim plugins
require('config.platform_specific') -- platform specific settings (Win32, Mac, Linux) require('config.platform_specific') -- platform specific settings (Win32, Mac, Linux)
-- plugin configurations -- plugin configurations
require('config.lazy') -- nvim plugins
require('plugin-config') -- plugin specific configurations require('plugin-config') -- plugin specific configurations

View File

@ -14,8 +14,9 @@
"neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },
"neovim-ayu": { "branch": "master", "commit": "37160699469d695486174fb863aae2f2a4c1f90f" }, "neovim-ayu": { "branch": "master", "commit": "37160699469d695486174fb863aae2f2a4c1f90f" },
"nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
"nvim-lspconfig": { "branch": "master", "commit": "9204642002ba91f9e0b7d0e5989f373657fe754a" }, "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" },
"nvim-treesitter": { "branch": "master", "commit": "caba7ef3556079dec03407bcbb290ddc688ea06e" }, "nvim-treesitter": { "branch": "master", "commit": "b4897f5a8453e7efeafb21ff5b2bbdc2e3faf1bd" },
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
"tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" },
"vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
"vim-eunuch": { "branch": "master", "commit": "c61533c9868ce78bb7fcbe06b308d7fa7f19e447" }, "vim-eunuch": { "branch": "master", "commit": "c61533c9868ce78bb7fcbe06b308d7fa7f19e447" },

View File

@ -16,7 +16,8 @@ vim.keymap.set('n', '<leader>dt', ':r !date<CR>')
-- rc files -- rc files
vim.keymap.set('n', '<leader>rc', ':vsplit $MYVIMRC<CR>') vim.keymap.set('n', '<leader>rc', ':vsplit $MYVIMRC<CR>')
vim.keymap.set('n', '<leader>so', ':source $MYVIMRC<CR>') vim.keymap.set('n', '<leader>so', ':source $MYVIMRC<CR>')
vim.keymap.set('n', '<leader>rcl', ':vsplit ~/.config/nvim/lua/<CR>') vim.keymap.set('n', '<leader>rcc', ':vsplit ~/.config/nvim/lua/config/<CR>')
vim.keymap.set('n', '<leader>rcp', ':vsplit ~/.config/nvim/lua/plugin-config/<CR>')
-- windows -- windows
vim.keymap.set('n', '<leader>cl', ':close<CR>') vim.keymap.set('n', '<leader>cl', ':close<CR>')
@ -24,8 +25,3 @@ vim.keymap.set('n', '<leader>cl', ':close<CR>')
-- formatting tools -- formatting tools
vim.keymap.set('n', '=j', ':%!python -m json.tool<CR>') vim.keymap.set('n', '=j', ':%!python -m json.tool<CR>')
-- vim-plug
vim.keymap.set('n', '<leader>ps', ':source $MYVIMRC <BAR> :PackerSync<CR>')
vim.keymap.set('n', '<leader>pi', ':source $MYVIMRC <BAR> :PackerInstall<CR>')
vim.keymap.set('n', '<leader>pu', ':source $MYVIMRC <BAR> :PackerUpdate<CR>')
vim.keymap.set('n', '<leader>pc', ':source $MYVIMRC <BAR> :PackerClean<CR>')

View File

@ -41,6 +41,9 @@ require("lazy").setup({
'junegunn/fzf', run = ":call fzf#install()", 'junegunn/fzf', run = ":call fzf#install()",
'junegunn/fzf.vim', 'junegunn/fzf.vim',
-- filetree
'stevearc/oil.nvim',
-- lsp -- lsp
"williamboman/mason.nvim", "williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
@ -62,9 +65,5 @@ require("lazy").setup({
'Shatur/neovim-ayu' 'Shatur/neovim-ayu'
}, },
}, },
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "habamax" } },
-- automatically check for plugin updates
checker = { enabled = true }, checker = { enabled = true },
}) })

View File

@ -3,8 +3,8 @@
-- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-night') -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-night')
-- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-moon') -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-moon')
-- local ok, _ = pcall(vim.cmd, 'colorscheme nightfly') local ok, _ = pcall(vim.cmd, 'colorscheme nightfly')
local ok, _ = pcall(vim.cmd, 'colorscheme ayu-dark') -- local ok, _ = pcall(vim.cmd, 'colorscheme ayu-dark')
if not ok then if not ok then
vim.cmd 'colorscheme default' -- if the above fails, then use default vim.cmd 'colorscheme default' -- if the above fails, then use default

View File

@ -10,7 +10,7 @@ require('plugin-config.nvim-treesitter')
-- * File explorer and Fuzzy Finder * -- -- * File explorer and Fuzzy Finder * --
-- nvim-tree -- nvim-tree
require('plugin-config.nvim-tree') require('plugin-config.oil')
-- fzf (fuzzy finder) -- fzf (fuzzy finder)
require('plugin-config.fzf') require('plugin-config.fzf')
@ -20,6 +20,5 @@ require('plugin-config.gitsigns')
-- vim-fugitive (git plugin) -- vim-fugitive (git plugin)
require('plugin-config.vim-fugitive') require('plugin-config.vim-fugitive')
-- colorscheme -- colorscheme
require('plugin-config.colorscheme') require('plugin-config.colorscheme')

View File

@ -1,3 +0,0 @@
-- NvimTree
-- require('nvim-tree').setup()
-- vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<cr>')

View File

@ -0,0 +1 @@
require("oil").setup()