diff --git a/init.lua b/init.lua index 1b15708..cbd3f1a 100644 --- a/init.lua +++ b/init.lua @@ -9,7 +9,7 @@ else -- │ themes are under ./lua/pika/plugins/colorschemes.lua │ -- ╰──────────────────────────────────────────────────────╯ - vim.cmd.colorscheme("astrodark") + vim.cmd.colorscheme("rose-pine-moon") -- Keybind for saving clipboard screenshot and inserting a Markdown link vim.api.nvim_set_keymap( diff --git a/lua/pika/plugins/colorschemes.lua b/lua/pika/plugins/colorschemes.lua index 7411b9a..1cac46b 100644 --- a/lua/pika/plugins/colorschemes.lua +++ b/lua/pika/plugins/colorschemes.lua @@ -1,19 +1,15 @@ return { - { "folke/tokyonight.nvim" }, - { "fynnfluegge/monet.nvim", name = "monet" }, - { "L-Colombo/oldschool.nvim", config = "true" }, + -- { "folke/tokyonight.nvim" }, -- { "catppuccin/nvim", name = "catppuccin" }, -- { "EdenEast/nightfox.nvim" }, -- { "DanWlker/primeppuccin", name = "primeppuccin" }, - -- { "rose-pine/neovim", name = "rose-pine" }, + { "fynnfluegge/monet.nvim", name = "monet" }, + { "L-Colombo/oldschool.nvim", config = "true" }, + { "rose-pine/neovim", name = "rose-pine" }, { "AlexvZyl/nordic.nvim" }, { "eldritch-theme/eldritch.nvim" }, - -- { "sainnhe/sonokai" }, { "samharju/synthweave.nvim" }, - { "sainnhe/gruvbox-material" }, - { "pauchiner/pastelnight.nvim" }, { "ptdewey/darkearth-nvim" }, - { "marko-cerovac/material.nvim" }, { "AstroNvim/astrotheme", opts = { diff --git a/lua/pika/plugins/explorer.lua b/lua/pika/plugins/explorer.lua index 6791427..25d33c4 100644 --- a/lua/pika/plugins/explorer.lua +++ b/lua/pika/plugins/explorer.lua @@ -1,20 +1,20 @@ return { -- ─< neotree - fallback >──────────────────────────────────────────────────────────────────────── - { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information - }, - vim.keymap.set("n", "e", ":Neotree toggle"), - vim.keymap.set("n", "Ee", ":Neotree left"), - vim.keymap.set("n", "Ef", ":Neotree float"), - vim.keymap.set("n", "Eg", ":Neotree git_status float"), - vim.keymap.set("n", "Eb", ":Neotree buffers position=top"), - }, + -- { + -- "nvim-neo-tree/neo-tree.nvim", + -- branch = "v3.x", + -- dependencies = { + -- "nvim-lua/plenary.nvim", + -- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + -- "MunifTanjim/nui.nvim", + -- -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information + -- }, + -- vim.keymap.set("n", "e", ":Neotree toggle"), + -- vim.keymap.set("n", "Ee", ":Neotree left"), + -- vim.keymap.set("n", "Ef", ":Neotree float"), + -- vim.keymap.set("n", "Eg", ":Neotree git_status float"), + -- vim.keymap.set("n", "Eb", ":Neotree buffers position=top"), + -- }, ---@type LazySpec { @@ -29,16 +29,16 @@ return { -- }, { -- Open in the current working directory - "Lf", + "tLf", "Yazi cwd", - desc = "Open the file manager in nvim's working directory", + desc = "Terminal - Open yazi in nvim's working directory", }, { -- NOTE: this requires a version of yazi that includes -- https://github.com/sxyazi/yazi/pull/1305 from 2024-07-18 - "lf", + "tlf", "Yazi toggle", - desc = "Resume the last yazi session", + desc = "Terminal - Resume the last yazi session", }, }, ---@type YaziConfig diff --git a/lua/pika/plugins/qol.lua b/lua/pika/plugins/qol.lua index c012d60..2e39595 100644 --- a/lua/pika/plugins/qol.lua +++ b/lua/pika/plugins/qol.lua @@ -138,6 +138,23 @@ return { ), }, + -- ─< INFO: Those comments are really great! >────────────────────────────────────────── + -- ─────────────────────< NOTE: And they can be pretty satisfying... >───────────────────── + -- ╭──────────────────────────────────────╮ + -- │ WARN: Also they can change in color! │ + -- ╰──────────────────────────────────────╯ + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { + keywords = { + NOTE = { icon = " ", color = "hint" }, + INFO = { icon = " ", color = "info" }, + WARNING = { icon = " ", color = "warning", alt = { "WARN" } }, + }, + }, + }, + -- ╭───────────╮ -- │ colorizer │ -- ╰───────────╯ diff --git a/lua/pika/plugins/telescope.lua b/lua/pika/plugins/telescope.lua index 0656a2b..c6c80d1 100644 --- a/lua/pika/plugins/telescope.lua +++ b/lua/pika/plugins/telescope.lua @@ -25,38 +25,32 @@ return { telescope.load_extension("fzf") - -- set keymaps + -- ─< set keymaps >───────────────────────────────────────────────────────────────────── local map = vim.keymap.set -- for conciseness - - -- Telescope mappings - map("n", "sf", "Telescope find_files", { noremap = true, silent = true, desc = "Find Files" }) - map("n", "sw", "Telescope live_grep", { noremap = true, silent = true, desc = "Search Word" }) - map("n", "", "Telescope buffers", { noremap = true, silent = true, desc = "Buffers" }) local builtin = require("telescope.builtin") - - map("n", "sn", function() - builtin.find_files({ cwd = vim.fn.stdpath("config") }) - end, { desc = "[S]earch [N]eovim files" }) - map("n", "ff", builtin.find_files, { desc = "[S]earch [F]iles" }) - map("n", "sh", builtin.help_tags, { desc = "[S]earch [H]elp" }) - map("n", "sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" }) - map("n", "sg", builtin.live_grep, { desc = "[S]earch by [G]rep" }) - map("n", "sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" }) - -- map("n", "sr", builtin.resume, { desc = "[S]earch [R]esume" }) - map("n", "s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - map("n", "", builtin.buffers, { desc = "[ ] Find existing buffers" }) - map("n", "sR", function() - require("telescope.builtin").oldfiles() - end) + -- ─────────────────────────────────< Telescope mappings >───────────────────────────────── map("n", "T", "Telescope colorscheme") - map("n", "q", vim.cmd.q) + + map("n", "ff", "Telescope find_files", { noremap = true, silent = true, desc = "Find Files" }) + -- map("n", "ff", builtin.find_files, { desc = "Find Files" }) + map("n", "fw", "Telescope live_grep", { noremap = true, silent = true, desc = "Find Word" }) + -- map("n", "fw", builtin.live_grep, { desc = "Find word" }) + -- map("n", "fb", "Telescope buffers", { noremap = true, silent = true, desc = "Find Buffers" }) + map("n", "", builtin.buffers, { desc = "[ ] Find existing buffers" }) + map("n", "fn", function() + builtin.find_files({ cwd = vim.fn.stdpath("config") }) + end, { desc = "Find Neovim files" }) + map("n", "fh", builtin.help_tags, { desc = "Find Help" }) + map("n", "fk", builtin.keymaps, { desc = "Find Keymaps" }) + map("n", "fd", builtin.diagnostics, { desc = "Find Diagnostics" }) + map("n", "fo", builtin.oldfiles, { desc = "Find old/Recent Files" }) -- Additional custom mappings map("n", "/", function() builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown()) - end, { desc = "[/] Fuzzily search in current buffer" }) - map("n", "s/", function() + end, { desc = "Search in current buffer" }) + map("n", "f/", function() builtin.live_grep({ grep_open_files = true, prompt_title = "Live Grep in Open Files" }) - end, { desc = "[S]earch [/] in Open Files" }) + end, { desc = "Search in Open Files" }) end, }