lazyvim

29 files changed, 382 insertions, 203 deletions

diff --git a/init.lua b/init.lua
index 1443a05..7e8f535 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,25 @@
-require('Nanderty.lazy')
+require('keymaps')
+require('options')
 
-require('Nanderty.general')
-require('Nanderty.remap')
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+	spec = {
+		{ import = 'plugins' },
+	},
+	defaults = {
+		lazy = false,
+		version = false,
+	},
+})
diff --git a/lazy-lock.json b/lazy-lock.json
index de2dcef..7b8883d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,30 +1,30 @@
 {
   "LuaSnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" },
-  "bufferline.nvim": { "branch": "main", "commit": "b337fd393cef2e3679689d220e2628722c20ddcb" },
+  "bufferline.nvim": { "branch": "main", "commit": "3677aceb9a72630b0613e56516c8f7151b86f95c" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+  "friendly-snippets": { "branch": "main", "commit": "25ddcd96540a2ce41d714bd7fea2e7f75fea8ead" },
   "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" },
   "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
-  "lazy.nvim": { "branch": "main", "commit": "6b55862d2d264f0b48e0b9e42cc2d14f136bed55" },
-  "lsp-zero.nvim": { "branch": "v1.x", "commit": "63951c8f9701871abd6858d26f3bcc6b99ce5c74" },
+  "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" },
   "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3924f2d264097b2caf13e713485dbc3e9d616574" },
-  "mason.nvim": { "branch": "main", "commit": "de9ce244e27b0144959cb6cee1fc584bb00ccae4" },
+  "luasnip-latex-snippets.nvim": { "branch": "main", "commit": "8fe303e70f31e24d5e165c8e3e0775d00f96007a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2b811031febe5f743e07305738181ff367e1e452" },
+  "mason.nvim": { "branch": "main", "commit": "a192887fd0c29275cf2acb4a83bcbdf63399f8df" },
   "mini.nvim": { "branch": "main", "commit": "41023bb1de7e8cf973ae9cf3066e01f3c8f3617d" },
-  "neoformat": { "branch": "master", "commit": "891fad5829f91cbc3d0866f7abd028d233b8763e" },
+  "neoformat": { "branch": "master", "commit": "ae79cb838b8ed106a083370f3eb3da88ce834c69" },
   "neomake": { "branch": "master", "commit": "584f882b9f991245374e7e7d7d1f78bae90b7a35" },
-  "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0cbf919e49c664a0b189a6b08a7da03996b4c3eb" },
-  "nvim-tree.lua": { "branch": "master", "commit": "1d79a64a88af47ddbb55f4805ab537d11d5b908e" },
-  "nvim-treesitter": { "branch": "master", "commit": "17c275bfff86cfd4ac37a61a46bc8e4ade657e19" },
-  "nvim-web-devicons": { "branch": "master", "commit": "585dbc29315ca60be67d18ae6175771c3fb6791e" },
+  "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
+  "nvim-lspconfig": { "branch": "master", "commit": "736c39e4bab977f0171c78328415c6402c58e64a" },
+  "nvim-treesitter": { "branch": "master", "commit": "25b656a4b771ee7d440e506280b9ae546d6f7233" },
+  "nvim-web-devicons": { "branch": "master", "commit": "467d135bbefa6fbe8380c8b6498228f8b21244a6" },
   "onedark.nvim": { "branch": "master", "commit": "4497678c6b1847b663c4b23000d55f28a2f846ce" },
   "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
-  "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "94fe37a1ea217dd2f90d91222bc1531521146ac3" },
+  "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" },
+  "telescope_sessions_picker.nvim": { "branch": "main", "commit": "f921ab956d500f0dcac1751b544848db8198313f" },
   "vim-fugitive": { "branch": "master", "commit": "5b52a0f395065d6cb7b65a00a5e17eaf9ebd64d5" },
-  "vim-gutentags": { "branch": "master", "commit": "1337b1891b9d98d6f4881982f27aa22b02c80084" },
-  "vimtex": { "branch": "master", "commit": "9faaf007ce285dd5a9761c285816dea7958c49b1" }
+  "vimtex": { "branch": "master", "commit": "7c1bc9b8ad6c6bddc0194aeb27b34bd1107880f2" }
 }
