diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua index 53161191..e5453269 100644 --- a/.config/nvim/lua/plugins/catppuccin.lua +++ b/.config/nvim/lua/plugins/catppuccin.lua @@ -23,6 +23,7 @@ return { enabled = true, enable_ui = true, -- enable nvim-dap-ui }, + dashboard = true, flash = true, headlines = true, gitsigns = true, diff --git a/.config/nvim/lua/plugins/extras/ui/alpha.lua b/.config/nvim/lua/plugins/dashboard.lua similarity index 85% rename from .config/nvim/lua/plugins/extras/ui/alpha.lua rename to .config/nvim/lua/plugins/dashboard.lua index 4b90f3cc..44605916 100644 --- a/.config/nvim/lua/plugins/extras/ui/alpha.lua +++ b/.config/nvim/lua/plugins/dashboard.lua @@ -1,9 +1,6 @@ return { - "goolord/alpha-nvim", - keys = { - { "fa", "Alpha", desc = "Dashboard (Alpha)" }, - }, - opts = function(_, dashboard) + "nvimdev/dashboard-nvim", + opts = function(_, opts) local logo = [[  ████ ██████ █████ ██ @@ -15,7 +12,8 @@ return { ██████ █████████████████████ ████ █████ █████ ████ ██████ ]] - dashboard.section.header.val = vim.split(logo, "\n") - return dashboard + logo = string.rep("\n", 8) .. logo .. "\n\n" + opts.config.header = vim.split(logo, "\n") + return opts end, } diff --git a/.config/nvim/lua/plugins/extras/editor/harpoon.lua b/.config/nvim/lua/plugins/extras/editor/harpoon.lua index b42d6371..55a63ab9 100644 --- a/.config/nvim/lua/plugins/extras/editor/harpoon.lua +++ b/.config/nvim/lua/plugins/extras/editor/harpoon.lua @@ -3,8 +3,8 @@ return { "ThePrimeagen/harpoon", --stylua: ignore keys = { - { "'", function() require("harpoon.mark").add_file() end, desc = "Add File" }, - { ";", "Telescope harpoon marks", desc = "Harpoon" }, + { ">", function() require("harpoon.mark").add_file() end, desc = "Add File" }, + { ".", "Telescope harpoon marks", desc = "Harpoon" }, { "1", function() require("harpoon.ui").nav_file(1) end, desc = "File 1" }, { "2", function() require("harpoon.ui").nav_file(2) end, desc = "File 2" }, { "3", function() require("harpoon.ui").nav_file(3) end, desc = "File 3" }, @@ -26,6 +26,7 @@ return { }, { "goolord/alpha-nvim", + optional = true, opts = function(_, dashboard) local button = dashboard.button("m", " " .. " Marks", "Telescope harpoon marks") button.opts.hl = "AlphaButtons" @@ -33,4 +34,21 @@ return { table.insert(dashboard.section.buttons.val, 5, button) end, }, + { + "nvimdev/dashboard-nvim", + optional = true, + opts = function(_, opts) + local harpoon = { + action = "Telescope harpoon marks", + desc = " Marks", + icon = " ", + key = "m", + } + + harpoon.desc = harpoon.desc .. string.rep(" ", 43 - #harpoon.desc) + harpoon.key_format = " %s" + + table.insert(opts.config.center, 5, harpoon) + end, + }, } diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua b/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua index 8dabf5d8..57bdf2dc 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua @@ -29,6 +29,7 @@ return { }, { "goolord/alpha-nvim", + optional = true, opts = function(_, dashboard) local button = dashboard.button("p", " " .. " Projects/Repos", "Telescope repo list ") button.opts.hl = "AlphaButtons" @@ -36,6 +37,23 @@ return { table.insert(dashboard.section.buttons.val, 4, button) end, }, + { + "nvimdev/dashboard-nvim", + optional = true, + opts = function(_, opts) + local projects = { + action = "Telescope repo list", + desc = " Projects/Repos", + icon = " ", + key = "p", + } + + projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc) + projects.key_format = " %s" + + table.insert(opts.config.center, 4, projects) + end, + }, { "airblade/vim-rooter", event = "VeryLazy", diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua b/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua index eb11a2b6..3c67ea15 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua @@ -25,6 +25,7 @@ return { }, { "goolord/alpha-nvim", + optional = true, opts = function(_, dashboard) local button = dashboard.button("z", " " .. " Zoxide", "Telescope zoxide list ") button.opts.hl = "AlphaButtons" @@ -32,4 +33,21 @@ return { table.insert(dashboard.section.buttons.val, 5, button) end, }, + { + "nvimdev/dashboard-nvim", + optional = true, + opts = function(_, opts) + local zoxide = { + action = "Telescope zoxide list", + desc = " Zoxide", + icon = " ", + key = "z", + } + + zoxide.desc = zoxide.desc .. string.rep(" ", 43 - #zoxide.desc) + zoxide.key_format = " %s" + + table.insert(opts.config.center, 4, zoxide) + end, + }, } diff --git a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua index c490a745..548abecc 100644 --- a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua +++ b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua @@ -78,4 +78,21 @@ return { return dashboard end, }, + { + "nvimdev/dashboard-nvim", + optional = true, + opts = function(_, opts) + local git = { + action = "FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd= lazygit", + desc = " Git", + icon = " ", + key = "G", + } + + git.desc = git.desc .. string.rep(" ", 43 - #git.desc) + git.key_format = " %s" + + table.insert(opts.config.center, 7, git) + end, + }, }