[wip] rebuild from scratch

lua/plugins/base46.lua

@@ -0,0 +1,8 @@
+return {
+	"NvChad/base46",
+	branch = "v2.5",
+	lazy = true,
+	build = function()
+		require("base46").load_all_highlights()
+	end,
+}

lua/plugins/cmp.lua

@@ -1,30 +0,0 @@
-return {
-  "hrsh7th/nvim-cmp",
-  config = function(_, opts)
-    local cmp = require "cmp"
-    opts.mapping["<CR>"] = cmp.mapping {
-      i = function(fallback)
-        if cmp.visible() and cmp.get_active_entry() then
-          cmp.confirm { behavior = cmp.ConfirmBehavior.Replace, select = false }
-        else
-          fallback()
-        end
-      end,
-      s = cmp.mapping.confirm { select = true },
-      c = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, select = true },
-    }
-    opts.mapping["<Tab>"] = cmp.mapping(function(fallback)
-      -- This little snippet will confirm with tab, and if no entry is selected, will confirm the first item
-      if cmp.visible() then
-        local entry = cmp.get_selected_entry()
-        if not entry then
-          cmp.select_next_item { behavior = cmp.SelectBehavior.Select }
-        end
-        cmp.confirm()
-      else
-        fallback()
-      end
-    end, { "i", "s", "c" })
-    require("cmp").setup(opts)
-  end,
-}

lua/plugins/comment.lua