\ No newline at end of file
diff --git a/lua/Nanderty/lazy.lua b/lua/Nanderty/lazy.lua
deleted file mode 100644
index 6315de3..0000000
--- a/lua/Nanderty/lazy.lua
+++ /dev/null
@@ -1,70 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-vim.g.mapleader = " "
-
-require("lazy").setup({
-
-{'lervag/vimtex', module=false},
-
-{ 'echasnovski/mini.nvim', version = false },
-
-'tpope/vim-fugitive',
-'ludovicchabant/vim-gutentags',
-'sbdchd/neoformat',
-'neomake/neomake',
-
-{
-    'nvim-telescope/telescope.nvim', version = '0.1.1',
-      dependencies = { 'nvim-lua/plenary.nvim' }
-},
-
-'lewis6991/gitsigns.nvim',
-'nvim-tree/nvim-tree.lua',
-
-{
-	'akinsho/bufferline.nvim', version = "v3.*",
-	dependencies = 'nvim-tree/nvim-web-devicons'
-},
-
-'nvim-lualine/lualine.nvim',
-{
-	'nvim-treesitter/nvim-treesitter',
-	build = ':TSUpdate'
-},
-'lukas-reineke/indent-blankline.nvim',
-'navarasu/onedark.nvim';
-
-{
-  'VonHeikemen/lsp-zero.nvim',
-  branch = 'v1.x',
-  dependencies = {
-    -- LSP Support
-    {'neovim/nvim-lspconfig'},             -- Required
-    {'williamboman/mason.nvim'},           -- Optional
-    {'williamboman/mason-lspconfig.nvim'}, -- Optional
-
-    -- Autocompletion
-    {'hrsh7th/nvim-cmp'},         -- Required
-    {'hrsh7th/cmp-nvim-lsp'},     -- Required
-    {'hrsh7th/cmp-buffer'},       -- Optional
-    {'hrsh7th/cmp-path'},         -- Optional
-    {'saadparwaiz1/cmp_luasnip'}, -- Optional
-    {'hrsh7th/cmp-nvim-lua'},     -- Optional
-
-    -- Snippets
-    {'L3MON4D3/LuaSnip'},             -- Required
-  }
-},
-
-})
diff --git a/lua/Nanderty/remap.lua b/lua/Nanderty/remap.lua
deleted file mode 100644
index b760350..0000000
--- a/lua/Nanderty/remap.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
new file mode 100644
index 0000000..6596a43
--- /dev/null
+++ b/lua/keymaps.lua
@@ -0,0 +1,2 @@
+vim.g.mapleader = " "
+
diff --git a/lua/Nanderty/general.lua b/lua/options.lua
index 36f6519..53fd399 100644
--- a/lua/Nanderty/general.lua
+++ b/lua/options.lua
@@ -5,19 +5,26 @@ vim.opt.updatetime = 200
 vim.opt.mouse = a
 vim.opt.signcolumn = 'yes'
 vim.opt.cursorline = true
-
+vim.opt.wrap = false
+vim.opt.splitbelow = true
+vim.opt.splitright = true
 vim.opt.undofile = true
 vim.opt.undodir = { vim.fn.stdpath('data')..'/undo' }
 vim.opt.undolevels = 1000
 
+vim.opt.showmode = false
+vim.opt.smartindent = true
+vim.opt.shiftwidth = 4
 vim.opt.number = true
 vim.opt.scrolloff = 20
 vim.opt.numberwidth = 5
-
+vim.diagnostic.config({
+    virtual_text = {
+	severity = vim.diagnostic.severity.ERROR,
+    },
+    underline = {
+	severity = vim.diagnostic.severity.ERROR,
+    },
+})
 vim.opt.termguicolors = true
 vim.opt.guifont = {'Hack NFM:h12'}
