23 changed files with 570 additions and 618 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +0,0 @@
-.neoconf.json
-.stylua.toml
-lazy-lock.json
--- a/init.lua
+++ b/init.lua
@ -4,23 +4,8 @@ local vanila_vim_autostart_commands = {
 	"set nowrap",
 	"set shiftwidth=4",
 	"set tabstop=4",
-	"set ttyfast",
-	"set clipboard=unnamedplus"
 }

-vim.diagnostic.config({
-	virtual_text = true,
-	signs = {
-		text = {
-			[vim.diagnostic.severity.ERROR] = '󰅗 ',
-			[vim.diagnostic.severity.WARN] = '󰀧 ',
-			[vim.diagnostic.severity.INFO] = '󰬐',
-			[vim.diagnostic.severity.HINT] = '󰌵',
-		},
-	}
-})
-
-vim.opt.termguicolors = true
 vim.opt.fillchars = { eob = " " }

 for _, cmd in pairs(vanila_vim_autostart_commands) do
@ -32,9 +17,10 @@ if vim.lsp.inlay_hint then
 end

 require("config.lazy")
+require("config.plugins.acmp")
 require("config.plugins.autotag")
 require("config.plugins.autocomplete")
-require("config.plugins.buffer")
+require("config.plugins.bufferline")
 require("config.plugins.colorizer")
 require("config.plugins.comment")
 require("config.plugins.dap")
@ -42,15 +28,18 @@ require("config.plugins.gitsigns")
 require("config.plugins.ibl")
 require("config.plugins.hover_actions")
 require("config.plugins.lsp_config")
+require("config.plugins.lsp_diagnostic")
 require("config.plugins.lualine")
+require("config.plugins.navic")
 require("config.plugins.noice")
 require("toggleterm").setup()
-require("config.plugins.telescope")
 require("config.plugins.treesitter")
 require("config.plugins.neotree")
 require("config.plugins.prettier")
 require("config.plugins.rustaceanvim")
 require("huez").setup({})
