telescope, rebuild incoming

.gitignore

@@ -1,2 +1 @@
 lazy-lock.json
-.session

init.lua

@@ -1,100 +1,49 @@
--- Set mapleader
 vim.g.mapleader = "<Space>"
-vim.g.maplocalleader = ","
 
--- Lazy
 require("config.lazy")
 
--- Line numbers
+vim.opt.splitbelow = true
+
+vim.cmd.colorscheme("catppuccin-mocha")
+
+vim.opt.splitright = true
+
 vim.opt.cursorline = true
 vim.wo.relativenumber = true
 vim.wo.number = true
 vim.api.nvim_set_hl(0, "LineNr", { fg = "#6c7086" }) -- overlay0
 vim.api.nvim_set_hl(0, "CursorLineNr", { fg = "#cba6f7", bold = true }) -- mauve
 
--- Windows
-vim.opt.splitbelow = true
-vim.opt.splitright = true
-vim.o.winborder = "rounded"
-
--- Sane keymaps
-vim.keymap.set("i", "jj", "<Esc>")
-vim.keymap.set("n", "q:", ":", { noremap = true, silent = true })
-vim.keymap.set("n", "<leader>bd", function() -- delete buffer
-	vim.cmd("bd")
-	vim.cmd("echo 'Buffer deleted'")
-end, { noremap = true })
-
--- Sane tab management
-vim.opt.tabstop = 2
-vim.opt.softtabstop = 2
-vim.opt.shiftwidth = 2
-vim.opt.expandtab = false
-
--- Undo management
-vim.opt.swapfile = false
-vim.opt.backup = false
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
-vim.opt.undofile = true
-
--- Better Highlighting
-vim.opt.hlsearch = false
-vim.opt.incsearch = true
-
--- Nowrap
-vim.opt.wrap = false
-
--- Colorcheme
-vim.cmd.colorscheme("catppuccin-mocha")
-
--- Scrolloff
-vim.opt.scrolloff = math.floor(vim.o.lines / 2) - 3
-
--- Indent
-vim.o.autoindent = true
-
-vim.keymap.set("n", "i", function()
-	if vim.fn.getline("."):match("^%s*$") then
-		return [["_cc]]
-	else
-		return "i"
-	end
-end, { expr = true, desc = "Inent properly on empty lines" })
-
-vim.keymap.set("n", "a", function()
-	if vim.fn.getline("."):match("^%s*$") then
-		return [["_cc]]
-	else
-		return "a"
-	end
-end, { expr = true, desc = "Indent properly on empty lines" })
-
--- Force proper keybindings
 vim.keymap.set("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
 vim.keymap.set("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')
 vim.keymap.set("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
 vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
 
--- C-BS for deleting whole word in insert mode
+vim.keymap.set("n", "<leader>w", "<C-w>")
-vim.keymap.set("i", "<C-BS>", "<C-W>", { noremap = true })
+vim.keymap.set("n", "<leader>wd", "<cmd>lua Snacks.dashboard()<CR>")
+vim.keymap.set("n", "<leader>l", "<cmd>bnext<CR>")
+vim.keymap.set("n", "<leader>h", "<cmd>bprev<CR>")
+vim.keymap.set("n", "<leader>j", "<cmd>lua MiniFiles.open()<CR>")
+vim.keymap.set("n", "<leader>f", "<cmd>Pick files<cr>")
+vim.keymap.set("n", "<leader>g", "<cmd>Pick grep_live<cr>")
+vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<cr><cmd>UndotreeFocus<cr>")
 
--- Keybinds for MiniSessions
+vim.keymap.set("n", "<leader>k", "<cmd>lua Snacks.lazygit()<CR>")
-vim.keymap.set("n", "<leader>qj", function() -- quit and save session local
+vim.keymap.set("n", "<leader>x", "<cmd>FloatermKill<CR>")
-	MiniSessions.write(".session")
-	vim.cmd("wqa")
-end, { noremap = true })
 
-vim.keymap.set("n", "<leader>qw", function() -- quit and save session global
+vim.keymap.set("i", "jj", "<Esc>")
-	local sessionName = vim.fn.input("Session Name: ")
-	if sessionName ~= "" then
-		MiniSessions.write(sessionName)
-		vim.cmd("wqa")
-	else
-		vim.notify("Session Name Invalid", vim.log.levels.INFO)
-	end
-end, { noremap = true })
 
-vim.keymap.set("n", "<leader>qd", function() -- quit and delete session
+vim.opt.tabstop = 4
-	MiniSessions.delete(".session")
+vim.opt.softtabstop = 4
-	vim.cmd("wqa")
+vim.opt.shiftwidth = 4
-end, { noremap = true })
+vim.opt.expandtab = true
+
+vim.opt.swapfile = false
+vim.opt.backup = false
+vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+vim.opt.undofile = true
+
+vim.opt.hlsearch = false
+vim.opt.incsearch = true
+
+require("leap").set_default_mappings()

lua/config/lazy.lua

@@ -1,17 +1,17 @@
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
-	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-	if vim.v.shell_error ~= 0 then
+  if vim.v.shell_error ~= 0 then
-		vim.api.nvim_echo({
+    vim.api.nvim_echo({
-			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-			{ out, "WarningMsg" },
+      { out, "WarningMsg" },
-			{ "\nPress any key to exit..." },
+      { "\nPress any key to exit..." },
-		}, true, {})
+    }, true, {})
-		vim.fn.getchar()
+    vim.fn.getchar()
-		os.exit(1)
+    os.exit(1)
-	end
+  end
 end
 vim.opt.rtp:prepend(lazypath)
 
@@ -19,23 +19,17 @@ vim.opt.rtp:prepend(lazypath)
 -- loading lazy.nvim so that mappings are correct.
 -- This is also a good place to setup other settings (vim.opt)
 vim.g.mapleader = " "
+vim.g.maplocalleader = "\\"
 
 -- Setup lazy.nvim
 require("lazy").setup({
-	spec = {
+  spec = {
-		-- import your plugins
+    -- import your plugins
-		{ import = "plugins" },
+    { import = "plugins" },
-		{ import = "plugins.completion" },
+  },
-		{ import = "plugins.ui" },
+  -- Configure any other settings here. See the documentation for more details.
-		{ import = "plugins.functional" },
+  -- colorscheme that will be used when installing plugins.
-		{ import = "plugins.functional.neorg" },
+  install = { colorscheme = { "catppuccin-mocha" } },
-	},
+  -- automatically check for plugin updates
-	-- Configure any other settings here. See the documentation for more details.
+  checker = { enabled = true },
-	-- colorscheme that will be used when installing plugins.
-	install = { colorscheme = { "catppuccin" } },
-	ui = {
-		border = "rounded",
-	},
-	-- automatically check for plugin updates
-	checker = { enabled = false },
 })

lua/plugins/catppuccin.lua

@@ -0,0 +1,5 @@
+return {
+	{ "catppuccin/nvim", name = "catppuccin", priority = 1000, opts = {
+		transparent_background = true,
+	} },
+}

lua/plugins/completion/blink.lua

@@ -1,48 +0,0 @@
-return {
-	"saghen/blink.cmp",
-	dependencies = {
-		"L3MON4D3/LuaSnip",
-	},
-	opts = {
-		-- Snippet configuration
-		snippets = {
-			preset = "luasnip", -- Tells blink.cmp to use LuaSnip
-		},
-
-		fuzzy = { implementation = "lua" },
-
-		signature = { enabled = true },
-
-		completion = {
-			list = {
-				selection = {
-					preselect = false,
-					auto_insert = true,
-				},
-			},
-		},
-
-		-- Keymaps
-		keymap = {
-			["<Tab>"] = { "select_next", "snippet_forward", "fallback" },
-		},
-		sources = {
-			default = {
-				"lazydev",
-				"lsp", -- (Equivalent to cmp-nvim-lsp)
-				"snippets", -- (Handled by the snippets config, replaces cmp_luasnip source)
-				"buffer", -- (Equivalent to cmp-buffer)
-				"path", -- (Equivalent to cmp-path)
-				-- "cmdline", -- Generally configured separately, but often included by default
-			},
-			providers = {
-				lazydev = {
-					name = "LazyDev",
-					module = "lazydev.integrations.blink",
-					-- make lazydev completions top priority (see `:h blink.cmp`)
-					score_offset = 100,
-				},
-			},
-		},
-	},
-}

lua/plugins/completion/conform.lua

@@ -1,15 +0,0 @@
-return {
-	"stevearc/conform.nvim",
-	config = function()
-		require("conform").setup({
-			formatters_by_ft = {
-				lua = { "stylua" },
-				javascript = { "prettier" },
-				python = { "black" },
-				nix = { "nixfmt" },
-			},
-			format_on_save = true,
-			undojoin = true,
-		})
-	end,
-}

lua/plugins/completion/lazydev.lua

@@ -1,11 +0,0 @@
-return {
-	"folke/lazydev.nvim",
-	ft = "lua", -- only load on lua files
-	opts = {
-		library = {
-			-- See the configuration section for more details
-			-- Load luvit types when the `vim.uv` word is found
-			{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
-		},
-	},
-}

lua/plugins/completion/linter.lua

@@ -1,44 +0,0 @@
-return {
-	"mfussenegger/nvim-lint",
-	config = function()
-		local lint = require("lint")
-
-		-- Explicitly define linters for each file type (without ast_grep)
-		lint.linters_by_ft = {
-			python = { "flake8" },
-			javascript = { "eslint" },
-			typescript = { "eslint" },
-		}
-
-		-- Only show diagnostics close to the cursor
-		vim.diagnostic.config({
-			virtual_text = {
-				spacing = 4,
-				-- You can make prefix dynamic based on severity using a function
-				prefix = function(diagnostic)
-					local icons = {
-						[vim.diagnostic.severity.ERROR] = " ",
-						[vim.diagnostic.severity.WARN] = " ",
-						[vim.diagnostic.severity.INFO] = " ",
-						[vim.diagnostic.severity.HINT] = " ",
-					}
-					return icons[diagnostic.severity] or "●"
-				end,
-			},
-			signs = false,
-			underline = true,
-			update_in_insert = false,
-		})
-
-		-- Auto-run the linter only for the configured filetypes
-		vim.api.nvim_create_autocmd("BufWritePost", {
-			pattern = "!*.lua",
-			callback = function()
-				local ft = vim.bo.filetype
-				if lint.linters_by_ft[ft] then
-					lint.try_lint()
-				end
-			end,
-		})
-	end,
-}

lua/plugins/completion/lspconfig.lua

@@ -1,39 +0,0 @@
-return {
-	"neovim/nvim-lspconfig",
-	config = function()
-		vim.lsp.config("lua_ls", {
-			settings = {
-				Lua = {
-					-- Tell the server to let Neovim handle snippet expansion
-					completion = {
-						callSnippet = "Replace",
-					},
-					-- Use LuaJIT (which Neovim uses)
-					runtime = {
-						version = "LuaJIT",
-					},
-				},
-			},
-		})
-		vim.lsp.config("emmet_ls", {
-			-- 			capabilities = require("cmp_nvim_lsp").default_capabilities(),
-			filetypes = { "html", "css", "javascriptreact", "typescriptreact" },
-			init_options = {
-				html = {
-					options = {
-						["bem.enabled"] = true,
-					},
-				},
-			},
-		})
-		vim.lsp.enable({
-			"lua_ls",
-			"ts_ls",
-			"pylsp",
-			"cssls",
-			"nixd",
-			"rust_analyzer",
-			"emmet_ls",
-		})
-	end,
-}

lua/plugins/completion/treesitter.lua

@@ -1,30 +0,0 @@
-return {
-	"nvim-treesitter/nvim-treesitter",
-	lazy = false,
-	branch = "master",
-	build = ":TSUpdate",
-	config = function()
-		require("nvim-treesitter.configs").setup({
-			highlight = { enable = true },
-			indent = { enable = true },
-			ensure_installed = {
-				"bash",
-				"html",
-				"javascript",
-				"json",
-				"lua",
-				"norg",
-				"norg_meta",
-				"markdown",
-				"markdown_inline",
-				"query",
-				"regex",
-				"tsx",
-				"typescript",
-				"python",
-				"vim",
-				"yaml",
-			},
-		})
-	end,
-}

lua/plugins/correction.lua

@@ -0,0 +1,147 @@
+return {
+    -- LSP Configuration
+    {
+        "neovim/nvim-lspconfig",
+        dependencies = {
+            "williamboman/mason.nvim",
+            "williamboman/mason-lspconfig.nvim",
+        },
+        config = function()
+            require("mason").setup()
+            require("mason-lspconfig").setup({
+                ensure_installed = { "ts_ls", "lua_ls", "pyright", "rust_analyzer", "eslint" }, -- Add your desired LSPs
+                automatic_installation = true,
+            })
+
+            local lspconfig = require("lspconfig")
+            lspconfig.lua_ls.setup({})
+            --Enable (broadcasting) snippet capability for completion
+            local capabilities = vim.lsp.protocol.make_client_capabilities()
+            capabilities.textDocument.completion.completionItem.snippetSupport = true
+
+            vim.lsp.config("qmlls", {
+                default_config = {
+                    cmd = { "qmlls" },
+                    filetypes = { "qml" },
+                    root_dir = lspconfig.util.root_pattern(".git", "."),
+                }
+            }
+
+        )
+        vim.lsp.config("cssls", {
+            capabilities = capabilities,
+        })
+        lspconfig.pyright.setup({})
+        lspconfig.cssls.setup({})
+        lspconfig.qmlls.setup({})
+        lspconfig.ts_ls.setup({
+            capabilities = capabilities,
+        })
+        lspconfig.rust_analyzer.setup({})
+        lspconfig.emmet_ls.setup({
+            capabilities = require("cmp_nvim_lsp").default_capabilities(),
+            filetypes = { "html", "css", "javascriptreact", "typescriptreact" }, -- Add more if needed
+            init_options = {
+                html = {
+                    options = {
+                        ["bem.enabled"] = true,
+                    },
+                },
+            },
+        })
+    end,
+},
+
+-- Autocompletion
+{
+    "hrsh7th/nvim-cmp",
+    dependencies = {
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-buffer",
+        "hrsh7th/cmp-path",
+        "hrsh7th/cmp-cmdline",
+        "L3MON4D3/LuaSnip",
+        "saadparwaiz1/cmp_luasnip", -- Completion for snippets
+    },
+    config = function()
+        local cmp = require("cmp")
+        local luasnip = require("luasnip")
+
+        cmp.setup({
+            snippet = {
+                expand = function(args)
+                    luasnip.lsp_expand(args.body)
+                end,
+            },
+            mapping = cmp.mapping.preset.insert({
+                ["<Tab>"] = cmp.mapping(function(fallback)
+                    if cmp.visible() then
+                        cmp.select_next_item()
+                    elseif luasnip.expand_or_jumpable() then
+                        luasnip.expand_or_jump()
+                    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" }),
+                ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Confirm selection with Enter
+            }),
+            sources = cmp.config.sources({
+                { name = "nvim_lsp" }, -- This should provide LSP completions like for ESLint
+                -- { name = "luasnip" },
+                { name = "buffer" },
+                { name = "path" },
+            }),
+        })
+    end,
+},
+
+-- Linting
+{
+    "mfussenegger/nvim-lint",
+    config = function()
+        local lint = require("lint")
+
+        -- Explicitly define linters for each file type (without ast_grep)
+        lint.linters_by_ft = {
+            python = { "flake8" },
+            javascript = { "eslint" },
+            typescript = { "eslint" },
+        }
+
+        -- Auto-run the linter only for the configured filetypes
+        vim.api.nvim_create_autocmd("BufWritePost", {
+            pattern = "!*.lua",
+            callback = function()
+                local ft = vim.bo.filetype
+                if lint.linters_by_ft[ft] then
+                    lint.try_lint()
+                end
+            end,
+        })
+    end,
+},
+
+-- autoformatting
+{
+    "stevearc/conform.nvim",
+    config = function()
+        require("conform").setup({
+            formatters_by_ft = {
+                lua = { "stylua" },
+                javascript = { "prettier" },
+                python = { "black" },
+            },
+            format_on_save = true,
+        })
+    end,
+},
+}

lua/plugins/functional/autosave.lua

@@ -1,47 +0,0 @@
-return {
-	"okuuva/auto-save.nvim",
-	version = "^1.0.0", -- see https://devhints.io/semver, alternatively use '*' to use the latest tagged release
-	cmd = "ASToggle", -- optional for lazy loading on command
-	event = { "InsertLeave", "TextChanged" },
-	opts = {},
-	config = function(opts)
-		require("auto-save").setup({
-			enabled = true,
-			trigger_events = { -- See :h events
-				immediate_save = { "BufLeave", "FocusLost", "QuitPre", "VimSuspend" }, -- vim events that trigger an immediate save
-				defer_save = { "InsertLeave" }, -- vim events that trigger a deferred save (saves after `debounce_delay`)
-				cancel_deferred_save = { "InsertEnter" }, -- vim events that cancel a pending deferred save
-			},
-			debounce_delay = 1000,
-			noautocmd = true,
-		})
-		local group = vim.api.nvim_create_augroup("autosave", {})
-
-		vim.api.nvim_create_autocmd("User", {
-			pattern = "AutoSaveWritePre",
-			group = group,
-			callback = function(opts)
-				if opts.data.saved_buffer ~= nil then
-					local filename = vim.fn.expand("%:t")
-					print("Saved '" .. filename .. "' at " .. vim.fn.strftime("%H:%M:%S"))
-				end
-			end,
-		})
-
-		vim.api.nvim_create_autocmd("User", {
-			pattern = "AutoSaveEnable",
-			group = group,
-			callback = function(opts)
-				print("AutoSave enabled")
-			end,
-		})
-
-		vim.api.nvim_create_autocmd("User", {
-			pattern = "AutoSaveDisable",
-			group = group,
-			callback = function(opts)
-				print("AutoSave disabled")
-			end,
-		})
-	end,
-}

lua/plugins/functional/flash.lua

@@ -1,40 +0,0 @@
-return {
-	"folke/flash.nvim",
-	event = "VeryLazy",
-	---@type Flash.Config
-	opts = {},
-	keys = {
-		{
-			"ss",
-			mode = { "n", "x", "o" },
-			function()
-				require("flash").jump()
-			end,
-			desc = "Flash",
-		},
-		{
-			"S",
-			mode = { "n", "x", "o" },
-			function()
-				require("flash").treesitter()
-			end,
-			desc = "Flash Treesitter",
-		},
-		{
-			"<leader>r",
-			mode = "o",
-			function()
-				require("flash").remote()
-			end,
-			desc = "Remote Flash",
-		},
-		{
-			"<leader>R",
-			mode = { "o", "x" },
-			function()
-				require("flash").treesitter_search()
-			end,
-			desc = "Treesitter Search",
-		},
-	},
-}

lua/plugins/functional/mini.lua

@@ -1,73 +0,0 @@
-return {
-	"echasnovski/mini.nvim",
-	version = "",
-
-	config = function()
-		local animate = require("mini.animate")
-		require("mini.pairs").setup() -- Bracket pairs and stuff
-		require("mini.ai").setup() -- Around and In extension for visual mode
-		require("mini.cursorword").setup() -- Underline current word below cursor (makes it easier to c and d)
-		require("mini.indentscope").setup({
-			symbol = "│",
-			draw = {
-				delay = 10,
-				animation = require("mini.indentscope").gen_animation.linear({
-					duration = 15,
-					unit = "step",
-					easing = "out",
-				}),
-			},
-		}) -- Indent lines
-		require("mini.trailspace").setup() -- Shows useless spaces
-		require("mini.sessions").setup({
-			autoread = true,
-			autowrite = true,
-			file = ".session",
-			force = { read = false, write = true, delete = true },
-		})
-		-- require("mini.notify").setup({
-		-- 	window = { winblend = 0 },
-		-- }) -- Better Notifications
-		-- vim.notify = MiniNotify.make_notify({
-		-- 	ERROR = { duration = 5000 },
-		-- 	WARN = { duration = 4000 },
-		-- 	INFO = { duration = 3000 },
-		-- })
-		require("mini.surround").setup() -- Suround selections with characters
-		require("mini.move").setup({
-			mappings = {
-				down = "J",
-				up = "K",
-			},
-		})
-
-		require("mini.icons").setup() -- Icon provider
-		require("mini.animate").setup({
-			cursor = {
-				enable = false,
-			},
-			scroll = {
-				-- Animate for 200 milliseconds with linear easing
-				timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
-				-- Animate equally but with at most 120 steps instead of default 60
-				subscroll = animate.gen_subscroll.equal({ max_output_steps = 60 }),
-			},
-			open = {
-				-- Animate for 400 milliseconds with linear easing
-				timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
-				-- Animate with wiping from nearest edge instead of default static one
-				winconfig = animate.gen_winconfig.wipe({ direction = "from_edge" }),
-				-- Make bigger windows more transparent
-				winblend = animate.gen_winblend.linear({ from = 80, to = 100 }),
-			},
-			close = {
-				-- Animate for 400 milliseconds with linear easing
-				timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
-				-- Animate with wiping to nearest edge instead of default static one
-				winconfig = animate.gen_winconfig.wipe({ direction = "to_edge" }),
-				-- Make bigger windows more transparent
-				winblend = animate.gen_winblend.linear({ from = 100, to = 80 }),
-			},
-		})
-	end,
-}

lua/plugins/functional/neorg.lua

@@ -1,56 +0,0 @@
-return {
-	"nvim-neorg/neorg",
-	lazy = false,
-	version = "*",
-	dependencies = { { "nvim-lua/plenary.nvim" }, { "nvim-neorg/neorg-telescope" }, { "benlubas/neorg-interim-ls" } },
-	config = function()
-		require("neorg").setup({
-			load = {
-				["core.defaults"] = {},
-				["core.concealer"] = {},
-				["core.integrations.treesitter"] = {},
-				["core.looking-glass"] = {},
-				["core.completion"] = {
-					config = { engine = { module_name = "external.lsp-completion" } },
-				},
-				["core.dirman"] = {
-					config = {
-						workspaces = {
-							notes = "~/Notes",
-						},
-						default_workspace = "notes",
-					},
-				},
-				["core.integrations.telescope"] = {
-					config = {
-						insert_file_link = {
-							-- Whether to show the title preview in telescope. Affects performance with a large
-							-- number of files.
-							show_title_preview = true,
-						},
-					},
-				},
-				["external.interim-ls"] = {
-					config = {
-						-- default config shown
-						completion_provider = {
-							-- Enable or disable the completion provider
-							enable = true,
-
-							-- Show file contents as documentation when you complete a file name
-							documentation = true,
-
-							-- Try to complete categories provided by Neorg Query. Requires `benlubas/neorg-query`
-							categories = false,
-
-							-- suggest heading completions from the given file for `{@x|}` where `|` is your cursor
-							-- and `x` is an alphanumeric character. `{@name}` expands to `[name]{:$/people:# name}`
-						},
-					},
-				},
-			},
-		})
-		vim.wo.foldlevel = 99
-		vim.wo.conceallevel = 2
-	end,
-}

lua/plugins/functional/nerdy.lua

@@ -1,9 +0,0 @@
-return {
-    '2kabhishek/nerdy.nvim',
-    cmd = 'Nerdy',
-    opts = {
-        max_recents = 30, -- Configure recent icons limit
-        copy_to_clipboard = false, -- Copy glyph to clipboard instead of inserting
-        copy_register = '+', -- Register to use for copying (if `copy_to_clipboard` is true)
-    },
-}

lua/plugins/functional/remember.lua

@@ -1,6 +0,0 @@
-return {
-	"vladdoster/remember.nvim",
-	config = function()
-		require("remember").setup({})
-	end,
-}

lua/plugins/functional/telescope-file-browser.lua

@@ -1,4 +0,0 @@
-return {
-	"nvim-telescope/telescope-file-browser.nvim",
-	dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
-}

lua/plugins/functional/telescope-ui-select.lua

@@ -1,4 +0,0 @@
-return {
-	"nvim-telescope/telescope-ui-select.nvim",
-	dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
-}

lua/plugins/functional/telescope.lua

@@ -1,60 +0,0 @@
-return {
-	"nvim-telescope/telescope.nvim",
-	tag = "0.1.8",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"nvim-telescope/telescope-symbols.nvim",
-		{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
-	},
-	config = function()
-		require("telescope").setup({
-			defaults = {
-				file_ignore_patterns = { ".git", ".venv", ".node_modules" },
-			},
-			extensions = {
-				file_browser = {
-					theme = "ivy",
-					hijack_netrw = true,
-				},
-				["ui-select"] = {
-					require("telescope.themes").get_dropdown({
-						-- even more opts
-					}),
-				},
-			},
-		})
-		local builtin = require("telescope.builtin")
-
-		vim.keymap.set("n", "<leader>ff", function()
-			builtin.find_files({ hidden = true })
-		end, { desc = "Telescope find files (current file dir)" })
-
-		vim.keymap.set("n", "<space>fn", function()
-			local full_path = vim.api.nvim_buf_get_name(0)
-			local dir = vim.fn.fnamemodify(full_path, ":h")
-			require("telescope").extensions.file_browser.file_browser({
-				path = dir,
-			})
-		end)
-
-		vim.keymap.set("n", "<space>fs", function() -- select sessions
-			MiniSessions.select()
-		end)
-
-		vim.keymap.set("n", "<space>fd", function() -- select sessions
-			MiniSessions.select("delete")
-		end)
-
-		vim.keymap.set("n", "<leader>fg", function()
-			builtin.live_grep()
-		end, { desc = "Telescope live grep (current file dir)" })
-
-		vim.keymap.set("n", "<leader>fb", function()
-			builtin.buffers({ cwd = vim.fn.expand("%:p:h") }) -- buffers don’t need cwd, but harmless
-		end, { desc = "Telescope buffers" })
-
-		require("telescope").load_extension("file_browser")
-		require("telescope").load_extension("ui-select")
-		require("telescope").load_extension("nerdy")
-	end,
-}

lua/plugins/functional/undotree.lua

@@ -1,7 +0,0 @@
-return {
-	"mbbill/undotree",
-	lazy = false,
-	config = function()
-		vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<cr><cmd>UndotreeFocus<cr>")
-	end,
-}

lua/plugins/init.lua

@@ -1 +0,0 @@
-return { undefined }

lua/plugins/lightspeed.lua

@@ -0,0 +1,3 @@
+return {
+	"ggandor/leap.nvim",
+}

lua/plugins/lualine.lua

@@ -38,14 +38,14 @@ return {
 			sections = {
 				lualine_a = { "mode" },
 				lualine_b = { "branch", "diff", "diagnostics" },
-				lualine_c = { "filename" },
+				lualine_c = { "buffers" },
 				lualine_x = { "encoding", "fileformat", "filetype" },
 				lualine_y = { "lsp_status" },
 				lualine_z = { "location" },
 			},
 			inactive_sections = {
 				lualine_a = {},
-				lualine_b = { "branch", "diff", "diagnostics" },
+				lualine_b = {},
 				lualine_c = { "filename" },
 				lualine_x = { "location" },
 				lualine_y = {},

lua/plugins/mini.lua

@@ -0,0 +1,57 @@
+return {
+	"echasnovski/mini.nvim",
+	version = "*", -- or a specific tag
+	config = function()
+		-- Only load the modules you want
+		require("mini.animate").setup({
+			cursor = {
+				enable = false,
+			},
+		})
+		require("mini.pairs").setup()
+		require("mini.files").setup()
+		require("mini.cursorword").setup({
+			content = {
+				active = true,
+			},
+		})
+		require("mini.notify").setup()
+		require("mini.move").setup({
+			mappings = {
+				down = "J",
+				up = "K",
+			},
+		})
+		require("mini.surround").setup({
+			mappings = {
+				add = "<leader>sa",
+				delete = "<leader>sd", -- Delete surrounding
+				find = "<leader>sf", -- Find surrounding (to the right)
+				find_left = "<leader>sF", -- Find surrounding (to the left)
+				highlight = "<leader>sh", -- Highlight surrounding
+				replace = "<leader>sr", -- Replace surrounding
+				update_n_lines = "<leader>sn", -- Update `n_lines`
+			},
+		})
+		require("mini.ai").setup({
+			mappings = {
+				-- Main textobject prefixes
+				around = "a",
+				inside = "i",
+
+				-- Next/last variants
+				-- NOTE: These override built-in LSP selection mappings on Neovim>=0.12
+				-- Map LSP selection manually to use it (see `:h MiniAi.config`)
+				around_next = "<leader>an",
+				inside_next = "<leader>in",
+				around_last = "<leader>al",
+				inside_last = "<leader>il",
+
+				-- Move cursor to corresponding edge of `a` textobject
+				goto_left = "<leader>g[",
+				goto_right = "<leader>g]",
+			},
+		})
+		require("mini.pick").setup({})
+	end,
+}

lua/plugins/snacks.lua

@@ -0,0 +1,63 @@
+return {
+	"folke/snacks.nvim",
+	priority = 1000,
+	lazy = false,
+	---@type snacks.Config
+	opts = {
+		lazygit = { enabled = true },
+		bigfile = { enabled = true },
+
+		picker = {},
+		dashboard = {
+			enabled = true,
+			width = 100,
+			preset = {
+				keys = {
+					{ icon = " ", key = "f", desc = "Find File", action = ":Pick files" },
+					{ icon = " ", key = "n", desc = "New File", action = ":ene | startinsert" },
+					{
+						icon = " ",
+						key = "g",
+						desc = "Find Text",
+						action = ":Pick live_grep",
+					},
+					{
+						icon = " ",
+						key = "r",
+						desc = "Recent Files",
+						action = ":lua Snacks.dashboard.pick('oldfiles')",
+					},
+					{
+						icon = " ",
+						key = "c",
+						desc = "Config",
+						action = ":lua Snacks.dashboard.pick('files', {cwd = vim.fn.stdpath('config')})",
+					},
+					{ icon = " ", key = "U", desc = "Restore Session", section = "session" },
+					{
+						icon = "󰒲 ",
+						key = "L",
+						desc = "Lazy",
+						action = ":Lazy",
+						enabled = package.loaded.lazy ~= nil,
+					},
+					{ icon = " ", key = "q", desc = "Quit", action = ":qa" },
+				},
+				header = [[
+░  ░░░░  ░░░      ░░░        ░░       ░░░░      ░░░       ░░░░      ░░
+▒  ▒▒▒▒  ▒▒  ▒▒▒▒  ▒▒▒▒▒  ▒▒▒▒▒  ▒▒▒▒  ▒▒  ▒▒▒▒  ▒▒  ▒▒▒▒  ▒▒  ▒▒▒▒  ▒
+▓▓  ▓▓  ▓▓▓  ▓▓▓▓  ▓▓▓▓▓  ▓▓▓▓▓  ▓▓▓▓  ▓▓  ▓▓▓▓  ▓▓       ▓▓▓  ▓▓▓▓▓▓▓
+███    ████  ████  █████  █████  ████  ██        ██  ███  ███  ████  █
+████  ██████      ███        ██       ███  ████  ██  ████  ███      ██
+				]],
+			},
+			sections = {
+				{ section = "header" },
+				{ icon = " ", title = "Keymaps", section = "keys", indent = 2, padding = 1 },
+				{ icon = " ", title = "Recent Files", section = "recent_files", indent = 2, padding = 1 },
+				{ icon = " ", title = "Projects", section = "projects", indent = 2, padding = 1 },
+				{ section = "startup" },
+			},
+		},
+	},
+}

lua/plugins/telescope.lua

@@ -0,0 +1,4 @@
+return {
+    'nvim-telescope/telescope.nvim',
+    dependencies = { 'nvim-lua/plenary.nvim' }
+}

lua/plugins/tint.lua

@@ -0,0 +1,8 @@
+return {
+	{
+		"levouh/tint.nvim",
+		config = function()
+			require("tint").setup()
+		end,
+	},
+}

lua/plugins/toggleterm.lua

@@ -0,0 +1,13 @@
+return {
+	{
+		"akinsho/toggleterm.nvim",
+		version = "*",
+		opts = {--[[ things you want to change go here]]
+		},
+		config = function()
+			require("toggleterm").setup({
+				open_mapping = [[<c-\>]],
+			})
+		end,
+	},
+}

lua/plugins/treesitter.lua

@@ -0,0 +1,12 @@
+return {
+	"nvim-treesitter/nvim-treesitter",
+	run = ":TSUpdate",
+	config = function()
+		require("nvim-treesitter.configs").setup({
+			ensure_installed = { "javascript", "lua", "python", "html", "css", "typescript", "rust" }, -- Add JavaScript here
+			highlight = {
+				enable = true, -- Enable syntax highlighting
+			},
+		})
+	end,
+}

lua/plugins/ui/cattpuccin.lua

@@ -1,12 +0,0 @@
-return {
-    "catppuccin/nvim",
-    name = "catppuccin",
-    opts = {
-        transparent_background = true, -- disables setting the background color.
-        float = {
-            transparent = true, -- enable transparent floating windows
-            solid = false, -- use solid styling for floating windows, see |winborder|
-        },
-        show_end_of_buffer = true, -- shows the '~' characters after the end of buffers
-    }
-}

lua/plugins/ui/noice.lua

@@ -1,37 +0,0 @@
-return {
-	"folke/noice.nvim",
-	event = "VeryLazy",
-	config = function()
-		require("noice").setup({
-			messages = {
-				enabled = true,
-				view = "mini",
-				view_error = "notify", -- view for errors
-				view_warn = "notify", -- view for warnings
-				view_history = "messages", -- view for :messages
-				view_search = "virtualtext", -- view for search count messages. Set to `false` to disable
-			},
-			notify = {
-				enabled = true,
-				view = "notify",
-			},
-			hover = {
-				enabled = false,
-			},
-			-- you can enable a preset for easier configuration
-			presets = {
-				long_message_to_split = true, -- long messages will be sent to a split
-				inc_rename = false, -- enables an input dialog for inc-rename.nvim
-				lsp_doc_border = false, -- add a border to hover docs and signature help
-			},
-		})
-		require("notify").setup({
-			background_colour = "#000000",
-		})
-	end,
-	dependencies = {
-		-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
-		"MunifTanjim/nui.nvim",
-		"rcarriga/nvim-notify",
-	},
-}

lua/plugins/ui/tint.lua

@@ -1,6 +0,0 @@
-return {
-	"levouh/tint.nvim",
-	config = function()
-		require("tint").setup()
-	end,
-}

lua/plugins/undotree.lua

@@ -0,0 +1,4 @@
+return {
+	"mbbill/undotree",
+	lazy = false,
+}