-
-require('onedark').setup {
-    style = 'warmer'
-}
-require('onedark').load()
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
new file mode 100644
index 0000000..6015356
--- /dev/null
+++ b/lua/plugins/cmp.lua
@@ -0,0 +1,80 @@
+return {
+    {
+	'L3MON4D3/LuaSnip',
+	dependencies = {
+	    'iurimateus/luasnip-latex-snippets.nvim',
+	    'rafamadriz/friendly-snippets',
+	},
+	config = function()
+	    require('luasnip-latex-snippets').setup()
+	    require("luasnip.loaders.from_lua").lazy_load()
+	    require("luasnip.loaders.from_vscode").lazy_load()
+	end
+    },
+    {
+	'hrsh7th/nvim-cmp',
+	event = 'InsertEnter',
+	dependencies = {
+	    'hrsh7th/cmp-nvim-lsp',
+	    'hrsh7th/cmp-buffer',
+	    'hrsh7th/cmp-path',
+	    'saadparwaiz1/cmp_luasnip',
+	},
+
+	opts = function()
+	    local has_words_before = function()
+		unpack = unpack or table.unpack
+		local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+		return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+	    end
+
+	    local luasnip = require("luasnip")
+	    local cmp = require('cmp')
+
+	    luasnip.config.set_config({
+		history = true,
+		enable_autosnippets = true,
+	    })
+
+	    return {
+		snippet = {
+		    expand = function(args)
+			require('luasnip').lsp_expand(args.body)
+		    end,
+		},
+		mapping = cmp.mapping.preset.insert({
+
+		    ['<Space>'] = cmp.mapping.confirm({ select = false }),
+
+		    ["<Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    cmp.select_next_item()
+			elseif luasnip.expand_or_jumpable() then
+			    luasnip.expand_or_jump()
+			elseif has_words_before() then
+			    cmp.complete()
+			else
+			    fallback()
+			end
+			end, { "i", "s" }),
+
+		    ["<S-Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+			    cmp.select_prev_item()
+			elseif luasnip.jumpable(-1) then
+			    luasnip.jump(-1)
+			else
+			    fallback()
+			end
+			end, { "i", "s" }),
+		}),
+		sources = cmp.config.sources({
+		    { name = 'nvim_lsp' },
+		    { name = 'luasnip' },
+		    { name = 'buffer' },
+		    { name = 'path' },
+		})
+	    }
+	end,
+    },
+}
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
new file mode 100644
index 0000000..6dd51ca
--- /dev/null
+++ b/lua/plugins/colorscheme.lua
@@ -0,0 +1,15 @@
+return {
+
+	{
+		'navarasu/onedark.nvim',
+		lazy = false,
+		priority = 1000,
+		config = function()
+			require('onedark').setup {
+				style = 'warmer'
+			}
+			require('onedark').load()
+		end,
+	},
+
+}
diff --git a/lua/plugins/general.lua b/lua/plugins/general.lua
new file mode 100644
index 0000000..3eeb1c0
--- /dev/null
+++ b/lua/plugins/general.lua
@@ -0,0 +1,39 @@
+return {
+    {
+	'sbdchd/neoformat',
+	keys = {
+	    { '<leader>i', '<cmd>Neoformat<cr>', desc = 'format' },
+	},
+    },
+    {
+	'neomake/neomake',
+	event = {
+	    'BufReadPost',
+	    'BufNewFile'
+	},
+	config = function()
+	    vim.call('neomake#configure#automake', 'nrwi', '500')
+	end,
+    },
+    {
+	'tpope/vim-fugitive',
+	event = {
+	    'BufReadPost',
+	    'BufNewFile'
+	},
+    },
+    {
+	'JoseConseco/telescope_sessions_picker.nvim',
+	keys = {
+	    { '<leader>ps', '<cmd>Telescope sessions_picker<cr>', desc = 'session' },
+	},
+	dependencies = {
+	    'nvim-telescope/telescope.nvim',
+	    'nvim-lua/plenary.nvim',
+	    'nvim-tree/nvim-web-devicons',
+	},
+	config = function()
+	    require('telescope').load_extension 'sessions_picker'
+	end,
+    },
+}
diff --git a/lua/plugins/interface.lua b/lua/plugins/interface.lua
new file mode 100644
index 0000000..4e898c5
--- /dev/null
+++ b/lua/plugins/interface.lua
@@ -0,0 +1,44 @@
+return {
+  {
+    'akinsho/bufferline.nvim',
+    event = 'VeryLazy',
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+    },
+    opts = {
+      options = {
+	diagnostics = "nvim_lsp",
+	always_show_bufferline = false,
+      },
+    },
+    config = function(_, opts)
+      require("bufferline").setup(opts)
+    end,
+  },
+  {
+    'nvim-lualine/lualine.nvim',
+    event = 'VeryLazy',
+    opts = {
+      options = {
+	theme = 'onedark'
+      },
+    },
+  },
+  {
+    'lukas-reineke/indent-blankline.nvim',
+    event = {
+      'BufReadPost',
+      'BufNewFile'
+    },
+  },
+  {
+    'lewis6991/gitsigns.nvim',
+    event = {
+      'BufReadPost',
+      'BufNewFile'
+    },
+    config = function()
+      require('gitsigns').setup()
+    end,
+  },
+}
diff --git a/lua/plugins/latex.lua b/lua/plugins/latex.lua
new file mode 100644
index 0000000..f3ad09c
--- /dev/null
+++ b/lua/plugins/latex.lua
@@ -0,0 +1,6 @@
+return {
+  {
+    'lervag/vimtex',
+    lazy = false,
+  },
+}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
new file mode 100644
index 0000000..dd088e2
--- /dev/null
+++ b/lua/plugins/lsp.lua
@@ -0,0 +1,33 @@
+return {
+  {
+    'neovim/nvim-lspconfig',
+    event = {
+      'BufReadPre',
+      'BufNewFile'
+    },
+    dependencies = {
+      'williamboman/mason.nvim',
+      'williamboman/mason-lspconfig.nvim',
+      'hrsh7th/cmp-nvim-lsp',
+    },
+    config = function()
+      require('mason').setup()
+
+      require('mason-lspconfig').setup()
+
+      local lsp_capabilities = require('cmp_nvim_lsp').default_capabilities()
+      local lsp_attach = function(client, bufnr)
+      end
+
+      local lspconfig = require('lspconfig')
+      require('mason-lspconfig').setup_handlers({
+	function(server_name)
+	  lspconfig[server_name].setup({
+	    on_attach = lsp_attach,
+	    capabilities = lsp_capabilities,
+	  })
+	end,
+      })
+    end,
+  },
+}
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
new file mode 100644
index 0000000..18c4a23
--- /dev/null
+++ b/lua/plugins/mini.lua
@@ -0,0 +1,14 @@
+return {
+  {
+    'echasnovski/mini.nvim',
+    event = 'VimEnter',
+    config = function()
+      require('mini.sessions').setup({
+	force = {read = false, write = true, delete = true}
+      })
+      require('mini.starter').setup({
+	evaluate_single = true
+      })
+    end,
+  },
+}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
new file mode 100644
index 0000000..c09c5a6
--- /dev/null
+++ b/lua/plugins/telescope.lua
@@ -0,0 +1,46 @@
+return {
+    {
+	'nvim-telescope/telescope.nvim',
+	keys = {
+	    { '<leader>pf', '<cmd>Telescope find_files<cr>', desc = 'find files' },
+	    { '<leader>pd', '<cmd>Telescope oldfiles<cr>', desc = 'oldfiles' },
+	    { '<leader>pg', '<cmd>Telescope live_grep<cr>', desc = 'grep files' },
+	},
+	dependencies = { 'nvim-lua/plenary.nvim' },
+	opts = {
+	    defaults = {
+		initial_mode = 'normal',
+		mappings = {
+		    n = {
+			['q'] = function(...)
+			    return require('telescope.actions').close(...)
+			end,
+		    }
+		}
+	    },
+	    extensions = {
+		file_browser ={
+		    hijack_netrw = true,
+		},
+		sessions_picker = {
+		    sessions_dir = vim.fn.stdpath('data') ..'/session/',
+		}
+	    },
+	},
+    },
+
+    {
+	'nvim-telescope/telescope-file-browser.nvim',
+	keys = {
+	    { '<leader>pv', '<cmd>Telescope file_browser path=%:p:h select_buffer=true<cr>', desc = 'file tree' },
+	},
+	dependencies = {
+	    'nvim-telescope/telescope.nvim',
+	    'nvim-lua/plenary.nvim',
+	    'nvim-tree/nvim-web-devicons',
+	},
+	config = function()
+	    require('telescope').load_extension 'file_browser'
+	end,
+    },
+}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..6f2fa4e
--- /dev/null
+++ b/lua/plugins/treesitter.lua
@@ -0,0 +1,26 @@
+return {
+  {
+    'nvim-treesitter/nvim-treesitter',
+    build = ":TSUpdate",
+    event = { "BufReadPost", "BufNewFile" },
+    opts = {
+      auto_install = true,
+      ignore_install = { 'latex' },
+      highlight = { enable = true },
+      indent = { enable = true, disable = { "python" } },  
+      ensure_installed = {
+	'javascript',
+	'python',
+	'cpp',
+	'c',
+	'lua',
+	'php',
+	'html',
+	'css',
+      },
+    },
+    config = function(_, opts)
+      require("nvim-treesitter.configs").setup(opts)
+    end,
+  }
+}
diff --git a/lua/utilities/util.lua b/lua/utilities/util.lua
new file mode 100644
index 0000000..ec6c400
--- /dev/null
+++ b/lua/utilities/util.lua
@@ -0,0 +1,19 @@
+local M = {}
+
+function M.telescope(builtin, opts)
+  local params = { builtin = builtin, opts = opts }
+  return function()
+    builtin = params.builtin
+    opts = params.opts
+    opts = vim.tbl_deep_extend("force", { cwd = M.get_root() }, opts or {})
+    if builtin == "files" then
+      if vim.loop.fs_stat((opts.cwd or vim.loop.cwd()) .. "/.git") then
+        opts.show_untracked = true
+        builtin = "git_files"
+      else
+        builtin = "find_files"
+      end
+    end
+    require("telescope.builtin")[builtin](opts)
+  end
+end
diff --git a/plugin/bufferline.lua b/plugin/bufferline.lua
deleted file mode 100644
index 1c295dc..0000000
--- a/plugin/bufferline.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("bufferline").setup{}
diff --git a/plugin/gitsigns.lua b/plugin/gitsigns.lua
deleted file mode 100644
index 91fa65b..0000000
--- a/plugin/gitsigns.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('gitsigns').setup()
diff --git a/plugin/indentblankline.lua b/plugin/indentblankline.lua
deleted file mode 100644
index d869bbc..0000000
--- a/plugin/indentblankline.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-require("indent_blankline").setup {
-    show_end_of_line = true,
-}
diff --git a/plugin/lualine.lua b/plugin/lualine.lua
deleted file mode 100644
index 5ace147..0000000
--- a/plugin/lualine.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-require('lualine').setup {
-  options = {
-    theme = 'onedark'
-  }
-}
diff --git a/plugin/luasnip.lua b/plugin/luasnip.lua
deleted file mode 100644
index 9d273ba..0000000
--- a/plugin/luasnip.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-require('luasnip').config.set_config({
-  enable_autosnippets = true,
-})
-
-require('luasnip.loaders.from_lua').load({paths = vim.fn.stdpath('config')..'/Snippets'})
diff --git a/plugin/mini.lua b/plugin/mini.lua
deleted file mode 100644
index 0546fe3..0000000
--- a/plugin/mini.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require('mini.starter').setup({
-	evaluate_single = true
-})
-require('mini.sessions').setup({
-force = {read = false, write = true, delete = true}
-})
-require('mini.fuzzy').setup()
diff --git a/plugin/neoformat.lua b/plugin/neoformat.lua
deleted file mode 100644
index 54ed27d..0000000
--- a/plugin/neoformat.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.api.nvim_create_autocmd("BufWritePre", {
-command = "Neoformat"
-})
diff --git a/plugin/neomake.lua b/plugin/neomake.lua
deleted file mode 100644
index fd60d55..0000000
--- a/plugin/neomake.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.call('neomake#configure#automake', 'nrwi', '500')
diff --git a/plugin/nvimtree.lua b/plugin/nvimtree.lua
deleted file mode 100644
index 42e69b2..0000000
--- a/plugin/nvimtree.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
--- empty setup using defaults
-require("nvim-tree").setup()
diff --git a/plugin/telescope.lua b/plugin/telescope.lua
deleted file mode 100644
index 4806008..0000000
--- a/plugin/telescope.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
-vim.keymap.set('n', '<C-p>', builtin.git_files, {})
-vim.keymap.set('n', '<leader>ps', function()
-	builtin.grep_string({ search = vim.fn.input("Grep > ") });
-end)
diff --git a/plugin/treesitter.lua b/plugin/treesitter.lua
deleted file mode 100644
index aa15ceb..0000000
--- a/plugin/treesitter.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-require'nvim-treesitter.configs'.setup {
-  ensure_installed = {"help", "javascript", "css", "python", "cpp", "c", "lua", "php",},
-
-  sync_install = false,
-
-  highlight = {
-    enable = true,
-
-  },
-}
diff --git a/plugin/zerolsp.lua b/plugin/zerolsp.lua
deleted file mode 100644
index a37bee4..0000000
--- a/plugin/zerolsp.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-local lsp = require('lsp-zero').preset({
-	name = 'minimal',
-	set_lsp_keymaps = true,
-	manage_nvim_cmp = true,
-	suggest_lsp_servers = false,
-})
-
-local luasnip = require("luasnip")
-local cmp = require("cmp")
-
-lsp.setup_nvim_cmp({
-	formatting = {
-		fields = {'abbr', 'menu', 'kind'},
-
-		mapping = lsp.defaults.cmp_mappings({
-			["<Tab>"] = cmp.mapping(function(fallback)
-				if cmp.visible() then
-					cmp.select_next_item()
-				elseif luasnip.expand_or_jumpable() then
-					luasnip.expand_or_jump()
-				elseif has_words_before() then
-					cmp.complete()
-				else
-					fallback()
-				end
-			end, { "i", "s" }),
-
-			["<S-Tab>"] = cmp.mapping(function(fallback)
-				if cmp.visible() then
-					cmp.select_prev_item()
-				elseif luasnip.jumpable(-1) then
-					luasnip.jump(-1)
-				else
-					fallback()
-				end
-			end, { "i", "s" }),   
-		}),
-
-		format = function(entry, item)
-			local menu_icon = {
-				nvim_lsp = 'λ',
-				luasnip = '⋗',
-				buffer = 'Ω',
-				path = '🖫',
-				nvim_lua = 'Π',
-			}
-
-			item.menu = menu_icon[entry.source.name]
-			return item
-		end,
-	},
-})
-
-lsp.setup()
diff --git a/tags b/tags
index c797950..787cda9 100644
--- a/tags
+++ b/tags
@@ -39,8 +39,8 @@
 !_TAG_PROGRAM_VERSION	6.0.0	/p6.0.20230312.0/
 LuaSnip	./lazy-lock.json	/^  "LuaSnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" },$/;"	o
 Nanderty-Neovim-Config	./README.md	/^# Nanderty-Neovim-Config$/;"	c