@@ -0,0 +1,14 @@
+return  {
+    "numToStr/Comment.nvim",
+    keys = {
+      { "gcc", mode = "n", desc = "Comment toggle current line" },
+      { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" },
+      { "gc", mode = "x", desc = "Comment toggle linewise (visual)" },
+      { "gbc", mode = "n", desc = "Comment toggle current block" },
+      { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" },
+      { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
+    },
+    config = function(_, opts)
+      require("Comment").setup(opts)
+    end,
+  }

lua/plugins/conform.lua

@@ -0,0 +1,11 @@
+return   {
+    "stevearc/conform.nvim",
+    opts = {
+      formatters_by_ft = {
+        lua = { "stylua" },
+      },
+    },
+    config = function(_, opts)
+      require("conform").setup(opts)
+    end,
+  }

lua/plugins/gitsigns.lua

@@ -0,0 +1,11 @@
+return {
+	"lewis6991/gitsigns.nvim",
+	event = "User FilePost",
+	opts = function()
+		return require("configs.gitsigns")
+	end,
+	config = function(_, opts)
+		dofile(vim.g.base46_cache .. "git")
+		require("gitsigns").setup(opts)
+	end,
+}

lua/plugins/go.lua

@@ -1,15 +0,0 @@
-return {
-  "ray-x/go.nvim",
-  lazy = false,
-  dependencies = { -- optional packages
-    "ray-x/guihua.lua",
-    "neovim/nvim-lspconfig",
-    "nvim-treesitter/nvim-treesitter",
-  },
-  config = function()
-    require "configs.go"
-  end,
-  event = { "CmdlineEnter" },
-  ft = { "go", "gomod", "gowork", "gotmpl" },
-  build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
-}

lua/plugins/indent-blankline.lua

@@ -0,0 +1,18 @@
+return   {
+    "lukas-reineke/indent-blankline.nvim",
+    event = "User FilePost",
+    opts = {
+      indent = { char = "│", highlight = "IblChar" },
+      scope = { char = "│", highlight = "IblScopeChar" },
+    },
+    config = function(_, opts)
+      dofile(vim.g.base46_cache .. "blankline")
+
+      local hooks = require "ibl.hooks"
+      hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
+      require("ibl").setup(opts)
+
+      dofile(vim.g.base46_cache .. "blankline")
+    end,
+  }
+

lua/plugins/init.lua

@@ -1,27 +0,0 @@
-return {
-  {
-    "stevearc/conform.nvim",
-    event = "BufWritePre", -- uncomment for format on save
-    config = function()
-      require "configs.conform"
-    end,
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = {
-        "vim",
-        "lua",
-        "vimdoc",
-        "html",
-        "css",
-        "c",
-        "go",
-        "rust",
-        "javascript",
-        "gomod",
-        "ruby",
-      },
-    },
-  },
-}

lua/plugins/lsp-config.lua

@@ -1,7 +0,0 @@
-return {
-  "neovim/nvim-lspconfig",
-  config = function()
-    require("nvchad.configs.lspconfig").defaults()
-    require "configs.lspconfig"
-  end,
-}

lua/plugins/lsp-zero.lua

@@ -0,0 +1,16 @@
+return {
+	{
+		'williamboman/mason.nvim',
+		cmd = { "Mason", "MasonInstall", "MasonUpdate" },
+		config = function(_, opts_)
+			dofile(vim.g.base46_cache .. "mason")
+			require('mason').setup(opts)
+		end,
+	},
+{'williamboman/mason-lspconfig.nvim'},
+{'VonHeikemen/lsp-zero.nvim', branch = 'v3.x'},
+{'neovim/nvim-lspconfig'},
+{'hrsh7th/cmp-nvim-lsp'},
+{'hrsh7th/nvim-cmp'},
+{'L3MON4D3/LuaSnip'},
+}

lua/plugins/markdown-preview.lua

@@ -1,9 +0,0 @@
-return {
-  "iamcco/markdown-preview.nvim",
-  cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
-  build = "cd app && yarn install",
-  init = function()
-    vim.g.mkdp_filetypes = { "markdown" }
-  end,
-  ft = { "markdown" },
-}

lua/plugins/mason.lua

@@ -1,16 +0,0 @@
-return {
-  "williamboman/mason.nvim",
-  opts = {
-    ensure_installed = {
-      "lua-language-server",
-      "stylua",
-      "html-lsp",
-      "css-lsp",
-      "prettier",
-      "gopls",
-      "goimports",
-      "golines",
-      "gofumpt",
-    },
-  },
-}

lua/plugins/nvim-colorizer.lua

@@ -0,0 +1,12 @@
+return {
+	"NvChad/nvim-colorizer.lua",
+	-- event = "User FilePost",
+	-- opts = { user_default_options = { names = false } },
+	-- config = function(_, opts) 
+	-- 	require('colorizer').setup(opts)
+	--
+	-- 	vim.defer_fn(function()
+	-- 		require('colorizer').attach_to_buffer(0)
+	-- 	end, 0)
+	-- end,
+}

lua/plugins/nvim-tree.lua

@@ -1,20 +1,23 @@
 return {
-  "nvim-tree/nvim-tree.lua",
-  opts = {
-    git = { ignore = false },
-    renderer = {
-      icons = {
-        glyphs = {
-          git = { -- this is so stupid lmao
-            unstaged = "😴",
-            staged = "😎",
-            unmerged = "😈",
-            untracked = "😭",
-            renamed = "😶",
-            deleted = "😵",
-          },
-        },
-      },
-    },
-  },
+	"nvim-tree/nvim-tree.lua",
+	version = "*",
+	lazy = false,
+	dependencies = {
+		"nvim-tree/nvim-web-devicons", 
+		lazy = true,
+		opts = function()
+			return { override = require "nvchad.icons.devicons" }
+		end,
+		-- opts = {},
+		config = function(_, opts)
+			dofile(vim.g.base46_cache .. "devicons")
+			require("nvim-web-devicons").setup(opts)
+		end
+	},
+	opts = function() 
+		return require "configs.nvim-tree"
+	end,
+	config = function(_, opts)
+		require("nvim-tree").setup(opts)
+	end,
 }

lua/plugins/telescope.lua

@@ -0,0 +1,5 @@
+local map = vim.keymap.set
+return {
+	"nvim-telescope/telescope.nvim",
+	dependencies = { 'nvim-lua/plenary.nvim' },
+}

lua/plugins/todo-comments.lua

@@ -1,10 +0,0 @@
-return {
-  "folke/todo-comments.nvim",
-  dependencies = { "nvim-lua/plenary.nvim" },
-  lazy = false,
-  opts = {
-    -- your configuration comes here
-    -- or leave it empty to use the default settings
-    -- refer to the configuration section below
-  },
-}

lua/plugins/treesitter.lua

@@ -0,0 +1,15 @@
+return {
+    "nvim-treesitter/nvim-treesitter",
+    event = { "BufReadPost", "BufNewFile" },
+    cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
+    build = ":TSUpdate",
+    opts = function()
+      return require "configs.treesitter"
+    end,
+    config = function(_, opts)
+      dofile(vim.g.base46_cache .. "syntax")
+      dofile(vim.g.base46_cache .. "treesitter")
+      require("nvim-treesitter.configs").setup(opts)
+    end,
+  }
+

lua/plugins/trouble.lua

@@ -1,37 +0,0 @@
-return {
-  "folke/trouble.nvim",
-  branch = "dev", -- IMPORTANT!
-  keys = {
-    {
-      "<leader>tx",
-      "<cmd>Trouble diagnostics toggle<cr>",
-      desc = "Diagnostics (Trouble)",
-    },
-    {
-      "<leader>tX",
-      "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
-      desc = "Buffer Diagnostics (Trouble)",
-    },
-    {
-      "<leader>cs",
-      "<cmd>Trouble symbols toggle focus=false<cr>",
-      desc = "Symbols (Trouble)",
-    },
-    {
-      "<leader>cl",
-      "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
-      desc = "LSP Definitions / references / ... (Trouble)",
-    },
-    {
-      "<leader>tL",
-      "<cmd>Trouble loclist toggle<cr>",
-      desc = "Location List (Trouble)",
-    },
-    {
-      "<leader>tQ",
-      "<cmd>Trouble qflist toggle<cr>",
-      desc = "Quickfix List (Trouble)",
-    },
-  },
-  opts = {}, -- for default options, refer to the configuration section for custom setup.
-}

lua/plugins/ui.lua

@@ -0,0 +1,8 @@
+return {
+	"NvChad/ui",
+	lazy = false,
+	branch = "v2.5",
+	config = function()
+		require "nvchad"
+	end,
+}

lua/plugins/vim-sleuth.lua

@@ -1,4 +0,0 @@
-return {
-  "tpope/vim-sleuth",
-  opts = {},
-}