From 288d697dbc88a37fe18765a39d6ab76d41fef668 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Mon, 23 Dec 2024 14:49:41 -0500
Subject: [PATCH] nvim-tree -> oil.lua and keymaps

---
 config/nvim/.config/nvim/init.lua                         | 2 +-
 config/nvim/.config/nvim/lazy-lock.json                   | 5 +++--
 config/nvim/.config/nvim/lua/config/keymaps.lua           | 8 ++------
 config/nvim/.config/nvim/lua/config/lazy.lua              | 7 +++----
 .../nvim/.config/nvim/lua/plugin-config/colorscheme.lua   | 4 ++--
 config/nvim/.config/nvim/lua/plugin-config/init.lua       | 3 +--
 config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua  | 3 ---
 config/nvim/.config/nvim/lua/plugin-config/oil.lua        | 1 +
 8 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua
 create mode 100644 config/nvim/.config/nvim/lua/plugin-config/oil.lua

diff --git a/config/nvim/.config/nvim/init.lua b/config/nvim/.config/nvim/init.lua
index b1abb1b..c0d848f 100644
--- a/config/nvim/.config/nvim/init.lua
+++ b/config/nvim/.config/nvim/init.lua
@@ -3,8 +3,8 @@
 -- general vim settings
 require('config.settings')          -- general vim settings
 require('config.keymaps')           -- general vim keymaps
-require('config.lazy')              -- nvim plugins
 require('config.platform_specific') -- platform specific settings (Win32, Mac, Linux)
 
 -- plugin configurations
+require('config.lazy')              -- nvim plugins
 require('plugin-config')            -- plugin specific configurations
diff --git a/config/nvim/.config/nvim/lazy-lock.json b/config/nvim/.config/nvim/lazy-lock.json
index 6958752..6cff0c1 100644
--- a/config/nvim/.config/nvim/lazy-lock.json
+++ b/config/nvim/.config/nvim/lazy-lock.json
@@ -14,8 +14,9 @@
   "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },
   "neovim-ayu": { "branch": "master", "commit": "37160699469d695486174fb863aae2f2a4c1f90f" },
   "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9204642002ba91f9e0b7d0e5989f373657fe754a" },
-  "nvim-treesitter": { "branch": "master", "commit": "caba7ef3556079dec03407bcbb290ddc688ea06e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" },
+  "nvim-treesitter": { "branch": "master", "commit": "b4897f5a8453e7efeafb21ff5b2bbdc2e3faf1bd" },
+  "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
   "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" },
   "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
   "vim-eunuch": { "branch": "master", "commit": "c61533c9868ce78bb7fcbe06b308d7fa7f19e447" },
diff --git a/config/nvim/.config/nvim/lua/config/keymaps.lua b/config/nvim/.config/nvim/lua/config/keymaps.lua
index e42ec82..fc32532 100644
--- a/config/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/config/nvim/.config/nvim/lua/config/keymaps.lua
@@ -16,7 +16,8 @@ vim.keymap.set('n', '<leader>dt', ':r !date<CR>')
 -- rc files
 vim.keymap.set('n', '<leader>rc', ':vsplit $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
 vim.keymap.set('n', '<leader>cl', ':close<CR>')
@@ -24,8 +25,3 @@ vim.keymap.set('n', '<leader>cl', ':close<CR>')
 -- formatting tools
 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>')
diff --git a/config/nvim/.config/nvim/lua/config/lazy.lua b/config/nvim/.config/nvim/lua/config/lazy.lua
index f1cbb7b..93b6202 100644
--- a/config/nvim/.config/nvim/lua/config/lazy.lua
+++ b/config/nvim/.config/nvim/lua/config/lazy.lua
@@ -41,6 +41,9 @@ require("lazy").setup({
       'junegunn/fzf', run = ":call fzf#install()",
       'junegunn/fzf.vim',
 
+      -- filetree
+      'stevearc/oil.nvim',
+
       -- lsp
       "williamboman/mason.nvim",
       "williamboman/mason-lspconfig.nvim",
@@ -62,9 +65,5 @@ require("lazy").setup({
       '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 },
 })
diff --git a/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua b/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua
index bea0d6a..a378e1a 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua
@@ -3,8 +3,8 @@
 -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-night')
 -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-moon')
 
--- local ok, _ = pcall(vim.cmd, 'colorscheme nightfly')
-local ok, _ = pcall(vim.cmd, 'colorscheme ayu-dark')
+local ok, _ = pcall(vim.cmd, 'colorscheme nightfly')
+-- local ok, _ = pcall(vim.cmd, 'colorscheme ayu-dark')
 
 if not ok then
   vim.cmd 'colorscheme default' -- if the above fails, then use default
diff --git a/config/nvim/.config/nvim/lua/plugin-config/init.lua b/config/nvim/.config/nvim/lua/plugin-config/init.lua
index b713d51..6963bd2 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/init.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/init.lua
@@ -10,7 +10,7 @@ require('plugin-config.nvim-treesitter')
 
 -- * File explorer and Fuzzy Finder * --
 -- nvim-tree
-require('plugin-config.nvim-tree')
+require('plugin-config.oil')
 -- fzf (fuzzy finder)
 require('plugin-config.fzf')
 
@@ -20,6 +20,5 @@ require('plugin-config.gitsigns')
 -- vim-fugitive (git plugin)
 require('plugin-config.vim-fugitive')
 
-
 -- colorscheme
 require('plugin-config.colorscheme')
diff --git a/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua b/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua
deleted file mode 100644
index 6441f46..0000000
--- a/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- NvimTree
--- require('nvim-tree').setup()
--- vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<cr>')
diff --git a/config/nvim/.config/nvim/lua/plugin-config/oil.lua b/config/nvim/.config/nvim/lua/plugin-config/oil.lua
new file mode 100644
index 0000000..ee12680
--- /dev/null
+++ b/config/nvim/.config/nvim/lua/plugin-config/oil.lua
@@ -0,0 +1 @@
+require("oil").setup()