-["<S-Tab>"]	plugin/zerolsp.lua	/^			["<S-Tab>"] = cmp.mapping(function(fallback)$/;"	f
-["<Tab>"]	plugin/zerolsp.lua	/^			["<Tab>"] = cmp.mapping(function(fallback)$/;"	f
+["<S-Tab>"]	./plugin/zerolsp.lua	/^			["<S-Tab>"] = cmp.mapping(function(fallback)$/;"	f
+["<Tab>"]	./plugin/zerolsp.lua	/^			["<Tab>"] = cmp.mapping(function(fallback)$/;"	f
 branch	./lazy-lock.json	/^  "LuaSnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" },$/;"	s	object:LuaSnip
 branch	./lazy-lock.json	/^  "bufferline.nvim": { "branch": "main", "commit": "b337fd393cef2e3679689d220e2628722c20ddcb" },$/;"	s	object:bufferline.nvim
 branch	./lazy-lock.json	/^  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },$/;"	s	object:cmp-buffer
@@ -103,10 +103,10 @@ commit	./lazy-lock.json	/^  "telescope.nvim": { "branch": "master", "commit": "c
 commit	./lazy-lock.json	/^  "vim-fugitive": { "branch": "master", "commit": "5b52a0f395065d6cb7b65a00a5e17eaf9ebd64d5" },$/;"	s	object:vim-fugitive
 commit	./lazy-lock.json	/^  "vim-gutentags": { "branch": "master", "commit": "1337b1891b9d98d6f4881982f27aa22b02c80084" },$/;"	s	object:vim-gutentags
 commit	./lazy-lock.json	/^  "vimtex": { "branch": "master", "commit": "9faaf007ce285dd5a9761c285816dea7958c49b1" }$/;"	s	object:vimtex
-format	./plugin/zerolsp.lua	/^    format = function(entry, item)$/;"	f
-format	plugin/zerolsp.lua	/^		format = function(entry, item)$/;"	f
-format	plugin/zerolsp.lua	/^    format = function(entry, item)$/;"	f
+config	lua/Nanderty/lazy.lua	/^		config = function ()$/;"	f
+format	./plugin/zerolsp.lua	/^		format = function(entry, item)$/;"	f
 gitsigns.nvim	./lazy-lock.json	/^  "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" },$/;"	o
+has_words_before	./plugin/zerolsp.lua	/^local has_words_before = function()$/;"	f
 indent-blankline.nvim	./lazy-lock.json	/^  "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a761/;"	o
 lazy.nvim	./lazy-lock.json	/^  "lazy.nvim": { "branch": "main", "commit": "6b55862d2d264f0b48e0b9e42cc2d14f136bed55" },$/;"	o
 lsp-zero.nvim	./lazy-lock.json	/^  "lsp-zero.nvim": { "branch": "v1.x", "commit": "63951c8f9701871abd6858d26f3bcc6b99ce5c74" },$/;"	o