diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index a5f9ef2..e00c821 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,7 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" }, - "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" }, "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, "catppuccin": { "branch": "main", "commit": "ce8d176faa4643e026e597ae3c31db59b63cef09" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, @@ -12,6 +11,7 @@ "cmp-tabnine": { "branch": "main", "commit": "c0167cdc86c15e782c5461ee62aebee89231c2ed" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "328c2f1dda56f933d3337a1316e1020ba30ba6aa" }, + "dashboard-nvim": { "branch": "master", "commit": "0775e567b6c0be96d01a61795f7b64c1758262f6" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, diff --git a/nvim/.config/nvim/lua/plugins/alpha.lua b/nvim/.config/nvim/lua/plugins.inactive/alpha.lua similarity index 100% rename from nvim/.config/nvim/lua/plugins/alpha.lua rename to nvim/.config/nvim/lua/plugins.inactive/alpha.lua diff --git a/nvim/.config/nvim/lua/plugins/dashboard.lua b/nvim/.config/nvim/lua/plugins/dashboard.lua new file mode 100644 index 0000000..fa4c12e --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/dashboard.lua @@ -0,0 +1,128 @@ +return { + { + "nvimdev/dashboard-nvim", + event = "VimEnter", + dependencies = { + "nvim-tree/nvim-web-devicons", + "epwalsh/obsidian.nvim", + "ibhagwan/fzf-lua", + }, + config = function() + require("dashboard").setup({ + theme = "doom", + config = { + header = { + [[ ]], + [[ ]], + [[ ]], + [[ ]], + [[  ]], + [[ ████ ██████ █████ ██ ]], + [[ ███████████ █████  ]], + [[ █████████ ███████████████████ ███ ███████████ ]], + [[ █████████ ███ █████████████ █████ ██████████████ ]], + [[ █████████ ██████████ █████████ █████ █████ ████ █████ ]], + [[ ███████████ ███ ███ █████████ █████ █████ ████ █████ ]], + [[ ██████ █████████████████████ ████ █████ █████ ████ ██████ ]], + [[ ]], + [[ ]], + [[ ]], + }, + + center = { + { + icon = " ", + icon_hl = "Title", + desc = "New File ", + desc_hl = "String", + key = "n", + key_hl = "Number", + action = "enew", + }, + { + icon = " ", + icon_hl = "Title", + desc = "Find File ", + desc_hl = "String", + key = "f", + key_hl = "Number", + action = "Telescope find_files", + }, + { + icon = " ", + icon_hl = "Title", + desc = "Recent Files ", + desc_hl = "String", + key = "r", + key_hl = "Number", + action = "Telescope oldfiles", + }, + { + icon = " ", + icon_hl = "Title", + desc = "Find Word ", + desc_hl = "String", + key = "g", + key_hl = "Number", + action = "Telescope live_grep", + }, + { + icon = " ", + icon_hl = "Title", + desc = "Obsidian Notes ", + desc_hl = "String", + key = "o", + key_hl = "Number", + action = "ObsidianQuickSwitch", + }, + -- { + -- icon = " ", + -- icon_hl = "Title", + -- desc = "Projects (SPC fp) ", -- Note: shows keymap + -- desc_hl = "String", + -- key = "p", + -- key_hl = "Number", + -- action = "Telescope projections", -- Will lazy-load when pressed + -- }, + { + icon = " ", + icon_hl = "Title", + desc = "Config ", + desc_hl = "String", + key = "c", + key_hl = "Number", + action = "edit ~/.config/nvim/init.lua", + }, + { + icon = " ", + icon_hl = "Title", + desc = "Lazy ", + desc_hl = "String", + key = "l", + key_hl = "Number", + action = "Lazy", + }, + { + icon = " ", + icon_hl = "Title", + desc = "Quit ", + desc_hl = "String", + key = "q", + key_hl = "Number", + action = "quit", + }, + }, + + footer = function() + local stats = require("lazy").stats() + local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) + return { + "", + "⚡ Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms", + } + end, + }, + }) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/fzf.lua b/nvim/.config/nvim/lua/plugins/fzf.lua index 0dee574..efe3d97 100644 --- a/nvim/.config/nvim/lua/plugins/fzf.lua +++ b/nvim/.config/nvim/lua/plugins/fzf.lua @@ -1,14 +1,85 @@ return { - { - "ibhagwan/fzf-lua", - -- optional for icon support - dependencies = { "nvim-tree/nvim-web-devicons" }, - -- or if using mini.icons/mini.nvim - -- dependencies = { "nvim-mini/mini.icons" }, - ---@module "fzf-lua" - ---@type fzf-lua.Config|{} - ---@diagnostics disable: missing-fields - opts = {}, - ---@diagnostics enable: missing-fields - }, + { + "ibhagwan/fzf-lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + ---@module "fzf-lua" + ---@type fzf-lua.Config|{} + ---@diagnostics disable: missing-fields + config = function() + require("fzf-lua").setup({ + -- Use Telescope-like defaults + "telescope", + + winopts = { + height = 0.85, + width = 0.80, + row = 0.35, + col = 0.50, + border = "rounded", + preview = { + layout = "flex", + flip_columns = 120, + vertical = "down:45%", + horizontal = "right:50%", + }, + }, + + files = { + prompt = "Files❯ ", + git_icons = true, + file_icons = true, + color_icons = true, + }, + + grep = { + prompt = "Rg❯ ", + input_prompt = "Grep For❯ ", + git_icons = true, + file_icons = true, + color_icons = true, + }, + }) + end, + ---@diagnostics enable: missing-fields + + keys = { + -- Files + { "ff", "FzfLua files", desc = "Find Files" }, + { "fr", "FzfLua oldfiles", desc = "Recent Files" }, + { "", "FzfLua files", desc = "Find Files" }, + + -- Search + { "fg", "FzfLua live_grep", desc = "Live Grep" }, + { "fw", "FzfLua grep_cword", desc = "Grep Word" }, + { "fW", "FzfLua grep_cWORD", desc = "Grep WORD" }, + + -- Buffers + { "fb", "FzfLua buffers", desc = "Buffers" }, + -- { "", "FzfLua buffers", desc = "Buffers" }, + + -- Git + { "gC", "FzfLua git_commits", desc = "Git Commits" }, + { "gR", "FzfLua git_files", desc = "Git Files" }, + { "gS", "FzfLua git_status", desc = "Git Status" }, + + -- LSP + { "ld", "FzfLua lsp_document_symbols", desc = "Document Symbols" }, + { "lw", "FzfLua lsp_workspace_symbols", desc = "Workspace Symbols" }, + { "lr", "FzfLua lsp_references", desc = "References" }, + { "la", "FzfLua lsp_code_actions", desc = "Code Actions" }, + + -- Diagnostics + { "lD", "FzfLua diagnostics_document", desc = "Document Diagnostics" }, + { "lW", "FzfLua diagnostics_workspace", desc = "Workspace Diagnostics" }, + + -- Help + { "fh", "FzfLua help_tags", desc = "Help Tags" }, + { "fc", "FzfLua commands", desc = "Commands" }, + { "fk", "FzfLua keymaps", desc = "Keymaps" }, + + -- Misc + { "f:", "FzfLua command_history", desc = "Command History" }, + { "fm", "FzfLua marks", desc = "Marks" }, + }, + }, } diff --git a/nvim/.config/nvim/lua/plugins/lazydev.lua b/nvim/.config/nvim/lua/plugins/lazydev.lua index 9b9ab4d..d65d74e 100644 --- a/nvim/.config/nvim/lua/plugins/lazydev.lua +++ b/nvim/.config/nvim/lua/plugins/lazydev.lua @@ -3,7 +3,7 @@ return { "folke/lazydev.nvim", ft = "lua", dependencies = { - "Bilal2453/luvit-meta", + "Bilal2453/luvit-meta", }, opts = { library = { diff --git a/nvim/.config/nvim/lua/plugins/trouble.lua b/nvim/.config/nvim/lua/plugins/trouble.lua index d6e434f..5018ef2 100644 --- a/nvim/.config/nvim/lua/plugins/trouble.lua +++ b/nvim/.config/nvim/lua/plugins/trouble.lua @@ -1,39 +1,39 @@ return { -{ - "folke/trouble.nvim", - opts = {}, -- for default options, refer to the configuration section for custom setup. - cmd = "Trouble", - keys = { - { - "xx", - "Trouble diagnostics toggle", - desc = "Diagnostics (Trouble)", - }, - { - "xX", - "Trouble diagnostics toggle filter.buf=0", - desc = "Buffer Diagnostics (Trouble)", - }, - { - "cs", - "Trouble symbols toggle focus=false", - desc = "Symbols (Trouble)", - }, - { - "cl", - "Trouble lsp toggle focus=false win.position=right", - desc = "LSP Definitions / references / ... (Trouble)", - }, - { - "xL", - "Trouble loclist toggle", - desc = "Location List (Trouble)", - }, - { - "xQ", - "Trouble qflist toggle", - desc = "Quickfix List (Trouble)", + { + "folke/trouble.nvim", + opts = {}, -- for default options, refer to the configuration section for custom setup. + cmd = "Trouble", + keys = { + { + "xx", + "Trouble diagnostics toggle", + desc = "Diagnostics (Trouble)", + }, + { + "xX", + "Trouble diagnostics toggle filter.buf=0", + desc = "Buffer Diagnostics (Trouble)", + }, + { + "cs", + "Trouble symbols toggle focus=false", + desc = "Symbols (Trouble)", + }, + { + "cl", + "Trouble lsp toggle focus=false win.position=right", + desc = "LSP Definitions / references / ... (Trouble)", + }, + { + "xL", + "Trouble loclist toggle", + desc = "Location List (Trouble)", + }, + { + "xQ", + "Trouble qflist toggle", + desc = "Quickfix List (Trouble)", + }, }, }, } -}