+require("config.plugins.dropbar")
+require("config.plugins.dashboard")

 vim.api.nvim_create_autocmd("BufWritePre", {
 	buffer = buffer,
@ -58,4 +47,5 @@ vim.api.nvim_create_autocmd("BufWritePre", {
 		vim.lsp.buf.format { async = false }
 	end
 })
+
 require("mappings")
--- a/lua/config/plugins/acmp.lua
+++ b/lua/config/plugins/acmp.lua
@ -0,0 +1,5 @@
+-- require'cmp'.setup {
+--   sources = {
+--     { name = 'nvim_lsp' }
+--   }
+-- }
--- a/lua/config/plugins/autocomplete.lua
+++ b/lua/config/plugins/autocomplete.lua
@ -1,99 +1,95 @@
-local cmp = require("cmp")
+local cmp = require "cmp"

 local kind_icons = {
-	Text = "",
-	Method = "󰆧",
-	Function = "󰊕",
-	Constructor = "",
-	Field = "",
-	Variable = "",
-	Class = "",
-	Interface = "",
-	Module = "",
-	Property = "󰜢",
-	Unit = "",
-	Value = "󰎠",
-	Enum = "",
-	Keyword = "󰌋",
-	Snippet = "",
-	Color = "󰏘",
-	File = "󰈙",
-	Reference = "",
-	Folder = "󰉋",
-	EnumMember = "",
-	Constant = "󰏿",
-	Struct = "",
-	Event = "",
-	Operator = "󰆕",
-	TypeParameter = "󰅲",
+  Text = "",
+  Method = "󰆧",
+  Function = "󰊕",
+  Constructor = "",
+  Field = "",
+  Variable = "",
+  Class = "",
+  Interface = "",
+  Module = "",
+  Property = "󰜢",
+  Unit = "",
+  Value = "󰎠",
+  Enum = "",
+  Keyword = "󰌋",
+  Snippet = "",
+  Color = "󰏘",
+  File = "󰈙",
+  Reference = "",
+  Folder = "󰉋",
+  EnumMember = "",
+  Constant = "󰏿",
+  Struct = "",
+  Event = "",
+  Operator = "󰆕",
+  TypeParameter = "󰅲",
 }

-cmp.setup {
-	completion = { completeopt = "menu,menuone" },
+cmp.setup{
+  completion = { completeopt = "menu,menuone" },

-	snippet = {
-		expand = function(args)
-			require("luasnip").lsp_expand(args.body)
-		end,
-	},
-	window = {
-		completion = {
-			-- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
-			col_offset = -3,
-			side_padding = 0,
-		},
-	},
+  snippet = {
+    expand = function(args)
+      require("luasnip").lsp_expand(args.body)
+    end,
+  },

-	formatting = {
-		fields = { "kind", "abbr", "menu" },
-		format = function(entry, vim_item)
-			local kind = require("lspkind").cmp_format({ mode = "symbol_text", maxwidth = 50 })(entry, vim_item)
-			local strings = vim.split(kind.kind, "%s", { trimempty = true })
-			kind.kind = " " .. (strings[1] or "") .. " "
-			kind.menu = "  " .. (strings[2] or "")
+  formatting = {
+    format = function(entry, vim_item)
+      -- Kind icons
+      vim_item.kind = string.format('\t%s %s\t', kind_icons[vim_item.kind], vim_item.kind) -- This concatenates the icons with the name of the item kind
+      -- Source
+      vim_item.menu = ({
+        buffer = "[Buffer]",
+        nvim_lsp = "[LSP]",
+        luasnip = "[LuaSnip]",
+        nvim_lua = "[Lua]",
+        latex_symbols = "[LaTeX]",
+      })[entry.source.name]
+      return vim_item
+    end
+  },

-			return kind
-		end
-	},
+  mapping = {
+    ["<C-p>"] = cmp.mapping.select_prev_item(),
+    ["<C-n>"] = cmp.mapping.select_next_item(),
+    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+    ["<C-Space>"] = cmp.mapping.complete(),
+    ["<C-e>"] = cmp.mapping.close(),

-	mapping = {
-		["<C-p>"] = cmp.mapping.select_prev_item(),
-		["<C-n>"] = cmp.mapping.select_next_item(),
-		["<C-d>"] = cmp.mapping.scroll_docs(-4),
-		["<C-f>"] = cmp.mapping.scroll_docs(4),
-		["<C-Space>"] = cmp.mapping.complete(),
-		["<C-e>"] = cmp.mapping.close(),
+    ["<CR>"] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Insert,
+      select = true,
+    },

-		["<CR>"] = cmp.mapping.confirm {
-			behavior = cmp.ConfirmBehavior.Insert,
-			select = true,
-		},
+    ["<Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif require("luasnip").expand_or_jumpable() then
+        require("luasnip").expand_or_jump()
+      else
+        fallback()
+      end
+    end, { "i", "s" }),

-		["<Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_next_item()
-			elseif require("luasnip").expand_or_jumpable() then
-				require("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 require("luasnip").jumpable(-1) then
+        require("luasnip").jump(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+  },

-		["<S-Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_prev_item()
-			elseif require("luasnip").jumpable(-1) then
-				require("luasnip").jump(-1)
-			else
-				fallback()
-			end
-		end, { "i", "s" }),
-	},
-
-	sources = {
-		{ name = "nvim_lsp" },
-		{ name = "luasnip" },
-		{ name = "buffer" },
-		{ name = "path" },
-	},
+  sources = {
+    { name = "nvim_lsp" },
+    { name = "buffer" },
+    { name = "path" },
+  },
 }
--- a/lua/config/plugins/autotag.lua
+++ b/lua/config/plugins/autotag.lua
@ -1,7 +1,7 @@
 require('nvim-ts-autotag').setup({
-	opts = {
-		enable_close = true,
-		enable_rename = true,
-		enable_close_on_slash = true,
-	},
+  opts = {
+    enable_close = true,
+    enable_rename = true,
+    enable_close_on_slash = false
+  },
 })
--- a/lua/config/plugins/bufferline.lua
+++ b/lua/config/plugins/bufferline.lua
--- a/lua/config/plugins/dap.lua
+++ b/lua/config/plugins/dap.lua
@ -1,88 +1,88 @@
 local dap = require('dap')

 require("dap-vscode-js").setup({
-	debugger_path = "/.local/share/lunarvim/site/pack/lazy/opt/vscode-js-debug",
-	debugger_cmd = { "js-debug-adapter" },
-	adapters = { 'node-terminal' },
-})
+  debugger_path = "/.local/share/lunarvim/site/pack/lazy/opt/vscode-js-debug",
+  debugger_cmd = { "js-debug-adapter" },
+  adapters = { 'node-terminal' },
+ })

 dap.configurations.cpp = {
-	{
-		name = "Launch file",
-		type = "codelldb",
-		request = "launch",
-		program = function()
-			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
-		end,
-		cwd = '${workspaceFolder}',
-		stopOnEntry = false,
-	},
+  {
+    name = "Launch file",
+    type = "codelldb",
+    request = "launch",
+    program = function()
+      return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+    end,
+    cwd = '${workspaceFolder}',
+    stopOnEntry = false,
+  },
 }

 dap.configurations.c = dap.configurations.cpp
 dap.configurations.rust = dap.configurations.cpp

 dap.adapters["pwa-node"] = {
-	type = "server",
-	host = "localhost",
-	port = "${port}",
-	executable = {
-		command = "node",
-		args = { os.getenv("HOME") .. "/.local/share/lvim/mason/packages/js-debug-adapter/js-debug/src/dapDebugServer.js", "${port}" },
-	}
+  type = "server",
+  host = "localhost",
+  port = "${port}",
+  executable = {
+    command = "node",
+    args = {os.getenv("HOME") .. "/.local/share/lvim/mason/packages/js-debug-adapter/js-debug/src/dapDebugServer.js", "${port}"},
+  }
 }

 dap.configurations.javascript = {
-	{
-		type = "pwa-node",
-		request = "launch",
-		name = "Launch file",
-		program = "${file}",
-		cwd = "${workspaceFolder}",
-	},
+  {
+    type = "pwa-node",
+    request = "launch",
+    name = "Launch file",
+    program = "${file}",
+    cwd = "${workspaceFolder}",
+  },
 }

 dap.adapters.chrome = {
-	type = "executable",
-	command = "node",
-	args = { os.getenv("HOME") .. "/.local/share/lvim/mason/packages/chrome-debug-adapter/out/src/chromeDebug.js" },
+    type = "executable",
+    command = "node",
+    args = {os.getenv("HOME") .. "/.local/share/lvim/mason/packages/chrome-debug-adapter/out/src/chromeDebug.js"},
 }

 dap.adapters.firefox = {
-	type = 'executable',
-	command = 'node',
-	args = { os.getenv('HOME') .. '/.local/share/lvim/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js' },
+  type = 'executable',
+  command = 'node',
+  args = {os.getenv('HOME') .. '/.local/share/lvim/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js'},
 }

 dap.configurations.typescriptreact = {
-	{
-		name = 'Next.js: debug server-side',
-		type = "pwa-node",
-		request = "launch",
-		runtimeExecutable = "npm",
-		runtimeArgs = { "run", "dev" },
-		cwd = "${workspaceFolder}",
-	},
-	{
-		name = "Next.js: debug client-side with chrome",
-		type = "chrome",
-		request = "launch",
-		url = "http://localhost:3000"
-	},
-	{
-		name = "Next.js: debug client-side with firefox",
-		type = "firefox",
-		request = "launch",
-		url = 'http://localhost:3000',
-		webRoot = '${workspaceFolder}',
-		firefoxExecutable = '/usr/bin/waterfox',
-		pathMappings = {
-			{
-				url = "webpack://_n_e/",
-				path = "${workspaceFolder}/"
-			}
-		},
-	},
+    {
+      name = 'Next.js: debug server-side',
+      type = "pwa-node",
+      request = "launch",
+      runtimeExecutable = "npm",
+      runtimeArgs = { "run", "dev" },
+      cwd = "${workspaceFolder}",
+    },
+    {
+      name = "Next.js: debug client-side with chrome",
+      type = "chrome",
+      request = "launch",
+      url = "http://localhost:3000"
+    },
+    {
+      name = "Next.js: debug client-side with firefox",
+      type = "firefox",
+      request = "launch",
+      url = 'http://localhost:3000',
+      webRoot = '${workspaceFolder}',
+      firefoxExecutable = '/usr/bin/waterfox',
+      pathMappings = {
+        {
+          url = "webpack://_n_e/",
+          path = "${workspaceFolder}/"
+        }
+      },
+    },
 }

 dap.configurations.javascriptreact = dap.configurations.typescriptreact;
@ -91,9 +91,9 @@ require("dapui").setup()

 local dap, dapui = require("dap"), require("dapui")

-
 dap.listeners.after.event_initialized["dapui_config"] = function()
-	dapui.open({})
+  dapui.open({})
 end

 vim.keymap.set('n', '<leader>ui', require 'dapui'.toggle)
+
--- a/lua/config/plugins/dashboard.lua
+++ b/lua/config/plugins/dashboard.lua
@ -0,0 +1,31 @@
+require('dashboard').setup {
+	theme = 'hyper',
+	config = {
+		week_header = {
+			enable = true,
+		},
+		shortcut = {
+			{ desc = '󰊳 Update', group = '@property', action = 'Lazy update', key = 'u' },
+			{
+				icon = ' ',
+				icon_hl = '@variable',
+				desc = 'Files',
+				group = 'Label',
+				action = 'Telescope find_files',
+				key = 'f',
+			},
+			{
+				desc = ' Apps',
+				group = 'DiagnosticHint',
+				action = 'Telescope app',
+				key = 'a',
+			},
+			{
+				desc = ' dotfiles',
+				group = 'Number',
+				action = 'Telescope dotfiles',
+				key = 'd',
+			},
+		},
+	},
+}
--- a/lua/config/plugins/dropbar.lua
+++ b/lua/config/plugins/dropbar.lua
@ -0,0 +1,4 @@
+require('dropbar').setup()
+vim.ui.select = require('dropbar.utils.menu').select
+vim.api.nvim_set_hl(0, 'DropBarMenuHoverEntry', { link = 'PmenuExtraSel' })
+
--- a/lua/config/plugins/gitsigns.lua
+++ b/lua/config/plugins/gitsigns.lua
@ -1,47 +1,48 @@
 require('gitsigns').setup {
-	signs = {
-		add          = { text = '┃' },
-		change       = { text = '┃' },
-		delete       = { text = '' },
-		topdelete    = { text = '' },
-		changedelete = { text = '┃' },
-		untracked    = { text = ' ' },
-	},
-	signs_staged = {
-		add          = { text = '┃' },
-		change       = { text = '┃' },
-		delete       = { text = '' },
-		topdelete    = { text = '' },
-		changedelete = { text = '┃' },
-		untracked    = { text = ' ' },
-	},
-	signcolumn = true,
-	numhl = false,
-	linehl = false,
-	word_diff = false,
-	watch_gitdir = {
-		interval = 1000,
-		follow_files = true,
-	},
-	attach_to_untracked = true,
-	current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
-	current_line_blame_opts = {
-		virt_text = true,
-		virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
-		delay = 1000,
-		ignore_whitespace = false,
-	},
-	current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>",
-	sign_priority = 6,
-	status_formatter = nil, -- Use default
-	update_debounce = 200,
-	max_file_length = 40000,
-	preview_config = {
-		-- Options passed to nvim_open_win
-		border = "rounded",
-		style = "minimal",
-		relative = "cursor",
-		row = 0,
-		vcol = 1,
-	},
+  signs = {
+    add          = { text = '┃' },
+    change       = { text = '┃' },
+    delete       = { text = '' },
+    topdelete    = { text = '' },
+    changedelete = { text = '┃' },
+    untracked    = { text = ' ' },
+  },
+  signs_staged = {
+    add          = { text = '┃' },
+    change       = { text = '┃' },
+    delete       = { text = '' },
+    topdelete    = { text = '' },
+    changedelete = { text = '┃' },
+    untracked    = { text = ' ' },
+  },
+  signcolumn = true,
+  numhl = false,
+  linehl = false,
+  word_diff = false,
+  watch_gitdir = {
+    interval = 1000,
+    follow_files = true,
+  },
+  attach_to_untracked = true,
+  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+  current_line_blame_opts = {
+    virt_text = true,
+    virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
+    delay = 1000,
+    ignore_whitespace = false,
+  },
+  current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>",
+  sign_priority = 6,
+  status_formatter = nil, -- Use default
+  update_debounce = 200,
+  max_file_length = 40000,
+  preview_config = {
+    -- Options passed to nvim_open_win
+    border = "rounded",
+    style = "minimal",
+    relative = "cursor",
+    row = 0,
+    vcol = 1,
+  },
+  yadm = { enable = false },
 }
--- a/lua/config/plugins/hover_actions.lua
+++ b/lua/config/plugins/hover_actions.lua
@ -1,9 +1,6 @@
 require("hover").setup {
 	init = function()
 		require("hover.providers.lsp")
-		require("hover.providers.diagnostic")
-		require("hover.providers.dap")
-		require("hover.providers.dictionary")
 	end,
 	preview_opts = {
 		border = 'single'
--- a/lua/config/plugins/lsp_config.lua
+++ b/lua/config/plugins/lsp_config.lua
@ -1,58 +1,50 @@
 local lspconfig = require("lspconfig")

-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-	vim.lsp.diagnostic.on_publish_diagnostics, {
-		virtual_text = true
-	}
-)
-
-lspconfig.clangd.setup({})
-
 lspconfig.lua_ls.setup({
-	settings = {
-		Lua = {
-			hint = {
-				enable = true,
-			},
-		},
-	}
+  settings = {
+    Lua = {
+      hint = {
+        enable = true,
+      },
+    },
+  }
 })

 lspconfig.eslint.setup({
-	settings = {
-		codeActionOnSave = {
-			enable = true,
-			mode = "all",
-		},
-		format = true,
-	}
+  settings = {
+    codeActionOnSave = {
+      enable = true,
+      mode = "all",
+    },
+    format = true,
+  }
 })

 lspconfig.ts_ls.setup({
-	settings = {
-		typescript = {
-			inlayHints = {
-				includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
-				includeInlayParameterNameHintsWhenArgumentMatchesName = false,
-				includeInlayFunctionParameterTypeHints = true,
-				includeInlayVariableTypeHints = true,
-				includeInlayVariableTypeHintsWhenTypeMatchesName = false,
-				includeInlayPropertyDeclarationTypeHints = true,
-				includeInlayFunctionLikeReturnTypeHints = true,
-				includeInlayEnumMemberValueHints = true,
-			},
-		},
-		javascript = {
-			inlayHints = {
-				includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
-				includeInlayParameterNameHintsWhenArgumentMatchesName = false,
-				includeInlayVariableTypeHints = true,
-				includeInlayFunctionParameterTypeHints = true,
-				includeInlayVariableTypeHintsWhenTypeMatchesName = false,
-				includeInlayPropertyDeclarationTypeHints = true,
-				includeInlayFunctionLikeReturnTypeHints = true,
-				includeInlayEnumMemberValueHints = true,
-			},
-		},
-	}
+  settings = {
+    typescript = {
+      inlayHints = {
+        includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
+        includeInlayParameterNameHintsWhenArgumentMatchesName = false,
+        includeInlayFunctionParameterTypeHints = true,
+        includeInlayVariableTypeHints = true,
+        includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+        includeInlayPropertyDeclarationTypeHints = true,
+        includeInlayFunctionLikeReturnTypeHints = true,
+        includeInlayEnumMemberValueHints = true,
+      },
+    },
+    javascript = {
+      inlayHints = {
+        includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
+        includeInlayParameterNameHintsWhenArgumentMatchesName = false,
+        includeInlayVariableTypeHints = true,
+        includeInlayFunctionParameterTypeHints = true,
+        includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+        includeInlayPropertyDeclarationTypeHints = true,
+        includeInlayFunctionLikeReturnTypeHints = true,
+        includeInlayEnumMemberValueHints = true,
+      },
+    },
+  }
 })
--- a/lua/config/plugins/lsp_diagnostic.lua
+++ b/lua/config/plugins/lsp_diagnostic.lua
@ -0,0 +1,5 @@
+local signs = { Error = " ", Warn = " ", Hint = "󱩎 ", Info = " " }
+for type, icon in pairs(signs) do
+  local hl = "DiagnosticSign" .. type
+  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
+end
--- a/lua/config/plugins/lualine.lua
+++ b/lua/config/plugins/lualine.lua
@ -1,92 +1,59 @@
-local _colors = { "DiffAdd", "DiffChange", "RedrawDebugRecompose" }
-
 require("lualine").setup({
-	options = {
-		icons_enabled = true,
-		theme = 'auto',
-		component_separators = { left = '', right = '' },
-		section_separators = { left = '', right = '' },
-		disabled_filetypes = {
-			statusline = {},
-			winbar = {},
-		},
-		ignore_focus = {},
-		always_divide_middle = true,
-		always_show_tabline = true,
-		globalstatus = true,
-		refresh = {
-			statusline = 100,
-			tabline = 100,
-			winbar = 100,
-		}
-	},
-	sections = {
-		lualine_a = {
-			{
-				function()
-					return "  "
-				end,
-				padding = { left = 0, right = 0 },
-				color = {},
-				cond = nil,
-			},
-		},
-		lualine_b = { 'branch' },
-		lualine_c = {
-			{
-				'diff',
-				colored = true, -- Displays a colored diff status if set to true
-				symbols = { added = ' ', modified = ' ', removed = ' ' }, -- Changes the symbols used by the diff.
-				source = nil, -- A function that works as a data source for diff.
-			}
-		},
-		lualine_x = { 'encoding', 'filetype',
-			{
-				'diagnostics',
-
-				sources = { 'nvim_diagnostic', 'coc' },
-
-				sections = { 'error', 'warn', 'info', 'hint' },
-
-				diagnostics_color = {
-					error = 'DiagnosticError', -- Changes diagnostics' error color.
-					warn  = 'DiagnosticWarn', -- Changes diagnostics' warn color.
-					info  = 'DiagnosticInfo', -- Changes diagnostics' info color.
-					hint  = 'DiagnosticHint', -- Changes diagnostics' hint color.
-				},
-				symbols = {
-					hint = '󰌵 ',
-					info = '󰬐 ',
-					warn = '󰀧 ',
-					error = '󰅗 ',
-				},
-				colored = true, -- Displays diagnostics status in color if set to true.
-				update_in_insert = false, -- Update diagnostics in insert mode.
-				always_visible = false, -- Show diagnostics even if there are none.
-			}
-		},
-		lualine_y = { 'progress' },
-		lualine_z = { 'location' }
-	},
-	inactive_sections = {
-		lualine_a = {
-			{
-				function()
-					return "  "
-				end,
-				padding = { left = 0, right = 0 },
-				color = {},
-				cond = nil,
-			},
-		},
-		lualine_b = { 'branch' },
-		lualine_c = {},
-		lualine_x = { 'encoding', 'filetype', 'diagnostics', 'lsp' },
-		lualine_y = { 'progress' },
-		lualine_z = { 'location' }
-	},
-	tabline = {},
-	winbar = {},
-	inactive_winbar = {},
-	extensions = {}
+  options = {
+    icons_enabled = true,
+    theme = 'auto',
+    component_separators = { left = '', right = ''},
+    section_separators = { left = '', right = ''},
+    disabled_filetypes = {
+      statusline = {},
+      winbar = {},
+    },
+    ignore_focus = {},
+    always_divide_middle = true,
+    always_show_tabline = true,
+    globalstatus = true,
+    refresh = {
+      statusline = 100,
+      tabline = 100,
+      winbar = 100,
+    }
+  },
+  sections = {
+    lualine_a = {
+      {
+        function()
+          return "  "
+        end,
+        padding = { left = 0, right = 0 },
+        color = {},
+        cond = nil,
+      },
+    },
+    lualine_b = {'branch'},
+    lualine_c = {'diff'},
+    lualine_x = {'encoding', 'filetype', 'diagnostics', 'lsp'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+  inactive_sections = {
+    lualine_a = {
+      {
+        function()
+          return "  "
+        end,
+        padding = { left = 0, right = 0 },
+        color = {},
+        cond = nil,
+      },
+    },
+    lualine_b = {'branch'},
+    lualine_c = {'diff'},
+    lualine_x = {'encoding', 'filetype', 'diagnostics', 'lsp'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+  tabline = {},
+  winbar = {},
+  inactive_winbar = {},
+  extensions = {}
 })
--- a/lua/config/plugins/navic.lua
+++ b/lua/config/plugins/navic.lua
@ -0,0 +1,47 @@
+local navic = require("nvim-navic")
+
+navic.setup {
+    icons = {
+        File          = "󰈙 ",
+        Module        = " ",
+        Namespace     = "󰌗 ",
+        Package       = " ",
+        Class         = "󰌗 ",
+        Method        = "󰆧 ",
+        Property      = " ",
+        Field         = " ",
+        Constructor   = " ",
+        Enum          = "󰕘",
+        Interface     = "󰕘",
+        Function      = "󰊕 ",
+        Variable      = "󰆧 ",
+        Constant      = "󰏿 ",
+        String        = "󰀬 ",
+        Number        = "󰎠 ",
+        Boolean       = "◩ ",
+        Array         = "󰅪 ",
+        Object        = "󰅩 ",
+        Key           = "󰌋 ",
+        Null          = "󰟢 ",
+        EnumMember    = " ",
+        Struct        = "󰌗 ",
+        Event         = " ",
+        Operator      = "󰆕 ",
+        TypeParameter = "󰊄 ",
+    },
+    lsp = {
+	auto_attach = true,
+        preference = nil,
+    },
+    highlight = true,
+    seperator = ' ',
+    depth_limit = 0,
+    depth_limit_indicator = "..",
+    safe_output = true,
+    lazy_update_context = false,
+    click = false,
+    format_text = function(text)
+        return text
+    end,
+}
+
--- a/lua/config/plugins/neotree.lua
+++ b/lua/config/plugins/neotree.lua
@ -1,57 +1,52 @@
+vim.fn.sign_define("LspDiagnosticsSignError",
+        {text = "󰅙 ", texthl = "LspDiagnosticsSignError"})
+vim.fn.sign_define("LspDiagnosticsSignWarning",
+        {text = "󱇎 ", texthl = "LspDiagnosticsSignWarning"})
+vim.fn.sign_define("LspDiagnosticsSignInformation",
+        {text = "󰰄 ", texthl = "LspDiagnosticsSignInformation"})
+vim.fn.sign_define("LspDiagnosticsSignHint",
+        {text = "󰐗 ", texthl = "LspDiagnosticsSignHint"})
+
 require("neo-tree").setup({
-	close_if_last_window = false,
-	popup_border_style = "rounded",
-	enable_git_status = true,
-	enable_diagnostics = true,
-	open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
-	sort_case_insensitive = false,
-	sort_function = nil,
-	default_component_configs = {
-		diagnostics = {
-			symbols = {
-				hint = '󰌵',
-				info = '󰬐',
-				warn = '󰀧',
-				error = '󰅗',
-			},
-			highlights = {
-				hint = "DiagnosticSignHint",
-				info = "DiagnosticSignInfo",
-				warn = "DiagnosticSignWarn",
-				error = "DiagnosticSignError",
-			},
-		},
-		indent = {
-			with_expanders = true,
-		},
-		icon = {
-			folder_closed = "󰉋",
-			folder_open = "󰝰",
-			folder_empty = "󰉖",
-			default = "*",
-			highlight = "NeoTreeFileIcon"
-		},
-		modified = {
-			symbol = "󰧞",
-			highlight = "NeoTreeModified",
-		},
-		name = {
-			trailing_slash = false,
-			use_git_status_colors = true,
-			highlight = "NeoTreeFileName",
-		},
-		git_status = {
-			symbols = {
-				added     = "󰜄",
-				modified  = "󰑕",
-				deleted   = "󰅗",
-				renamed   = "󰛂",
-				untracked = "󰞋",
-				ignored   = "󰿠",
-				unstaged  = "󰄱",
-				staged    = "󰄵",
-				conflict  = "",
-			}
-		},
-	},
+  close_if_last_window = false,
+  popup_border_style = "rounded",
+  enable_git_status = true,
+  enable_diagnostics = true,
+  open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
+  sort_case_insensitive = false,
+  sort_function = nil ,
+  default_component_configs = {
+    indent = {
+      with_expanders = true,
+    },
+    icon = {
+      folder_closed = "󰉋",
+      folder_open = "󰝰",
+      folder_empty = "󰉖",
+      default = "*",
+      highlight = "NeoTreeFileIcon"
+    },
+    modified = {
+      symbol = "󰧞",
+      highlight = "NeoTreeModified",
+    },
+    name = {
+      trailing_slash = false,
+      use_git_status_colors = true,
+      highlight = "NeoTreeFileName",
+    },
+    git_status = {
+      symbols = {
+        added     = "󰜄",
+        modified  = "󰑕",
+        deleted   = "󰅗",
+        renamed   = "󰛂",
+        untracked = "󰞋",
+        ignored   = "󰿠",
+        unstaged  = "󰄱",
+        staged    = "󰄵",
+        conflict  = "",
+      }
+    },
+  },
 })
--- a/lua/config/plugins/noice.lua
+++ b/lua/config/plugins/noice.lua
@ -1,27 +1,15 @@
 require("noice").setup({
-	lsp = {
-		override = {
-			["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-			["vim.lsp.util.stylize_markdown"] = true,
-			["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
-		},
-	},
-	presets = {
-		command_palette = true, -- position the cmdline and popupmenu together
-		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
-	},
-	views = {
-		cmdline_popup = {
-			border = {
-				style = "none",
-				padding = { 1, 2 },
-			},
-			filter_options = {},
-			win_options = {
-				winhighlight = "NormalFloat:NormalFloat,FloatBorder:FloatBorder",
-			},
-		},
-	},
+  lsp = {
+    override = {
+      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+      ["vim.lsp.util.stylize_markdown"] = true,
+      ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
+    },
+  },
+  presets = {
+    command_palette = true, -- position the cmdline and popupmenu together
+    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
+  },
 })
--- a/lua/config/plugins/rustaceanvim.lua
+++ b/lua/config/plugins/rustaceanvim.lua
@ -1,28 +1,37 @@
+local navic = require("nvim-navic")
+
 vim.g.rustaceanvim = {
-	server = {
-		settings = {
-			['rust-analyzer'] = {
-				procMacro = {
-					enable = true,
-				},
-				assist = {
-					importEnforceGranularity = true,
-					importPrefix = "create"
-				},
-				cargo = {
-					allFeatures = true,
-				},
-				checkOnSave = {
-					command = "clippy",
-					allFeatures = true
-				},
-				inlayHints = {
-					lifetimeElisionHints = {
-						enable = true,
-						useParameterNames = true
-					}
-				}
-			}
-		}
-	}
+  tools = {
+    autoSetHints = true,
+    inlay_hints = {
+      show_parameter_hints = true,
+      parameter_hints_prefix = "in: ",       -- "<- "
+      other_hints_prefix = "out: "           -- "=> "
+    }
+  },
+  server = {
+    on_attach = function(client, bufnr)
+      navic.attach(client, bufnr)      
+    end,
+    settings = {
+      ['rust-analyzer'] = {
+        assist = {
+          importEnforceGranularity = true,
+          importPrefix = "create"
+        },
+        cargo = { allFeatures = true },
+        checkOnSave = {
+          -- default: `cargo check`
+          command = "clippy",
+          allFeatures = true
+        },
+        inlayHints = {
+          lifetimeElisionHints = {
+            enable = true,
+            useParameterNames = true
+          }
+        }
+      }
+    }
+  }
 }
--- a/lua/config/plugins/telescope.lua
+++ b/lua/config/plugins/telescope.lua
@ -1,86 +0,0 @@
-require("telescope").load_extension("ui-select")
-
-require("telescope").setup({
-	defaults = {
-		borderchars = { " ", " ", " ", " ", " ", " ", " ", " " }
-	},
-	extensions = {
-		["ui-select"] = {
-			require("telescope.themes").get_dropdown {
-				-- even more opts
-			}
-
-			-- pseudo code / specification for writing custom displays, like the one
-			-- for "codeactions"
-			-- specific_opts = {
-			--   [kind] = {
-			--     make_indexed = function(items) -> indexed_items, width,
-			--     make_displayer = function(widths) -> displayer
-			--     make_display = function(displayer) -> function(e)
-			--     make_ordinal = function(e) -> string
-			--   },
-			--   -- for example to disable the custom builtin "codeactions" display
-			--      do the following
-			--   codeactions = false,
-			-- }
-		}
-	}
-})
-
-local blend = 50
-
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = "TelescopePrompt",
-	callback = function(ctx)
-		local backdropName = "TelescopeBackdrop"
-		local telescopeBufnr = ctx.buf
-
-		-- `Telescope` does not set a zindex, so it uses the default value
-		-- of `nvim_open_win`, which is 50: https://neovim.io/doc/user/api.html#nvim_open_win()
-		local telescopeZindex = 50
-
-		local backdropBufnr = vim.api.nvim_create_buf(false, true)
-		local winnr = vim.api.nvim_open_win(backdropBufnr, false, {
-			relative = "editor",
-			border = "none",
-			row = 0,
-			col = 0,
-			width = vim.o.columns,
-			height = vim.o.lines,
-			focusable = false,
-			style = "minimal",
-			zindex = telescopeZindex - 1, -- ensure it's below the reference window
-		})
-
-		vim.api.nvim_set_hl(0, backdropName, { bg = "#000000", default = true })
-		vim.wo[winnr].winhighlight = "Normal:" .. backdropName
-		vim.wo[winnr].winblend = blend
-		vim.bo[backdropBufnr].buftype = "nofile"
-
-		-- close backdrop when the reference buffer is closed
-		vim.api.nvim_create_autocmd({ "WinClosed", "BufLeave" }, {
-			once = true,
-			buffer = telescopeBufnr,
-			callback = function()
-				if vim.api.nvim_win_is_valid(winnr) then vim.api.nvim_win_close(winnr, true) end
-				if vim.api.nvim_buf_is_valid(backdropBufnr) then
-					vim.api.nvim_buf_delete(backdropBufnr, { force = true })
-				end
-			end,
-		})
-	end,
-})
-
-vim.api.nvim_create_autocmd({ "ColorScheme", "VimEnter" }, {
-	group = vim.api.nvim_create_augroup('Color', {}),
-	pattern = "*",
-	callback = function()
-		vim.api.nvim_set_hl(0, "TelescopePreviewTitle", { link = "MiniStatuslineModeVisual" })
-		vim.api.nvim_set_hl(0, "TelescopePromptTitle", { link = "MiniStatuslineModeCommand" })
-		vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { link = "MiniStatuslineModeReplace" })
-		vim.api.nvim_set_hl(0, "TelescopePromptNormal", { link = "StatusLine" })
-		vim.api.nvim_set_hl(0, "TelescopePromptBorder", { link = "StatusLine" })
-		vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { link = "BufferLineHint" })
-		vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { link = "BufferLineHint" })
-	end
-})
--- a/lua/config/plugins/treesitter.lua
+++ b/lua/config/plugins/treesitter.lua
@ -1,11 +1,8 @@
-require 'nvim-treesitter.configs'.setup {
+require'nvim-treesitter.configs'.setup {
 	ensure_installed = { 'rust', 'c', 'lua', 'tsx', 'javascript', 'typescript' },
 	sync_install = false,
 	auto_install = true,
 	highlight = {
 		enable = true,
-	},
-	autotag = {
-		enable = true,
 	}
 }
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@ -1,5 +1,4 @@
-local map = vim.keymap.set;
-
+local map = vim.keymap.set
 local bl_utils = require("config.utils.bufferline")
 local hover = require "hover"

@ -32,8 +31,6 @@ map("n", "ca", "<cmd>RustLsp codeAction<cr>")
 map("n", "<C-s>", "<cmd>w!<cr>")
 map("i", "<C-s>", "<cmd>w!<cr>")

-map("n", "<C-f>", "<C-q>")
-map("i", "<C-f>", "<C-q>")
 map("n", "<", "<cmd><gv<cr>")
 map("n", ">", "<cmd>>gv<cr>")

@ -41,6 +38,8 @@ map("n", "<leader>c", function(bufnr)
 	bl_utils.buf_kill("bd", bufnr, true)
 end)

+map("n", "<leader>dr", "<cmd> DapContinue <cr>", { desc = "Continue debug" })
+
 map("n", "do", function()
 	require("dapui").open()
 end, { desc = "Open DAP ui" })
@ -61,7 +60,7 @@ map("n", "<C-Down>", "<cmd>resize +2<CR>")
 map("n", "<C-Right>", "<cmd>vertical resize -2<CR>")
 map("n", "<C-Left>", "<cmd>vertical resize +2<CR>")

-map("n", "<leader>nn", "<cmd>set norelativenumber<cr>")
+map("n", "<leader>an", "<cmd>set norelativenumber<cr>")
 map("n", "<leader>rn", "<cmd>set relativenumber<cr>")
 map("n", "tt", "<cmd>ToggleTerm<cr>")
 map("n", "<C-{>", "<cmd>foldopen<cr>")
--- a/lua/plugins/core/init.lua
+++ b/lua/plugins/core/init.lua
@ -3,14 +3,11 @@ return {
 		'simrat39/inlay-hints.nvim',
 	},
 	{
-		'nvim-telescope/telescope-ui-select.nvim'
+		"LunarVim/breadcrumbs.nvim",
 	},
 	{
 		"akinsho/bufferline.nvim",
 	},
-	{
-		"onsails/lspkind.nvim"
-	},
 	{
 		"lewis6991/gitsigns.nvim"
 	},
@ -20,6 +17,9 @@ return {
 	{
 		"nvim-lualine/lualine.nvim",
 	},
+	{
+		"akinsho/toggleterm.nvim",
+	},
 	{
 		"windwp/nvim-autopairs",
 	},
@ -32,6 +32,9 @@ return {
 	{
 		"hrsh7th/cmp-nvim-lsp",
 	},
+	{
+		"SmiteshP/nvim-navic",
+	},
 	{
 		"kyazdani42/nvim-web-devicons"
 	},
@ -44,6 +47,9 @@ return {
 	{
 		"nvim-treesitter/nvim-treesitter",
 	},
+	{
+		"catppuccin/nvim"
+	},
 	{
 		"vague2k/huez.nvim",
 	},
@ -68,13 +74,26 @@ return {
 		'folke/lazydev.nvim',
 		ft = "lua",
 	},
+	{
+		'Bekaboo/dropbar.nvim',
+		dependencies = {
+			'nvim-telescope/telescope-fzf-native.nvim',
+			build = 'make'
+		},
+		config = function()
+			local dropbar_api = require('dropbar.api')
+			vim.keymap.set('n', '<Leader>;', dropbar_api.pick, { desc = 'Pick symbols in winbar' })
+			vim.keymap.set('n', '[;', dropbar_api.goto_context_start, { desc = 'Go to start of current context' })
+			vim.keymap.set('n', '];', dropbar_api.select_next_context, { desc = 'Select next context' })
+		end
+	},
 	{
 		"folke/noice.nvim",
 		event = "VeryLazy",
 		dependencies = {
-			-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
 			"MunifTanjim/nui.nvim",
-		}
+			"rcarriga/nvim-notify",
+		},
 	},
 	{
 		"nvim-neo-tree/neo-tree.nvim",
--- a/lua/plugins/secondary/init.lua
+++ b/lua/plugins/secondary/init.lua
@ -1,51 +1,50 @@
 return {
-	{
-		"kaarmu/typst.vim",
-		lazy = true,
-	},
-	{
-		'MunifTanjim/prettier.nvim',
-		lazy = true,
-	},
-	{
-		'akinsho/toggleterm.nvim', version = "*", config = true
-	},
-	{
-		"mlaursen/vim-react-snippets",
-		lazy = true,
-	},
-	{
-		"windwp/nvim-ts-autotag",
-		lazy = true,
-	},
-	{
-		"lukas-reineke/indent-blankline.nvim",
-		main = "ibl",
-	},
-	{
-		"sainnhe/gruvbox-material",
-	},
-	{
-		"savq/melange-nvim"
-	},
-	{
-		"mxsdev/nvim-dap-vscode-js",
-		lazy = true,
-	},
-	{
-		"windwp/nvim-autopairs",
-		lazy = true,
-		event = "InsertEnter",
-		config = true
-	},
-	{
-		"microsoft/vscode-js-debug",
-		lazy = true,
-		build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out"
-	},
-	{
-		'mrcjkb/rustaceanvim',
-		version = '^5', -- Recommended
-		lazy = false, -- This plugin is already lazy
-	}
+  {
+    'nvimdev/dashboard-nvim',
+    event = 'VimEnter',
+    dependencies = { { 'nvim-tree/nvim-web-devicons' } }
+  },
+  {
+    "kaarmu/typst.vim",
+    lazy = true,
+  },
+  {
+    'MunifTanjim/prettier.nvim',
+    lazy = true,
+  },
+  {
+    "savq/melange-nvim"
+  },
+  {
+    "mlaursen/vim-react-snippets",
+    lazy = true,
+  },
+  {
+    "windwp/nvim-ts-autotag",
+    lazy = true,
+  },
+  {
+    "lukas-reineke/indent-blankline.nvim"
+  },
+  {
+    "mxsdev/nvim-dap-vscode-js",
+    lazy = true,
+  },
+  {
+    "windwp/nvim-autopairs",
+    lazy = true,
+    event = "InsertEnter",
+    config = true
+  },
+  {
+    "microsoft/vscode-js-debug",
+    lazy = true,
+    build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out"
+  },
+  {
+    "mrcjkb/rustaceanvim",
+    version = '^4', -- Recommended
+    lazy = false,   -- This plugin is already lazy
+    ft = { "rust" },
+  },
 }