diff --git a/lua/colors/integrations/nvim.lua b/lua/colors/integrations/nvim.lua index f8b6b3d..057a486 100644 --- a/lua/colors/integrations/nvim.lua +++ b/lua/colors/integrations/nvim.lua @@ -81,32 +81,6 @@ return { DiagnosticWarn = { fg = theme.yellow }, DiagnosticInformation = { fg = theme.green }, - -- NvimTree - NvimTreeEmptyFolderName = { fg = theme.bright_blue }, - NvimTreeEndOfBuffer = { fg = theme.black }, - NvimTreeFolderIcon = { fg = theme.bright_blue }, - NvimTreeFolderName = { fg = theme.bright_blue }, - NvimTreeGitDirty = { fg = theme.red }, - NvimTreeIndentMarker = { fg = theme.bright_black }, - NvimTreeNormal = { bg = '#000000' }, - NvimTreeNormalNC = { bg = '#000000' }, - NvimTreeOpenedFolderName = { fg = theme.bright_blue }, - NvimTreeGitIgnored = { fg = theme.bright_black }, - - NvimTreeWinSeparator = { - fg = '#000000', - bg = '#000000', - }, - - NvimTreeWindowPicker = { - fg = theme.red, - bg = theme.black, - }, - - NvimTreeCursorLine = { - bg = theme.black, - }, - -- StatusLine = { -- fg = theme.white, -- }, diff --git a/lua/core/lazy_load.lua b/lua/core/lazy_load.lua index 4ca00ae..9ce6ad4 100644 --- a/lua/core/lazy_load.lua +++ b/lua/core/lazy_load.lua @@ -39,7 +39,7 @@ M.on_file_open = function(plugin_name) plugin = plugin_name, condition = function() local file = vim.fn.expand "%" - return file ~= "NvimTree_1" and file ~= "[packer]" and file ~= "" + return file ~= "[packer]" and file ~= "" end, } end diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index cca0b03..a631b68 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -29,6 +29,8 @@ M.general = { ["n"] = { "nzzzv" }, ["N"] = { "Nzzzv" }, + + ["pv"] = { " Ex ", "File Tree" }, }, v = { @@ -42,15 +44,6 @@ M.general = { }, } -M.nvimtree = { - plugin = true, - - n = { - -- toggle - [""] = { " NvimTreeToggle ", "toggle nvimtree" }, - }, -} - M.kterm = { plugin = true, diff --git a/lua/core/options.lua b/lua/core/options.lua index f4ce937..d7feafc 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -50,10 +50,10 @@ local default_plugins = { "getscriptPlugin", "gzip", "logipat", - "netrw", - "netrwPlugin", - "netrwSettings", - "netrwFileHandlers", + -- "netrw", + -- "netrwPlugin", + -- "netrwSettings", + -- "netrwFileHandlers", "matchit", "tar", "tarPlugin", diff --git a/lua/plugins/configs/nvimtree.lua b/lua/plugins/configs/nvimtree.lua deleted file mode 100644 index 6a4835c..0000000 --- a/lua/plugins/configs/nvimtree.lua +++ /dev/null @@ -1,87 +0,0 @@ -local present, nvimtree = pcall(require, "nvim-tree") - -if not present then - return -end - -local options = { - filters = { - dotfiles = false, - exclude = { vim.fn.stdpath "config" .. "/lua/custom" }, - }, - disable_netrw = true, - hijack_netrw = true, - open_on_setup = false, - ignore_ft_on_setup = { "alpha" }, - hijack_cursor = true, - hijack_unnamed_buffer_when_opening = false, - update_cwd = true, - update_focused_file = { - enable = true, - update_cwd = false, - }, - view = { - adaptive_size = true, - side = "left", - width = 25, - hide_root_folder = true, - }, - git = { - enable = false, - ignore = true, - }, - filesystem_watchers = { - enable = true, - }, - actions = { - open_file = { - resize_window = true, - }, - }, - renderer = { - highlight_git = false, - highlight_opened_files = "none", - - indent_markers = { - enable = false, - }, - - icons = { - show = { - file = true, - folder = true, - folder_arrow = true, - git = false, - }, - - glyphs = { - default = "", - symlink = "", - folder = { - default = "", - empty = "", - empty_open = "", - open = "", - symlink = "", - symlink_open = "", - arrow_open = "", - arrow_closed = "", - }, - git = { - unstaged = "✗", - staged = "✓", - unmerged = "", - renamed = "➜", - untracked = "★", - deleted = "", - ignored = "◌", - }, - }, - }, - }, -} - --- check for any override -vim.g.nvimtree_side = options.view.side - -nvimtree.setup(options) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 8f5da31..cbdb89c 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -62,7 +62,8 @@ local plugins = { end, }, - ["simrat39/rust-tools.nvim"] = { + -- ["simrat39/rust-tools.nvim"] = { + ["krolyxon/rust-tools.nvim"] = { after = "nvim-lspconfig", config = function() require("plugins.configs.rust-tools") @@ -151,18 +152,6 @@ local plugins = { end, }, - -- file managing , picker etc - ["kyazdani42/nvim-tree.lua"] = { - ft = "alpha", - cmd = { "NvimTreeToggle" }, - config = function() - require "plugins.configs.nvimtree" - end, - setup = function() - require("core.utils").load_mappings "nvimtree" - end, - }, - ["krolyxon/kterm"] = { module = "kterm", config = function()